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

 	mov	esi,accel_table
   .acc: cmp	eax,[esi]
 	jne	@f
 	test	[options],OPTS_SECURESEL
 	jz	.lp1
-	m2m	[sel.x],[pos.x]
+	m2m	[cur_tab.Editor.SelStart.X],[cur_tab.Editor.Caret.X] ;! [sel.x],[pos.x]
-	m2m	[sel.y],[pos.y]
+	m2m	[cur_tab.Editor.SelStart.Y],[cur_tab.Editor.Caret.Y] ;! [sel.y],[pos.y]
   .lp1: mov	[s_status],0
 	call	dword[esi+4]
 	jmp	still
     @@: add	esi,8
 	cmp	byte[esi],0
 	movzx	eax,[eax+key1]
 	push	eax
 	test	[options],OPTS_SECURESEL
 	jz	.lp2
-	m2m	[sel.x],[pos.x]
+	m2m	[cur_tab.Editor.SelStart.X],[cur_tab.Editor.Caret.X] ;! [sel.x],[pos.x]
-	m2m	[sel.y],[pos.y]
+	m2m	[cur_tab.Editor.SelStart.Y],[cur_tab.Editor.Caret.Y] ;! [sel.y],[pos.y]
 	jmp	.put
   .lp2: call	delete_selection
 	test	[options],OPTS_AUTOBRACES
 	jz	.put
 	cmp	al,'['
 	jne	@f
 	mov	al,']'
 	call	.lp3
-	dec	[pos.x]
+	dec	[cur_tab.Editor.Caret.X] ;! [pos.x]
 	jmp	.put
     @@: cmp	al,'('
 	jne	@f
 	mov	al,')'
 	call	.lp3
-	dec	[pos.x]
+	dec	[cur_tab.Editor.Caret.X] ;! [pos.x]
 	jmp	.put
     @@: cmp	al,'{'
 	jne	.put
 	mov	al,'}'
 	call	.lp3
-	dec	[pos.x]
+	dec	[cur_tab.Editor.Caret.X] ;! [pos.x]
   .put: pop	eax
 	push	still
-	inc	[sel.x]
+	inc	[cur_tab.Editor.SelStart.X] ;! [sel.x]
-  .lp3: push	[pos.x] eax
+  .lp3: push	[cur_tab.Editor.Caret.X] eax ;! [pos.x] eax
 	inc	dword[esp+4]
 	mov	eax,1
 	jmp	key.tab.direct
 ;-----------------------------------------------------------------------------
 func key.ctrl_a ;///// SELECT ALL DOCUMENT ///////////////////////////////////
 ;-----------------------------------------------------------------------------
 	xor	eax,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	ecx,[lines]
+	mov	ecx,[cur_tab.Editor.Lines] ;! ecx,[lines]
 	dec	ecx
-	mov	[pos.y],ecx
+	mov	[cur_tab.Editor.Caret.Y],ecx ;! [pos.y],ecx
 	call	get_line_offset
 	call	get_real_length
-	mov	[pos.x],eax
+	mov	[cur_tab.Editor.Caret.X],eax ;! [pos.x],eax
 endf
 ;-----------------------------------------------------------------------------
 func key.ctrl_s ;///// ENTER SAVE FILENAME ///////////////////////////////////
 ;-----------------------------------------------------------------------------
-	cmp	[modified],0
+	cmp	[cur_tab.Editor.Modified],0 ;! [modified],0
 	je	.exit
 	cmp	[f_info.length],0
 	je	key.shift_ctrl_s
 	call	save_file
 endf
 ;-----------------------------------------------------------------------------
 func key.ctrl_n ;///// ENTER SAVE FILENAME ///////////////////////////////////
 ;-----------------------------------------------------------------------------
-	call	new_file
+	call	create_tab
 	ret
 endf
 	call	clear_selection
 ;-----------------------------------------------------------------------------
      key.shift_ctrl_left: ;///// GO TO PREVIOUS WORD, WITH SELECTION /////////
 ;-----------------------------------------------------------------------------
-	mov	ebx,[pos.y]
+	mov	ebx,[cur_tab.Editor.Caret.Y] ;! ebx,[pos.y]
-	mov	edx,[pos.x]
+	mov	edx,[cur_tab.Editor.Caret.X] ;! edx,[pos.x]
 	cld
 	mov	ecx,ebx
 	call	get_line_offset
   .lp1: cmp	dx,[esi]
 	movzx	edx,word[esi]
 	dec	edx
 	jmp	.lp2
     @@:
 	inc	edx
-	mov	[pos.y],ebx
+	mov	[cur_tab.Editor.Caret.Y],ebx ;! [pos.y],ebx
-	mov	[pos.x],edx
+	mov	[cur_tab.Editor.Caret.X],edx ;! [pos.x],edx
 	test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.y],ebx
+	mov	[cur_tab.Editor.SelStart.Y],ebx ;! [sel.y],ebx
-	mov	[sel.x],edx
+	mov	[cur_tab.Editor.SelStart.X],edx ;! [sel.x],edx
-    @@: sub	ebx,[top_line]
+    @@: sub	ebx,[cur_tab.Editor.TopLeft.Y] ;! ebx,[top_line]
 	jge	@f
-	add	[top_line],ebx
+	add	[cur_tab.Editor.TopLeft.Y],ebx ;! [top_line],ebx
     @@: mov	eax,edx
-	sub	eax,[left_col]
+	sub	eax,[cur_tab.Editor.TopLeft.X] ;! eax,[left_col]
 	cmp	eax,[columns.scr]
 	jl	@f
 	sub	eax,[columns.scr]
 	inc	eax
