WebSVN – Kolibri OS – Diff – /programs/develop/tinypad/trunk/tp-button.asm

 	cmp	byte[esi],0
 	jne	.acc
-	jmp	still.skip_write
-;        cmp     eax,BUTTON_SCRLUP
+	jmp	still.skip_write
-;        jne     not_up
   btn.scroll_up:
-	dec	[top_line]
+	dec	[cur_tab.Editor.TopLeft.Y] ;! [top_line]
 	jns	@f
-	inc	[top_line]
+	inc	[cur_tab.Editor.TopLeft.Y] ;! [top_line]
-	ret;jmp     still.skip_write
+	ret
-    @@: call	check_inv_all.skip_check
-	ret
-;  not_up:
     @@: call	check_inv_all.skip_check
-;        cmp     eax,BUTTON_SCRLDN
+	ret
-;        jne     not_down
   btn.scroll_down:
-	inc	[top_line]
+	inc	[cur_tab.Editor.TopLeft.Y] ;! [top_line]
-	mov	eax,[lines]
+	mov	eax,[cur_tab.Editor.Lines] ;! eax,[lines]
 	sub	eax,[lines.scr]
-	cmp	eax,[top_line]
+	cmp	eax,[cur_tab.Editor.TopLeft.Y] ;! eax,[top_line]
-	jge	@f
-	dec	[top_line]
-	;dec     eax
+	jge	@f
-	;mov     [top_line],eax
+	dec	[cur_tab.Editor.TopLeft.Y] ;! [top_line]
-	ret;jmp     still.skip_write
-    @@: call	check_inv_all.skip_check
-	ret
-;  not_down:
+	ret
+    @@: call	check_inv_all.skip_check
-;        cmp     eax,BUTTON_SCRLLT
+	ret
-;        jne     not_left
   btn.scroll_left:
-	dec	[left_col]
+	dec	[cur_tab.Editor.TopLeft.X] ;! [left_col]
 	jns	@f
-	inc	[left_col]
-	ret;jmp     still.skip_write
-    @@: call	check_inv_all.skip_check
-	ret
+	inc	[cur_tab.Editor.TopLeft.X] ;! [left_col]
-;  not_left:
+	ret;jmp     still.skip_write
+    @@: call	check_inv_all.skip_check
-;        cmp     eax,BUTTON_SCRLRT
+	ret
-;        jne     not_right
   btn.scroll_right:
-	inc	[left_col]
+	inc	[cur_tab.Editor.TopLeft.X] ;! [left_col]
-	mov	eax,[columns]
+	mov	eax,[cur_tab.Editor.Columns] ;! eax,[columns]
-	sub	eax,[columns.scr]
-	cmp	eax,[left_col]
-	jge	@f
+	sub	eax,[columns.scr]
-	dec	[left_col]
+	cmp	eax,[cur_tab.Editor.TopLeft.X] ;! eax,[left_col]
-	;dec     eax
-	;mov     [left_col],eax
-	ret;jmp     still.skip_write
-    @@: call	check_inv_all.skip_check
-	ret
-;  not_right:
+	jge	@f
 	dec	[cur_tab.Editor.TopLeft.X] ;! [left_col]