-	add	[left_col],eax
+	add	[cur_tab.Editor.TopLeft.X],eax ;! [left_col],eax
 	jmp	.exit
-    @@: cmp	edx,[left_col]
+    @@: cmp	edx,[cur_tab.Editor.TopLeft.X] ;! edx,[left_col]
 	jge	.exit
-	mov	[left_col],edx
+	mov	[cur_tab.Editor.TopLeft.X],edx ;! [left_col],edx
   .exit:
 	call	draw_file
   .exit.2:
 	ret
 endf
 	call	clear_selection
 ;-----------------------------------------------------------------------------
      key.shift_ctrl_right: ;///// GO TO NEXT WORD, WITH SELECTION ////////////
 ;-----------------------------------------------------------------------------
-	mov	ebx,[pos.y]
+	mov	ebx,[cur_tab.Editor.Caret.Y] ;! ebx,[pos.y]
-	mov	edx,[pos.x]
+	mov	edx,[cur_tab.Editor.Caret.X] ;! edx,[pos.x]
 	cld
   .lp1: mov	ecx,ebx
 	call	get_line_offset
 	movzx	ecx,word[esi]
 	je	@f
 	inc	edx
 	dec	ecx
 	jnz	@b
   .nx1: inc	ebx
-	cmp	ebx,[lines]
+	cmp	ebx,[cur_tab.Editor.Lines] ;! ebx,[lines]
 	jge	.exit.2
 	xor	edx,edx
 	jmp	.lp1
     @@:
 	jne	@f
 	inc	edx
 	dec	ecx
 	jnz	@b
   .nx2: inc	ebx
-	cmp	ebx,[lines]
+	cmp	ebx,[cur_tab.Editor.Lines] ;! ebx,[lines]
 	jge	.exit.2
 	xor	edx,edx
 	jmp	.lp2
     @@:
-	mov	[pos.y],ebx
+	mov	[cur_tab.Editor.Caret.Y],ebx ;! [pos.y],ebx
-	mov	[pos.x],edx
+	mov	[cur_tab.Editor.Caret.X],edx ;! [pos.x],edx
 	test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.y],ebx
+	mov	[cur_tab.Editor.SelStart.Y],ebx ;! [sel.y],ebx
-	mov	[sel.x],edx
+	mov	[cur_tab.Editor.SelStart.X],edx ;! [sel.x],edx
-    @@: sub	ebx,[top_line]
+    @@: sub	ebx,[cur_tab.Editor.TopLeft.Y] ;! ebx,[top_line]
 	cmp	ebx,[lines.scr]
 	jl	@f
 	sub	ebx,[lines.scr]
 	inc	ebx
-	add	[top_line],ebx
+	add	[cur_tab.Editor.TopLeft.Y],ebx ;! [top_line],ebx
     @@: mov	eax,edx
-	sub	eax,[left_col]
+	sub	eax,[cur_tab.Editor.TopLeft.X] ;! eax,[left_col]
 	cmp	eax,[columns.scr]
 	jl	@f
 	sub	eax,[columns.scr]
 	inc	eax
-	add	[left_col],eax
+	add	[cur_tab.Editor.TopLeft.X],eax ;! [left_col],eax
 	jmp	.exit
-    @@: cmp	edx,[left_col]
+    @@: cmp	edx,[cur_tab.Editor.TopLeft.X] ;! edx,[left_col]
 	jge	.exit
-	mov	[left_col],edx
+	mov	[cur_tab.Editor.TopLeft.X],edx ;! [left_col],edx
   .exit:
 	call	draw_file
   .exit.2:
 	ret
 endf
 func key.ctrl_x
 	cmp	[sel.selected],0
 	je	@f
 	call	key.ctrl_c
 	call	key.del
-	mov	[modified],1
+	mov	[cur_tab.Editor.Modified],1 ;! [modified],1
     @@: ret
 endf
 ;-----------------------------------------------------------------------------
 func key.ctrl_c
 	mov	[copy_size],0
 	cmp	[sel.selected],0
+	je	.exit
+	call	get_selection_size
+	mov	ebx,eax
+	mov	eax,[copy_buf]
+	call	mem.ReAlloc
+	mov	[copy_buf],eax
 	je	.exit
 	cld
 	mov	eax,[sel.begin.y]
 	cmp	eax,[sel.end.y]
 	je	.single_line
 	mov	ecx,[sel.begin.y]
 	call	get_line_offset
 	inc	ecx
 	push	ecx
-	mov	edi,AREA_CBUF
+	mov	edi,[copy_buf] ;! AREA_CBUF
 	call	get_real_length
 	sub	eax,[sel.begin.x]
 	jge	@f
 	xor	eax,eax
 	neg	eax
 	mov	ecx,eax
 	add	[ebx],eax
 	mov	al,' '
 	rep	stosb
-    @@: sub	edi,AREA_CBUF
+    @@: sub	edi,[copy_buf] ;! AREA_CBUF
 	mov	[copy_size],edi
 	mov	eax,[sel.end.y]
 	sub	eax,[sel.begin.y]
 	inc	eax
 	mov	[copy_count],eax
 	ret
   .single_line:
 	mov	eax,[sel.end.x]
 	sub	eax,[sel.begin.x]
-	mov	edi,AREA_CBUF
+	mov	edi,[copy_buf] ;! AREA_CBUF
 	stosd
 	mov	ecx,[sel.begin.y]
 	call	get_line_offset
 	mov	ebx,[sel.begin.x]
 	cmp	[copy_size],0
 	je	.exit
 	call	delete_selection
-	mov	ecx,[pos.y]
+	mov	ecx,[cur_tab.Editor.Caret.Y] ;! ecx,[pos.y]
 	call	get_line_offset
 	pushd	[esi] esi
-	mov	ecx,[pos.x]
+	mov	ecx,[cur_tab.Editor.Caret.X] ;! ecx,[pos.x]
 	call	line_add_spaces
+	mov	ecx,[copy_size]
-	mov	ecx,[copy_size]
+	sub	ecx,4
+	mov	edi,[cur_tab.Editor.Data] ;! AREA_TEMP2
-	sub	ecx,4
+	add	edi,[edi-4]
-	mov	edi,AREA_TEMP2
+	dec	edi
 	mov	eax,esi
 	mov	esi,edi
 	sub	esi,ecx
 	lea	ecx,[eax+4]
-	add	ecx,[pos.x]
+	add	ecx,[cur_tab.Editor.Caret.X] ;! ecx,[pos.x]
 	neg	ecx
 	lea	ecx,[esi+ecx+1]
 	jz	.single_line
 	cld
 	pop	edi
 	add	edi,4
-	mov	esi,AREA_CBUF
+	mov	esi,[copy_buf] ;! AREA_CBUF
 	lodsd
-	mov	ebx,[pos.x]
+	mov	ebx,[cur_tab.Editor.Caret.X] ;! ebx,[pos.x]
 	add	eax,ebx
 	mov	[edi-4],ax
 	sub	eax,ebx
 	add	[edi-4],cx
 	call	.check_columns
 	mov	ecx,eax
 	rep	movsb
-	mov	[pos.x],eax
+	mov	[cur_tab.Editor.Caret.X],eax ;! [pos.x],eax
-	mov	[sel.x],eax
+	mov	[cur_tab.Editor.SelStart.X],eax ;! [sel.x],eax
 	mov	eax,[copy_count]
 	dec	eax
-	add	[pos.y],eax
+	add	[cur_tab.Editor.Caret.Y],eax ;! [pos.y],eax
-	add	[sel.y],eax
+	add	[cur_tab.Editor.SelStart.Y],eax ;! [sel.y],eax
-	add	[lines],eax
+	add	[cur_tab.Editor.Lines],eax ;! [lines],eax
 	call	check_inv_all
-	mov	[modified],1
+	mov	[cur_tab.Editor.Modified],1 ;! [modified],1
 	jmp	.exit
   .single_line:
 	cld
 	pop	edi
 	add	edi,4
-	mov	esi,AREA_CBUF
+	mov	esi,[copy_buf] ;! AREA_CBUF
 	lodsd
 	add	[edi-4],ax
 	and	dword[edi-4],not 0x00020000
 	or	dword[edi-4],0x00010000
 	call	.check_columns
-	add	edi,[pos.x]
+	add	edi,[cur_tab.Editor.Caret.X] ;! edi,[pos.x]
 	add	esp,4
 	mov	ecx,eax
 	rep	movsb
-	add	[pos.x],eax
+	add	[cur_tab.Editor.Caret.X],eax ;! [pos.x],eax
-	add	[sel.x],eax
+	add	[cur_tab.Editor.SelStart.X],eax ;! [sel.x],eax
 	call	check_inv_all
-	mov	[modified],1
+	mov	[cur_tab.Editor.Modified],1 ;! [modified],1
   .exit:
 	ret
   .check_columns:
 	push	eax
 	movzx	eax,word[edi-4]
-	cmp	eax,[columns]
+	cmp	eax,[cur_tab.Editor.Columns] ;! eax,[columns]
 endf
 ;-----------------------------------------------------------------------------
 func key.ctrl_d ;///// INSERT SEPARATOR //////////////////////////////////////
 ;-----------------------------------------------------------------------------
-	mov	ecx,[pos.y]
+	mov	ecx,[cur_tab.Editor.Caret.Y] ;! ecx,[pos.y]
 	call	get_line_offset
 	mov	ebx,esi
-	mov	ecx,[lines]
+	mov	ecx,[cur_tab.Editor.Lines] ;! ecx,[lines]
 	call	get_line_offset
 	lea	edi,[esi+90+4]
 	lea	ecx,[esi+4]
 	mov	al,' '
 	mov	ecx,10
 	rep	stosb
 	mov	byte[ebx+4],';'
-	inc	[lines]
+	inc	[cur_tab.Editor.Lines] ;! [lines]
-	inc	[pos.y]
+	inc	[cur_tab.Editor.Caret.Y] ;! [pos.y]
-	m2m	[sel.y],[pos.y]
+	m2m	[cur_tab.Editor.SelStart.Y],[cur_tab.Editor.Caret.Y] ;! [sel.y],[pos.y]
 	call	check_inv_all
-	mov	[modified],1
+	mov	[cur_tab.Editor.Modified],1 ;! [modified],1
   .exit:
 	ret
 endf
 ;-----------------------------------------------------------------------------
 func key.ctrl_y ;///// DELETE CURRENT LINE ///////////////////////////////////
 ;-----------------------------------------------------------------------------
-	mov	eax,[pos.y]
+	mov	eax,[cur_tab.Editor.Caret.Y] ;! eax,[pos.y]
 	inc	eax
-	cmp	eax,[lines]
+	cmp	eax,[cur_tab.Editor.Lines] ;! eax,[lines]
 	jge	.exit
-	mov	ecx,[pos.y]
+	mov	ecx,[cur_tab.Editor.Caret.Y] ;! ecx,[pos.y]
 	call	get_line_offset
 	mov	edi,esi
 	lodsd
 	add	esi,eax