-; SEARCH {
+	ret
-;  search:
+    @@: call	check_inv_all.skip_check
-;        cmp     al,BUTTON_SEARCH
+	ret
 ;        jne     no_search
   btn.search:
   key.f3:
 	call	search
 	jc	@f
 	call	check_inv_all
     @@: ret
 func search
 	cld
-	mov	ecx,[pos.y]
+	mov	ecx,[cur_tab.Editor.Caret.Y] ;! ecx,[pos.y]
 	mov	edx,ecx
 	call	get_line_offset
 	cmp	word[esi],0
 	je	.exit
-	call	get_real_length
-	add	esi,4
-	or	eax,eax
+	call	get_real_length
-	jz	.end_line.2
+	add	esi,4
-	mov	ecx,eax
+	or	eax,eax
-	sub	ecx,[pos.x]
+	jz	.end_line.2
 	cmp	edi,[s_search.size]
 	jne	.next_ok
   .found:
 	add	esp,4
-	mov	[pos.y],edx
+	mov	[cur_tab.Editor.Caret.Y],edx ;! [pos.y],edx
-	mov	[sel.y],edx
+	mov	[cur_tab.Editor.SelStart.Y],edx ;! [sel.y],edx
 	mov	ecx,edx
 	lea	eax,[esi-4]
 	call	get_line_offset
 	sub	eax,esi
-	mov	[sel.x],eax
+	mov	[cur_tab.Editor.SelStart.X],eax ;! [sel.x],eax
 	add	eax,[s_search.size]
-	mov	[pos.x],eax
+	mov	[cur_tab.Editor.Caret.X],eax ;! [pos.x],eax
 	mov	[s_status],0
 	clc
 	ret
 	mov	[s_status],s_text_not_found
 	stc
 	ret
 endf
-; SEARCH }
-;  no_search:
-; TOOLBAR {
-;        cmp     eax,10000
-;        jb      no_toolbar
-;        add     eax,-10000
 ;        jnz     @f
   btn.compile:
   key.ctrl_f9:
-	mov	bl,0;[run_outfile],0
+	mov	bl,0
 	call	start_fasm
-	ret;jmp     still
-;    @@: dec     eax
-;        jnz     @f
+	ret
   btn.compile_run:
   key.f9:
-	mov	bl,1;[run_outfile],1
+	mov	bl,1
 	call	start_fasm
-	ret;jmp     still
-;    @@: dec     eax
-;        jnz     @f
+	ret
   btn.debug_board:
 	call	open_debug_board
-	ret;jmp     still
-;    @@: dec     eax
-;        jnz     still
+	ret
   btn.sysfuncs_txt:
-	call	open_sysfuncs_txt
-	ret;jmp     still
-; TOOLBAR }
-;  no_toolbar:
+	call	open_sysfuncs_txt
-;        cmp     al,4
-;        jne     noid4
-; LOAD_FILE {
+	ret
 ;  do_load_file:
-  btn.load_file:
-  key.ctrl_l:
-;        cmp     [s_fname],'/'
-;        jne     @f
-;        call    load_hd_file
-;        jmp     .restorecursor
+  btn.load_file:
-;    @@: call    load_file
+  key.ctrl_l:
 	call	load_file
-	jnc	@f
-	ret
+	jnc	@f
+	ret
-;    .restorecursor:
+    @@:
-    @@:
 	xor	eax,eax
-	mov	[top_line],eax
+	mov	[cur_tab.Editor.TopLeft.Y],eax ;! [top_line],eax
-	mov	[left_col],eax
+	mov	[cur_tab.Editor.TopLeft.X],eax ;! [left_col],eax
-	mov	[pos.x],eax
+	mov	[cur_tab.Editor.Caret.X],eax ;! [pos.x],eax
-	mov	[pos.y],eax
+	mov	[cur_tab.Editor.Caret.Y],eax ;! [pos.y],eax
-	mov	[sel.x],eax
+	mov	[cur_tab.Editor.SelStart.X],eax ;! [sel.x],eax
-	mov	[sel.y],eax
+	mov	[cur_tab.Editor.SelStart.Y],eax ;! [sel.y],eax
-	mov	[modified],al
+	mov	[cur_tab.Editor.Modified],al ;! [modified],al
 ; enable color syntax for ASM and INC files:
-	mov	[asm_mode],al
+	mov	[cur_tab.Editor.AsmMode],al ;! [asm_mode],al
-	mov	eax,[f_info.length] ; [s_fname.size]
+	mov	eax,[f_info.length]
-	add	eax,f_info.path ; s_fname
+	add	eax,f_info.path
 	mov	byte[eax],0
-	mov     ecx, dword [eax-3]
+	mov	ecx, dword [eax-3]
-	or      ecx, 0x202020
+	or	ecx, 0x202020
-	cmp     ecx, 'asm'
+	cmp	ecx, 'asm'
 	jne	@f
-	inc	[asm_mode]
+	inc	[cur_tab.Editor.AsmMode] ;! [asm_mode]
 	jmp	.nocol
-    @@: cmp	ecx, 'inc'
-	jne	.nocol
-	inc	[asm_mode]
-    .nocol:
-  update_caption:
-macro unused {
+    @@: cmp	ecx, 'inc'
-	movzx	ecx,[f_info.length] ; [s_fname.size]
-	add	ecx,10		   ; strlen(" - TINYPAD");
-	cmp	ecx,[s_title.size]
-	jne	@f
-	add	ecx,-10
-	mov	esi,f_info.path ; s_fname       ; strcmp(s_fname,header);
-	mov	edi,s_title
-	repe	cmpsb
-	jne	@f
-;       call    draw_file
-	clc
+	jne	.nocol
+	inc	[cur_tab.Editor.AsmMode] ;! [asm_mode]
-	ret;jmp     still
+    .nocol:
-    @@:
-}
+  update_caption:
-; set window title:
+	lea	esi,[cur_tab.Editor.FilePath] ;! mov     esi,f_info.path
-	mov	esi,f_info.path ; s_fname
+	mov	edi,s_title
 	mov	edi,s_title
+    @@: lodsb
+	cmp	al,0
+	je	@f
-	cld
+	stosb
-	mov	ecx,[f_info.length] ; [s_fname.size]
+	jmp	@b
-	jecxz	@f
+    @@:
-	;lea     eax,[ecx+10]
+	;cld
+	;mov     ecx,[f_info.length]
-	;mov     [s_title.size],eax
+	;jecxz   @f
-	;cld
+	;rep     movsb
 	rep	movsb
-	mov	dword[edi],' - '
-	add	edi,3
+	mov	dword[edi],' - '
-    @@: mov	esi,htext
-	mov	ecx,htext.size
-	rep	movsb
+	add	edi,3
-	mov	al,0
+    @@: mov	esi,htext
-	stosb
-;       call    drawwindow
-	clc
+	mov	ecx,htext.size
-	ret;jmp     still
+	cld
-; LOAD_FILE }
+	rep	movsb
-;  noid4:
+	mov	al,0
 	stosb
 ;        cmp     al, 2