-	dec	[lines]
+	dec	[cur_tab.Editor.Lines] ;! [lines]
-	mov	ecx,AREA_TEMP2
+	mov	ecx,[temp_buf] ;! AREA_TEMP2
 	sub	ecx,esi
 	shr	ecx,2		       ;// fixed (was 4)
 	cld
 	call	clear_selection
 ;-----------------------------------------------------------------------------
      key.shift_up: ;///// GO TO PREVIOUS LINE, WITH SELECTION ////////////////
 ;-----------------------------------------------------------------------------
-	mov	eax,[pos.y]
+	mov	eax,[cur_tab.Editor.Caret.Y] ;! eax,[pos.y]
 	dec	eax
 	jns	@f
 	xor	eax,eax
-    @@: mov	ecx,[top_line]
+    @@: mov	ecx,[cur_tab.Editor.TopLeft.Y] ;! ecx,[top_line]
 	cmp	eax,ecx
 	jae	@f
 	dec	ecx
 	jns	@f
 	xor	ecx,ecx
     @@: test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.y],eax
+	mov	[cur_tab.Editor.SelStart.Y],eax ;! [sel.y],eax
     @@: call	check_inv_all.skip_init
   .exit:
 ;-----------------------------------------------------------------------------
      key.shift_down: ;///// GO TO NEXT LINE, WITH SELECTION //////////////////
 ;-----------------------------------------------------------------------------
-	mov	eax,[pos.y]
+	mov	eax,[cur_tab.Editor.Caret.Y] ;! eax,[pos.y]
 	inc	eax
-	cmp	eax,[lines]
+	cmp	eax,[cur_tab.Editor.Lines] ;! eax,[lines]
 	jb	@f
 	dec	eax
-    @@: mov	ecx,[top_line]
+    @@: mov	ecx,[cur_tab.Editor.TopLeft.Y] ;! ecx,[top_line]
 	mov	edx,eax
 	sub	edx,ecx
 	cmp	edx,[lines.scr]
 	jb	@f
 	inc	ecx
     @@: test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.y],eax
+	mov	[cur_tab.Editor.SelStart.Y],eax ;! [sel.y],eax
     @@: call	check_inv_all.skip_init
 	call	clear_selection
 ;-----------------------------------------------------------------------------
      key.shift_left: ;///// GO TO PREVIOUS CHAR, WITH SELECTION //////////////
 ;-----------------------------------------------------------------------------
-	mov	eax,[pos.x]
+	mov	eax,[cur_tab.Editor.Caret.X] ;! eax,[pos.x]
 	dec	eax
 	jns	@f
 	inc	eax
     @@: test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.x],eax
+	mov	[cur_tab.Editor.SelStart.X],eax ;! [sel.x],eax
-    @@: mov	[pos.x],eax
+    @@: mov	[cur_tab.Editor.Caret.X],eax ;! [pos.x],eax
 	call	 check_inv_all
   .exit:
 	call	clear_selection
 ;-----------------------------------------------------------------------------
      key.shift_right: ;///// GO TO NEXT CHAR, WITH SELECTION /////////////////
 ;-----------------------------------------------------------------------------
-	mov	eax,[pos.x]
+	mov	eax,[cur_tab.Editor.Caret.X] ;! eax,[pos.x]
 	inc	eax
-	cmp	eax,[columns]
+	cmp	eax,[cur_tab.Editor.Columns] ;! eax,[columns]
 	jbe	@f
 	dec	eax
     @@: test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.x],eax
+	mov	[cur_tab.Editor.SelStart.X],eax ;! [sel.x],eax
-    @@: mov	[pos.x],eax
+    @@: mov	[cur_tab.Editor.Caret.X],eax ;! [pos.x],eax
 	call	check_inv_all
   .exit:
 ;-----------------------------------------------------------------------------
      key.shift_pgup: ;///// GO TO PREVIOUS PAGE, WITH SELECTION //////////////
 ;-----------------------------------------------------------------------------
 	mov	edx,[lines.scr]
 	dec	edx
-	mov	eax,[pos.y]
+	mov	eax,[cur_tab.Editor.Caret.Y] ;! eax,[pos.y]
-	mov	ecx,[top_line]
+	mov	ecx,[cur_tab.Editor.TopLeft.Y] ;! ecx,[top_line]
 	sub	eax,edx
 	jns	@f
 	xor	eax,eax
     @@: sub	ecx,edx
 	jns	@f
 	xor	ecx,ecx
     @@: test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.y],eax
+	mov	[cur_tab.Editor.SelStart.Y],eax ;! [sel.y],eax
     @@: call	check_inv_all.skip_init
   .exit:
 	ret
 ;-----------------------------------------------------------------------------
      key.shift_pgdn: ;///// GO TO NEXT PAGE, WITH SELECTION //////////////////
 ;-----------------------------------------------------------------------------
 	mov	edx,[lines.scr]
 	dec	edx
-	mov	eax,[pos.y]
+	mov	eax,[cur_tab.Editor.Caret.Y] ;! eax,[pos.y]
-	mov	ecx,[top_line]
+	mov	ecx,[cur_tab.Editor.TopLeft.Y] ;! ecx,[top_line]
 	add	eax,edx
 	add	ecx,edx
-	cmp	eax,[lines]
+	cmp	eax,[cur_tab.Editor.Lines] ;! eax,[lines]
 	jb	@f
-	mov	eax,[lines]
+	mov	eax,[cur_tab.Editor.Lines] ;! eax,[lines]
 	dec	eax
     @@: test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.y],eax
+	mov	[cur_tab.Editor.SelStart.Y],eax ;! [sel.y],eax
     @@: call	check_inv_all.skip_init
   .exit:
 	ret
 	call	clear_selection
 ;-----------------------------------------------------------------------------
      key.shift_home: ;///// GO TO LINE START, WITH SELECTION /////////////////
 ;-----------------------------------------------------------------------------
-	mov	[pos.x],0
+	mov	[cur_tab.Editor.Caret.X],0 ;! [pos.x],0
 	test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.x],0
+	mov	[cur_tab.Editor.SelStart.X],0 ;! [sel.x],0
     @@: call	check_inv_all
   .exit:
 	call	clear_selection
 ;-----------------------------------------------------------------------------
      key.shift_end: ;///// GO TO LINE END, WITH SELECTION ////////////////////
 ;-----------------------------------------------------------------------------
-	mov	ecx,[pos.y]
+	mov	ecx,[cur_tab.Editor.Caret.Y] ;! ecx,[pos.y]
 	call	get_line_offset
 	call	get_real_length
-	mov	[pos.x],eax
+	mov	[cur_tab.Editor.Caret.X],eax ;! [pos.x],eax
 	test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.x],eax
+	mov	[cur_tab.Editor.SelStart.X],eax ;! [sel.x],eax
     @@: call	check_inv_all
   .exit:
 	call	clear_selection
 ;-----------------------------------------------------------------------------
      key.shift_ctrl_home: ;///// GO TO PAGE START, WITH SELECTION ////////////
 ;-----------------------------------------------------------------------------
-	mov	eax,[top_line]
+	mov	eax,[cur_tab.Editor.TopLeft.Y] ;! eax,[top_line]
 	mov	ecx,eax
 	test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.y],eax
+	mov	[cur_tab.Editor.SelStart.Y],eax ;! [sel.y],eax
     @@: call	check_inv_all.skip_init
   .exit:
 	call	clear_selection
 ;-----------------------------------------------------------------------------
      key.shift_ctrl_end: ;///// GO TO PAGE END, WITH SELECTION ///////////////
 ;-----------------------------------------------------------------------------
-	mov	ecx,[top_line]
+	mov	ecx,[cur_tab.Editor.TopLeft.Y] ;! ecx,[top_line]
 	mov	eax,[lines.scr]
-	cmp	eax,[lines]
+	cmp	eax,[cur_tab.Editor.Lines] ;! eax,[lines]
 	jle	@f
-	mov	eax,[lines]
+	mov	eax,[cur_tab.Editor.Lines] ;! eax,[lines]
     @@: add	eax,ecx
 	dec	eax
 	test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.y],eax
+	mov	[cur_tab.Editor.SelStart.Y],eax ;! [sel.y],eax
     @@: call	check_inv_all.skip_init
   .exit:
 ;-----------------------------------------------------------------------------
      key.shift_ctrl_pgup: ;///// GO TO DOCUMENT START, WITH SELECTION ////////
 ;-----------------------------------------------------------------------------
 	xor	eax,eax
-	mov	[top_line],eax
+	mov	[cur_tab.Editor.TopLeft.Y],eax ;! [top_line],eax
-	mov	[pos.y],eax
+	mov	[cur_tab.Editor.Caret.Y],eax ;! [pos.y],eax
 	test	byte[shi+2],0x01
 	jnz	@f
-	mov	[sel.y],eax
+	mov	[cur_tab.Editor.SelStart.Y],eax ;! [sel.y],eax
     @@: call	check_inv_all.skip_check
   .exit:
 	call	clear_selection
 ;-----------------------------------------------------------------------------
      key.shift_ctrl_pgdn: ;///// GO TO DOCUMENT END, WITH SELECTION //////////
 ;-----------------------------------------------------------------------------
-	mov	eax,[lines]    ; eax = lines in the file
+	mov	eax,[cur_tab.Editor.Lines] ;! eax,[lines]    ; eax = lines in the file
-	mov	[pos.y],eax
+	mov	[cur_tab.Editor.Caret.Y],eax ;! [pos.y],eax
 	sub	eax,[lines.scr]   ; eax -= lines on the screen
 	jns	@f
 	xor	eax,eax
-    @@: mov	[top_line],eax
+    @@: mov	[cur_tab.Editor.TopLeft.Y],eax ;! [top_line],eax
-	dec	[pos.y]
+	dec	[cur_tab.Editor.Caret.Y] ;! [pos.y]
 	test	byte[shi+2],0x01
+	jnz	@f
-	jnz	@f
+	m2m	[cur_tab.Editor.SelStart.Y],[cur_tab.Editor.Caret.Y]
-	push	[pos.y]
+;!      push    [pos.y]
-	pop	[sel.y]
+;!      pop     [sel.y]
     @@: call	check_inv_all.skip_check
   .exit:
 func key.del ;///// DELETE NEXT CHAR OR SELECTION ////////////////////////////
 ;-----------------------------------------------------------------------------
 	call	delete_selection
 	jnc	.exit.2
-	mov	ecx,[pos.y]
+	mov	ecx,[cur_tab.Editor.Caret.Y] ;! ecx,[pos.y]
 	call	get_line_offset
 	and	dword[esi],not 0x00020000
 	or	dword[esi],0x00010000
 	lea	ebx,[esi+4]
 	mov	ebp,esi
 	call	get_real_length
 	or	eax,eax
 	je	.line_up
-	mov	ecx,[pos.x]
+	mov	ecx,[cur_tab.Editor.Caret.X] ;! ecx,[pos.x]
 	cmp	ecx,eax
 	jae	.line_up
 	lea	edi,[ebx+ecx]
 	neg	ecx
 	movzx	eax,word[ebp]
 	add	ecx,eax;[ebp]
 	repe	scasb
 	je	.line_up
 	mov	edi,ebx