-;        jz      yessave
+	mcall	71,1,s_title
-;        dec     al       ; close if butid == 1
+	clc
-;        jnz     nosave
-; EXIT:
-  btn.close_main_window:
-  key.alt_x:
-	mov	esi,self_path
-	mov	byte[esi+PATHL-1],0
+	ret
 	mov	edi,f_info.path
-	cld
+  btn.close_main_window:
-    @@: lodsb
+  key.alt_x:
-	stosb
+	mov	esi,self_path
-	or	al,al
+	mov	byte[esi+PATHL-1],0
-	jnz	@b
+	mov	edi,f_info.path
-;	mov	ebx,f_info
+	cld
-;	mov	dword[ebx+0],1
-;	mov	dword[ebx+8],self_path
-;	mov	dword[ebx+12],0
-;	mcall	58
-	mov	[f_info70+0],2
-	mov	[f_info70+4],0
+    @@: lodsb
-	mov	[f_info70+8],0
+	stosb
-	mov	[f_info70+12],TINYPAD_END
+	or	al,al
-	mov	[f_info70+16],0
-	mov	byte[f_info70+20],0
-	mov	[f_info70+21],f_info.path
-	mcall	70,f_info70
-;       test    eax,eax
-;       je      .close
-;       cmp     eax,6
-;       je      .close
-;       ret
-  .close:
-	mov	[main_closed],1
-	mcall	-1
-; SAVE_FILE {
-;  yessave:
-;  btn.save_file:
-;  key.ctrl_s:
-;        mov     [bot_mode],1
+	jnz	@b

Subversion Repositories Kolibri OS

(root)/programs/develop/tinypad/trunk/tp-button.asm – Rev 258 → 259