-	mov	ecx,[pos.x]
+	mov	ecx,[cur_tab.Editor.Caret.X] ;! ecx,[pos.x]
 	add	edi,ecx
 	lea	esi,[edi+1]
 	neg	ecx
 	movzx	eax,word[ebp]
 	add	ecx,eax;[ebp]
 	dec	ecx
 	rep	movsb
 	mov	byte[edi],' '
-	m2m	[sel.x],[pos.x]
+	m2m	[cur_tab.Editor.SelStart.X],[cur_tab.Editor.Caret.X] ;! [sel.x],[pos.x]
-	m2m	[sel.y],[pos.y]
+	m2m	[cur_tab.Editor.SelStart.Y],[cur_tab.Editor.Caret.Y] ;! [sel.y],[pos.y]
 	call	check_inv_all
-	mov	[modified],1
+	mov	[cur_tab.Editor.Modified],1 ;! [modified],1
 	ret
+  .line_up:
-  .line_up:
+	mov	eax,[cur_tab.Editor.Lines] ;! eax,[lines]
-	mov	eax,[lines]
+	dec	eax
-	dec	eax
+	cmp	eax,[cur_tab.Editor.Caret.Y] ;! eax,[pos.y]
+	je	.exit
-	cmp	eax,[pos.y]
+	mov	edi,[temp_buf] ;! AREA_TEMP+4
-	je	.exit
+	add	edi,4
-	mov	edi,AREA_TEMP+4
+	mov	esi,ebx
-	mov	esi,ebx
+	mov	ecx,[cur_tab.Editor.Caret.X] ;! ecx,[pos.x]
-	mov	ecx,[pos.x]
+	rep	movsb
-	rep	movsb
+	mov	ecx,[cur_tab.Editor.Caret.X] ;! ecx,[pos.x]
-	mov	ecx,[pos.x]
+	mov	eax,[temp_buf]
 	rep	stosb
     @@: lea	esi,[ebx+4]
 	movzx	eax,word[ebp]
 	add	esi,eax;[ebp]
 	movzx	ecx,word[esi-4]
+	mov	eax,[temp_buf]
-	add	[AREA_TEMP],ecx
+	add	[eax],ecx ;! [AREA_TEMP],ecx
-	or	dword[AREA_TEMP],0x00010000
+	or	dword[eax],0x00010000 ;! dword[AREA_TEMP],0x00010000
 	rep	movsb
+	mov	ecx,edi ;! [edi-AREA_TEMP]
-	lea	ecx,[edi-AREA_TEMP]
+	sub	ecx,[temp_buf]
-	mov	esi,AREA_TEMP
+	mov	esi,[temp_buf] ;! AREA_TEMP
 	call	get_real_length
-	cmp	eax,[columns]
+	cmp	eax,[cur_tab.Editor.Columns] ;! eax,[columns]
 	jbe	@f
-	mov	[columns],eax
+	mov	[cur_tab.Editor.Columns],eax ;! [columns],eax
+    @@:
-    @@:
+	push	ecx
+	mov	edi,[cur_tab.Editor.Data] ;! AREA_TEMP2
-	push	ecx
+	add	edi,[edi-4]
-	mov	edi,AREA_TEMP2
+	dec	edi
 	lea	esi,[edi+8]
 	sub	esi,ecx
 	movzx	eax,word[ebp]
 	lea	esi,[ebp+8]
 	movzx	eax,word[esi-8]
 	add	esi,eax;[esi-8]
 	movzx	eax,word[esi-4]
 	add	esi,eax;[esi-4]
+	mov	ecx,[cur_tab.Editor.Data] ;! AREA_TEMP2
-	mov	ecx,AREA_TEMP2
+	add	ecx,[ecx-4]
 	sub	ecx,esi
 	cld
     @@: rep	movsb
   .lp1: pop	ecx
-	mov	esi,AREA_TEMP
+	mov	esi,[temp_buf] ;! AREA_TEMP
 	mov	edi,ebp
 	cld
 	rep	movsb
   .ok.dec.lines:
-	dec	[lines]
+	dec	[cur_tab.Editor.Lines] ;! [lines]
-	mov	eax,[lines]
+	mov	eax,[cur_tab.Editor.Lines] ;! eax,[lines]
-	cmp	[pos.y],eax
+	cmp	[cur_tab.Editor.Caret.Y],eax ;! [pos.y],eax
 	jb	@f
 	dec	eax
-	mov	[pos.y],eax
+	mov	[cur_tab.Editor.Caret.Y],eax ;! [pos.y],eax
-    @@: m2m	[sel.x],[pos.x]
+    @@: m2m	[cur_tab.Editor.SelStart.X],[cur_tab.Editor.Caret.X] ;! [sel.x],[pos.x]
-	m2m	[sel.y],[pos.y]
+	m2m	[cur_tab.Editor.SelStart.Y],[cur_tab.Editor.Caret.Y] ;! [sel.y],[pos.y]
-	mov	[modified],1
+	mov	[cur_tab.Editor.Modified],1 ;! [modified],1
   .exit.2:
 	call	check_inv_all
 func key.bkspace ;///// DELETE PREVIOUS CHAR OR SELECTION ////////////////////
 ;-----------------------------------------------------------------------------
 	call	delete_selection
 	jnc	key.del.exit.2
-	mov	eax,[pos.x]
+	mov	eax,[cur_tab.Editor.Caret.X] ;! eax,[pos.x]
 	dec	eax
 	js	.line_up
-	dec	[pos.x]
+	dec	[cur_tab.Editor.Caret.X] ;! [pos.x]
-	mov	ecx,[pos.y]
+	mov	ecx,[cur_tab.Editor.Caret.Y] ;! ecx,[pos.y]
 	call	get_line_offset
 	and	dword[esi],not 0x00020000
 	or	dword[esi],0x00010000
 	mov	ebx,eax
 	call	get_real_length
-	cmp	eax,[pos.x]
+	cmp	eax,[cur_tab.Editor.Caret.X] ;! eax,[pos.x]
 	jae	@f
-	m2m	[sel.x],[pos.x]
+	m2m	[cur_tab.Editor.SelStart.X],[cur_tab.Editor.Caret.X] ;! [sel.x],[pos.x]
 	call	check_inv_all
-	mov	[modified],1
+	mov	[cur_tab.Editor.Modified],1 ;! [modified],1
 	ret
 	lea	esi,[edi+1]
 	cld
 	rep	movsb
 	mov	byte[edi],' '
-	m2m	[sel.x],[pos.x]
+	m2m	[cur_tab.Editor.SelStart.X],[cur_tab.Editor.Caret.X] ;! [sel.x],[pos.x]
-	m2m	[sel.y],[pos.y]
+	m2m	[cur_tab.Editor.SelStart.Y],[cur_tab.Editor.Caret.Y] ;! [sel.y],[pos.y]
 	call	check_inv_str
-	mov	[modified],1
+	mov	[cur_tab.Editor.Modified],1 ;! [modified],1
 	ret
   .line_up:
-	cmp	[pos.y],0
+	cmp	[cur_tab.Editor.Caret.Y],0 ;! [pos.y],0
 	jne	@f
 	ret
-    @@: mov	ecx,[pos.y]
+    @@: mov	ecx,[cur_tab.Editor.Caret.Y] ;! ecx,[pos.y]
 	dec	ecx
 	call	get_line_offset
 	movzx	ecx,word[ebp]
     @@: cmp	byte[ebx+ecx-1],' '
 	jne	@f
 	dec	ecx
 	jg	@b
-    @@: mov	[pos.x],ecx
+    @@: mov	[cur_tab.Editor.Caret.X],ecx ;! [pos.x],ecx
-	dec	[pos.y]
+	dec	[cur_tab.Editor.Caret.Y] ;! [pos.y]
 	cld
 	jmp	key.del.line_up
 endf
 ;-----------------------------------------------------------------------------
 func key.tab ;///// TABULATE /////////////////////////////////////////////////
 ;-----------------------------------------------------------------------------
 	call	delete_selection
-	mov	eax,[pos.x]
+	mov	eax,[cur_tab.Editor.Caret.X] ;! eax,[pos.x]
 	mov	ecx,eax
 	add	eax,ATABW
 	and	eax,not(ATABW-1)
 	push	eax ' '
 	sub	eax,ecx
   .direct:
-	mov	ecx,[pos.y]
+	mov	ecx,[cur_tab.Editor.Caret.Y] ;! ecx,[pos.y]
 	call	get_line_offset
 	and	dword[esi],not 0x00020000
 	or	dword[esi],0x00010000
 	xchg	eax,ecx
 	call	get_real_length
-	cmp	eax,[pos.x]
+	cmp	eax,[cur_tab.Editor.Caret.X] ;! eax,[pos.x]
 	jae	@f
-	mov	eax,[pos.x]
+	mov	eax,[cur_tab.Editor.Caret.X] ;! eax,[pos.x]
     @@: movzx	edx,word[esi]
+	sub	edx,eax
+	cmp	ecx,edx
+	jl	@f
-	sub	edx,eax
+	pushad; esi ecx eax
+	mov	ecx,[cur_tab.Editor.Data] ;! AREA_TEMP2-10+1
-	cmp	ecx,edx
+	add	ecx,[ecx-4]
-	jl	@f
+	dec	ecx
-	pushad; esi ecx eax
+	mov	edi,ecx ;! AREA_TEMP2
-	mov	ecx,AREA_TEMP2-10+1
+	add	ecx,-10+1
 ;       lea     eax,[esi+4]
-;       add     eax,[esi]
-	movzx	eax,word[esi]
+;       add     eax,[esi]
-	lea	eax,word[esi+eax+4]
+	movzx	eax,word[esi]
-	sub	ecx,eax
+	lea	eax,word[esi+eax+4]
-	mov	edi,AREA_TEMP2
+	sub	ecx,eax
-	mov	esi,AREA_TEMP2-10
+	lea	esi,[edi-10] ;! AREA_TEMP2-10
 	std
 	lea	edi,[ebx+edi-1]
 	mov	esi,edi
 	sub	esi,ecx
 	lea	ecx,[esi+1]
 	sub	ecx,ebx
-	sub	ecx,[pos.x]
+	sub	ecx,[cur_tab.Editor.Caret.X] ;! ecx,[pos.x]
 	std
 	rep	movsb
   .ok:	pop	ecx		;*******
 	pop	eax
 	rep	stosb
 	cld
-	pop	[pos.x]
+	pop	[cur_tab.Editor.Caret.X] ;! [pos.x]
 	lea	esi,[ebx-4]
 	call	get_real_length
-	cmp	eax,[pos.x]
+	cmp	eax,[cur_tab.Editor.Caret.X] ;! eax,[pos.x]
 	jae	@f
-	mov	eax,[pos.x]
+	mov	eax,[cur_tab.Editor.Caret.X] ;! eax,[pos.x]
-    @@: cmp	eax,[columns]
+    @@: cmp	eax,[cur_tab.Editor.Columns] ;! eax,[columns]
 	jbe	@f
-	mov	[columns],eax
+	mov	[cur_tab.Editor.Columns],eax ;! [columns],eax
-    @@: m2m	[sel.x],[pos.x]
+    @@: m2m	[cur_tab.Editor.SelStart.X],[cur_tab.Editor.Caret.X] ;! [sel.x],[pos.x]
-	m2m	[sel.y],[pos.y]
+	m2m	[cur_tab.Editor.SelStart.Y],[cur_tab.Editor.Caret.Y] ;! [sel.y],[pos.y]
 	call	check_inv_all
-	mov	[modified],1
+	mov	[cur_tab.Editor.Modified],1 ;! [modified],1
   .exit:
 	ret
 endf
 ;-----------------------------------------------------------------------------
 func key.return ;///// CARRIAGE RETURN ///////////////////////////////////////
 ;-----------------------------------------------------------------------------
 	call	delete_selection
-	mov	ecx,[pos.y]
+	mov	ecx,[cur_tab.Editor.Caret.Y] ;! ecx,[pos.y]
 	call	get_line_offset
-	mov	ebx,[pos.x]
+	mov	ebx,[cur_tab.Editor.Caret.X] ;! ebx,[pos.x]
 	cmp	bx,[esi]
 	jb	@f
 	movzx	ebx,word[esi]
 	dec	ebx
 	jns	@f
 	xor	ebx,ebx
     @@:
-	cld
 	cld
 	mov	edi,AREA_TEMP
-	mov	ebp,esi
+	mov	edi,[temp_buf] ;! AREA_TEMP
-	mov	ecx,ebx
+	mov	ebp,esi
-	inc	ecx
+	lea	ecx,[ebx+1]
 	dec	eax
 	jmp	@f
   .lp2: xor	eax,eax
     @@: mov	edx,edi
 	add	edi,4
-	mov	[pos.x],eax
+	mov	[cur_tab.Editor.Caret.X],eax ;! [pos.x],eax
 	jecxz	@f
 	push	ecx
 	mov	ecx,eax
 	mov	al,' '
 	rep	stosb
 	lea	eax,[edi-4]
 	sub	eax,edx
 	or	eax,0x00010000
 	mov	[edx],eax
+	mov	ecx,edi ;! [edi-AREA_TEMP]
-	lea	ecx,[edi-AREA_TEMP]
+	sub	ecx,[temp_buf]
+	push	ecx
+	mov	edi,[cur_tab.Editor.Data] ;! AREA_TEMP2
-	push	ecx
+	add	edi,[edi-4]
-	mov	edi,AREA_TEMP2
+	dec	edi
 	lea	esi,[edi+4]
 	sub	esi,ecx
 	movzx	ecx,word[ebp]
 	lea	esi,[ebp+4]
 	mov	eax,[esp]
 	lea	edi,[esi+eax-4]
 	movzx	ecx,word[ebp]
 	add	esi,ecx;[ebp]
+	mov	ecx,[cur_tab.Editor.Data] ;! AREA_TEMP2
-	mov	ecx,AREA_TEMP2
+	add	ecx,[ecx-4]
 	sub	ecx,esi
 	cld
     @@: rep	movsb
   .lp3: pop	ecx
-	mov	esi,AREA_TEMP
+	mov	esi,[temp_buf] ;! AREA_TEMP
 	mov	edi,ebp
 	cld
 	rep	movsb
-	inc	[pos.y]
+	inc	[cur_tab.Editor.Caret.Y] ;! [pos.y]
-	inc	[sel.y]
+	inc	[cur_tab.Editor.SelStart.Y] ;! [sel.y]
-	inc	[lines]
+	inc	[cur_tab.Editor.Lines] ;! [lines]
-	m2m	[sel.x],[pos.x]
+	m2m	[cur_tab.Editor.SelStart.X],[cur_tab.Editor.Caret.X] ;! [sel.x],[pos.x]
 	call	check_inv_all
-	mov	[modified],1
+	mov	[cur_tab.Editor.Modified],1 ;! [modified],1
+  .exit:
+	ret
+endf
+;-----------------------------------------------------------------------------
+func key.ctrl_tab ;///// SWITCH TO NEXT TAB //////////////////////////////////
+;-----------------------------------------------------------------------------
+	cmp	[tab_bar.Items.Count],1
+	je	.exit
+	xor	eax,eax
+	mov	ebp,[tab_bar.Items]
+    @@: cmp	ebp,[tab_bar.Current.Ptr]
+	je	@f
+	inc	eax
+	add	ebp,sizeof.TABITEM
+	jmp	@b
+    @@: add	ebp,sizeof.TABITEM
+	inc	eax
+	cmp	eax,[tab_bar.Items.Count]
+	jb	@f
+	mov	ebp,[tab_bar.Items]
+    @@: call	set_cur_tab
+	call	align_editor_in_tab
+	call	draw_editor
+	call	draw_tabctl
+  .exit:
+	ret
+endf
+;-----------------------------------------------------------------------------
+func key.shift_ctrl_tab ;///// SWITCH TO PREVIOUS TAB ////////////////////////
+;-----------------------------------------------------------------------------
+	cmp	[tab_bar.Items.Count],1
+	je	.exit
+	xor	eax,eax
+	mov	ebp,[tab_bar.Items]
+    @@: cmp	ebp,[tab_bar.Current.Ptr]
+	je	@f
+	inc	eax
+	add	ebp,sizeof.TABITEM
+	jmp	@b
+    @@: add	ebp,-sizeof.TABITEM
+	dec	eax
+	jge	@f
+	imul	eax,[tab_bar.Items.Count],sizeof.TABITEM
+	add	eax,[tab_bar.Items]
+	lea	ebp,[eax-sizeof.TABITEM]
+    @@: call	set_cur_tab
+	call	align_editor_in_tab
+	call	draw_editor
+	call	draw_tabctl

Subversion Repositories Kolibri OS

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