upgrade editbox 07.03.2007

git-svn-id: svn://kolibrios.org@396 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/develop/examples/editbox/trunk/EDITBOX.INC

@@ -1,3 +1,4 @@
+; <Lrz> 07.03.2007 <20><><EFBFBD><EFBFBD>ᠫ <20><>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD><EFBFBD> <20> shift home + end <20><><EFBFBD>ࠢ<EFBFBD><E0A0A2> <20><>᪮<EFBFBD>쪮 <20><><EFBFBD><EFBFBD><EFBFBD>
 ; <Lrz> 06.03.2007 <20><>९<EFBFBD>ᠫ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD><EFBFBD> shift
 ; <Lrz> 15.02.2007 <20><><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2> <20><><EFBFBD>頥<EFBFBD><E9A0A5><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD>⥫쭮 <20><><EFBFBD><EFBFBD>⭥<EFBFBD> ࠡ<>⠥<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ; <Lrz> 13.02.2007 <20><>ࠫ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>栭<EFBFBD><E6A0AD>, <20><><EFBFBD><EFBFBD>襭<EFBFBD> <20><>ࠡ<EFBFBD>⪠ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2> 䮭<>
@@ -69,8 +70,8 @@ ed_pos	equ [edi+42]                    ;
 ed_offset	equ [edi+46]            ;ᬥ饭<E1ACA5><E9A5AD>
 cl_curs_x	equ [edi+50]		;<3B>।<EFBFBD><E0A5A4><EFBFBD>饥 <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20>
 cl_curs_y	equ [edi+54]		;<3B>।<EFBFBD><E0A5A4><EFBFBD>饥 <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20>
-ed_shift_pos	equ [edi+58]
+ed_shift_pos	equ [edi+58]            ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-ed_shift_pos_old equ [edi+62]
+ed_shift_pos_old equ [edi+62]           ;<3B><><EFBFBD>஥ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ;==========================================================
 ;=== <20><><EFBFBD>楤<EFBFBD><E6A5A4><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2> =================================
 ;==========================================================
@@ -93,26 +94,6 @@ pusha
 	call	.draw_text
 popa
 ret
-
-;.str:
-;	mov ecx,0x0a ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⥬<EFBFBD> <20><><EFBFBD>᫥<EFBFBD><E1ABA5><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ॣ<><E0A5A3><EFBFBD><EFBFBD><EFBFBD> ebx,eax,ecx,edx <20>室<EFBFBD><E5AEA4><EFBFBD> <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD> eax - <20><>᫮
-;	 ;<3B><><EFBFBD>ॢ<EFBFBD><E0A5A2> <20><>᫠ <20> ASCII <20><>ப<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ecx=<3D><><EFBFBD>⥬<EFBFBD> <20><><EFBFBD>᫥<EFBFBD><E1ABA5> edi <20><><EFBFBD><EFBFBD><EFBFBD> <20>㤠 <20><><EFBFBD><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0>, <20>㤥<EFBFBD> <20><>ப<EFBFBD>, <20><><EFBFBD>祬 <20><><EFBFBD><EFBFBD><EFBFBD> <20><>६<EFBFBD><E0A5AC><EFBFBD><EFBFBD><EFBFBD> 
-;	cmp eax,ecx  ;<3B>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD> <20>᫨ <20> eax <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 祬 <20> ecx <20><> <20><>३<EFBFBD><E0A5A9> <20><> @@-1 <20>.<2E>. <20><> pop eax
-;	jb @f
-;	xor edx,edx  ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> edx
-;	div ecx      ;ࠧ<><E0A0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD>⮪ <20> edx
-;	push edx     ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20>⥪
-;	;dec edi	     ;ᬥ饭<E1ACA5><E9A5AD> <20><><EFBFBD><EFBFBD>室<EFBFBD><E5AEA4><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>ப<EFBFBD>
-;	call .str;<3B><>३<EFBFBD><E0A5A9> <20><> ᠬ<> ᥡ<> <20>.<2E>. <20>맢<EFBFBD><EBA7A2><EFBFBD> ᠬ<> ᥡ<> <20> ⠪ <20><> ⮣<> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> eax <20><> <20>⠭<EFBFBD><E2A0AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 祬 <20> ecx
-;	pop eax
-;	@@: ;cmp al,10 ;<3B>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>祭<EFBFBD><E7A5AD> <20> al 祬 10 (<28><><EFBFBD> <20><><EFBFBD>⥬<EFBFBD> <20><><EFBFBD>᫥<EFBFBD><E1ABA5> 10 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><>譠<EFBFBD>))
-;	;sbb al,$69  ;- <20><><EFBFBD>⭮ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>⠢<EFBFBD><E2A0A2><EFBFBD><EFBFBD> <20><><EFBFBD>㬠<EFBFBD><E3ACA0><EFBFBD><EFBFBD> <20>.<2E>. <20> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> ࠡ<>⠥<EFBFBD>
-;	;das	    ;<3B><>᫥ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20>ந<EFBFBD>室<EFBFBD><E5AEA4> 㬥<><E3ACA5>襭<EFBFBD><E8A5AD> al <20><> 66h  (<28> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ᠭ<EFBFBD> <20><>㣮<EFBFBD>)
-;	or al,0x30  ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  祬 <20><><EFBFBD> <20><><EFBFBD><EFBFBD> 
-;	stosb	    ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> ॣ<><E0A5A3><EFBFBD><EFBFBD><EFBFBD> al <20> <20>祪<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> es:edi
- ;
-;	ret	    ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 祭<> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 室 <20>.<2E>. <20><><EFBFBD><EFBFBD> <20> <20>⥪<EFBFBD> <20>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>-<2D><> <20>맮<EFBFBD><EBA7AE><EFBFBD> <20><> <20>⮫쪮 ࠧ <20><> <20> <20>㤥<EFBFBD> <20><><EFBFBD>뢠<EFBFBD><EBA2A0><EFBFBD><EFBFBD>
-
 ;----------------------------------------------------------
 ;--- <20><><EFBFBD>楤<EFBFBD><E6A5A4><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2> ⥪<><E2A5AA><EFBFBD> --------------------------
 ;----------------------------------------------------------
@@ -172,7 +153,6 @@ ret
 	mov	ebx,6		;<3B><><EFBFBD><EFBFBD>㧬<EFBFBD> <20><><EFBFBD><EFBFBD>⥫<EFBFBD>
 	div	ebx		;ࠧ<><E0A0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 6
 ret
-
 ;----------------------------------------------------------
 ;--- <20><><EFBFBD>楤<EFBFBD><E6A5A4><EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --------------------------
 ;----------------------------------------------------------
@@ -183,9 +163,7 @@ ret
 	mov	ecx,cl_curs_y
 	jmp	.draw_curs
 .draw_cursor:
-
 	mov	edx,ed_text_color
-;@@:
 	mov	ebx,ed_pos
 	mov	ecx,ed_offset
 	sub	ebx,ecx
@@ -212,13 +190,12 @@ ret
 	mov	eax,38
 	int	0x40
 ret
-
 ;----------------------------------------------------------
 ;--- <20><><EFBFBD>楤<EFBFBD><E6A5A4><EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> ࠬ<><E0A0AC> ----------------------------
 ;----------------------------------------------------------
 .draw_border:
 ;--- 梥<> ࠬ<><E0A0AC> ---
-	test	dword ed_flags,ed_focus
+	test	word ed_flags,ed_focus
 	mov	edx,ed_focus_border_color
 	jne     @f
 	mov	edx,ed_blur_border_color
@@ -303,11 +280,11 @@ pusha
 .add_8:	add	ebx,edx
 .chk_d:	mov	ed_offset,ebx
 	call    .draw_bg
-	;mov	dword [esp+28],-1
+	and	word ed_flags,ed_offset_cl
 popa
 	ret
 @@:
-	mov	dword [esp+28],0
+	or	word ed_flags,ed_offset_fl
 popa
 	ret
 ;==========================================================
@@ -327,7 +304,6 @@ pusha
 	test	al,0x03
 	je	@f
         or      word ed_flags,ed_shift   ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䫠<>
-
 @@:     pop	eax   ;<3B><><EFBFBD><EFBFBD>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> <20><><EFBFBD>⠭<EFBFBD><E2A0AD> ᨬ<><E1A8AC><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ;----------------------------------------------------------
 ;--- <20>஢<EFBFBD><E0AEA2>塞, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --------------------------------
@@ -362,36 +338,29 @@ pusha
 	jb	.no_figure
 	cmp	ah,'9'
 	ja	.no_figure
-
-
 ;<3B>஢<EFBFBD>ઠ <20><> shift
 @@:	test	word ed_flags,ed_shift_on
 	je	@f
 	;<3B>室<EFBFBD><E5AEA4><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> edx=ed_size;ecx=ed_pos
-
 	push	eax
 	mov	edx,ed_size
 	mov	ecx,ed_pos
 	pusha
-        
-	;cmp	edx,ecx
-	;jne	.sh_cl
 ;clear
 	mov	ebp,edx ;ed_size
         call	.clear_bg
        	mov	ebp,ed_color
+	mov	ebx,dword	ed_shift_pos
         call	.sh_cl_
 
 .sh_nxt:popa 
 	call	.del_char
-        
 ;;;;
         mov	eax,dword ed_shift_pos
         mov	ebx,ed_size
 	sub	ebx,eax
 	mov	ed_size,ebx
 	pop	eax
-
         ; <20>஢<EFBFBD><E0AEA2>塞, <20><>室<EFBFBD><E5AEA4><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>
 @@:	mov	ecx,ed_size
 	mov	edx, ed_max
@@ -512,9 +481,7 @@ popa
 	call	.clear_cursor
 	call	.check_offset
         call	.draw_bg
-
 	ret
-
 @@:	dec	 dword ed_size
 
 .draw_all2:
@@ -525,7 +492,6 @@ popa
 	mov	ebp,ed_size
 	call	.clear_bg
 	ret
-	;jmp	.shift
 ;--- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> left ---
 .left:  mov	ebx,ed_pos
 	test	ebx,ebx
@@ -557,6 +523,7 @@ popa
 	mov	ebx,ed_pos
 	cmp	ebx,dword ed_size
 	je	.sh_st_of
+	call	.sh_first_sh
 	mov	eax,ed_size
 	mov	ed_pos,eax
 	call	.sh_home_end
@@ -568,6 +535,7 @@ popa
 
 @@:	mov	ebp,shift_color
 	or	word ed_flags,ed_shift_bac ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䫠<><E4ABA0>, <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	mov	ebx,dword	ed_shift_pos
 	call	.sh_cl_
         jmp	.draw_cursor_text
 ;;;;;;;;;;;;;;;;;;;;;
@@ -579,9 +547,9 @@ popa
 ;;;;;;SHIFT end
 ;<3B><>ࠡ<EFBFBD>⪠ <20><><EFBFBD><EFBFBD>⪨, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> - <20>ࠢ<EFBFBD><E0A0A2> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD>
 ;<3B><><EFBFBD> <20><>ࠡ<EFBFBD>⪨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD>
-;	or	word ed_flags,ed_shift_bac ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䫠<><E4ABA0>, <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+;<EFBFBD>室<EFBFBD><EFBFBD><EFBFBD> <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD> ebp=color ebx=ed_shift_pos
 	mov 	eax,dword	ed_pos
-	mov	ebx,dword	ed_shift_pos
+;	mov	ebx,dword	ed_shift_pos
 	cmp	eax,ebx
 	jae	.sh_n
 	push	eax  ;<3B><><EFBFBD><EFBFBD>襥 <20> eax
@@ -592,11 +560,8 @@ popa
 	push	eax
 .sh_n1: 
 	call	.check_offset
-;	test	eax,eax
-;	jz      .drw_sim
 	call	.get_n
 	mov	edx,eax	;size of ed_box
-;	push	eax
 	mov	ecx,ed_offset
 	add	eax,ecx	;eax = w_off= ed_offset+width
 	mov	edx,eax ;save
@@ -613,7 +578,6 @@ popa
 @@:	mov	ebx,edx
 	sub	ebx,ecx	
 	jmp     .nxt_f
-
 .f_f:	
 	sub	eax,ecx
 	cmp	edx,ebx		;cࠢ<63><E0A0A2><EFBFBD> ࠧ<><E0A0A7><EFBFBD> w_off <20> <20><><EFBFBD><EFBFBD>訬
@@ -639,9 +603,7 @@ popa
 	mov	edx,ebp;shift_color
 
 	call	.draw_bg_eax
-@@:	;and    word ed_flags,1111111111111011b
+@@:	call	.enable_null
-	call	.enable_null
-	;mov	dword	ed_shift_pos,0
 	ret
 ;;;;;;;;;;;;;;;;;;;;;
 ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD>- <20><><EFBFBD>⨥ <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> ᨬ<><E1A8AC><EFBFBD>
@@ -651,8 +613,6 @@ popa
 	call    .draw_rectangle   ;<3B><><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2><EFBFBD> <20><>אַ㣮<EFACAE>쭨<EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 梥⮬
         jmp     @b
 ;;;;;;;;;;;;;;;;;;;;;
-
-;;;;;;;;;;
 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><>ࠢ<EFBFBD> <20> <20><><EFBFBD><EFBFBD>⨨ shift
 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: 
 ;;;;;;;;;;
@@ -664,11 +624,8 @@ popa
 	or	word ed_flags,ed_shift_bac ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䫠<><E4ABA0>, <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	mov	ebp,shift_color
 	mov 	eax,dword	ed_pos
-	;mov	ebx,dword	ed_shift_pos
 	test	word ed_flags,ed_left_fl
 	jz      .low
-;	sub	eax,2
-	;dec	eax
 	jmp	@f
 ;;;;;;;;;;
 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 㤠<><E3A4A0><EFBFBD><EFBFBD><EFBFBD> <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><>ࠢ<EFBFBD> <20> <20><><EFBFBD><EFBFBD>⨨ shift
@@ -681,7 +638,6 @@ popa
 
 	mov	ebp,ed_color
 	mov 	eax,dword	ed_pos
-	;mov	ebx,dword	ed_shift_pos
 	test	word ed_flags,ed_left_fl
 	jz      .low
 	;dec	eax
@@ -699,7 +655,6 @@ popa
 	mov	dword ed_shift_pos,ebx
        	or	word ed_flags,ed_shift_on
 @@:    	ret
-
 ;<3B><>ࠡ<EFBFBD>⪠ <20>ࠩ<EFBFBD><E0A0A9><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> editbox <20><><EFBFBD> <20><><EFBFBD><EFBFBD>⮬ shift
 ;<3B>ந<EFBFBD><E0AEA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⨥ <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD>, <20>᫨ <20><><EFBFBD> shift
 ;<3B><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>室<EFBFBD><E5AEA4>
@@ -709,32 +664,11 @@ popa
 	test    word ed_flags,ed_shift_bac
         je      @f
        	mov	ebp,ed_color
+	mov	ebx,dword	ed_shift_pos
 	call	.sh_cl_  ;<3B><><EFBFBD><EFBFBD>⪠ <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ࠣ<EFBFBD><E0A0A3><EFBFBD><EFBFBD><EFBFBD>
-	call	.draw_wigwag_cl	
 	and	word ed_flags,ed_shift_cl ; <20><><EFBFBD><EFBFBD>⪠ <20><> ⮣<> <20><><EFBFBD> <20><>ࠫ<EFBFBD> <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD> 
 	jmp     .draw_cursor_text
 @@:
-     	;-----------  <20>⫠<EFBFBD><E2ABA0><EFBFBD>
-;	pushad
-;	mov	dword [ed_buffer.3],0
-;	mov eax,ebx;word ed_flags
-;	mov edi,ed_buffer.3
-;	call .str
-;	;<3B><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> 䮭<>
-;	mov eax,13
-;	mov ebx,178*65536+70
-;	mov ecx,28*65536+10
-;	xor edx,edx
-;	int 0x40
-;	;<3B>뢮<EFBFBD> <20><><EFBFBD>祭<EFBFBD><E7A5AD> <20><> <20><>࠭
-;	mov eax,4
-;	mov ebx,180*65536+30
-;	mov ecx,0x10DDBBCC
-;	mov edx,ed_buffer.3
-;	mov esi,8
-;	int 0x40
-;	popad
-	;----------- <20>⫠<EFBFBD><E2ABA0><EFBFBD>
         and	word ed_flags,ed_shift_off
 	popa
 	ret	
@@ -749,6 +683,7 @@ popa
        	call	.check_offset
 
 	mov	ebp,ed_color
+	mov	ebx,dword	ed_shift_pos
 	call	.sh_cl_  ;<3B><><EFBFBD><EFBFBD>⪠ <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ࠣ<EFBFBD><E0A0A3><EFBFBD><EFBFBD><EFBFBD>
 	call	.draw_wigwag_cl	
 	and	word ed_flags,ed_shift_cl ; 1<><31><EFBFBD> <20><> <20>㦭<EFBFBD> 
@@ -760,8 +695,8 @@ popa
 	ret
 .sh_ext_en:	
        	call	.check_offset
-	test	eax,eax
+	test	word ed_flags,ed_offset_fl
-	jnz	@f
+	jne	@f
 ;<3B><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD> <20><>אַ㣮<EFACAE>쭨<EFBFBD><ECADA8><EFBFBD> <20> <20><><EFBFBD><EFBFBD>⪠ <20><>
         mov 	eax,dword	ed_shift_pos
 	mov	ebx,dword	ed_pos
@@ -784,6 +719,7 @@ popa
 .sh_e_end:	and	word ed_flags,ed_shift_off
 	ret
 @@:	mov	ebp,shift_color
+	mov	ebx,dword	ed_shift_pos
 	call	.sh_cl_
 	jmp	.sh_e_end
 ;<3B>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD> <20><>ࠡ<EFBFBD>⪨ shift <20><><EFBFBD> <20><><EFBFBD><EFBFBD>⨨ home and end
@@ -793,29 +729,18 @@ popa
 	test    word ed_flags,ed_shift_bac
         je      @f
 	mov	ebp,ed_color
+	mov	ebx,dword	ed_shift_pos_old
 	call	.sh_cl_
 
 @@:	test    word ed_flags,ed_shift
 	je	.sh_exit_ ;<3B><><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD> <20><>אַ㣮<EFACAE>쭨<EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
-    	call	.check_offset
         mov	ebp,shift_color
+        mov	ebx,dword	ed_shift_pos
 	call	.sh_cl_
 	or	word ed_flags,ed_shift_bac ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䫠<><E4ABA0>, <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	jmp	.sh_e_end
-.sh_exit_:	ret
+.sh_exit_: 	call	.check_offset
-
+	ret
-
-;	test    word ed_flags,ed_shift_bac
-;        je      @f
-
-
-
-
-
-
-
-
-
 ;<3B>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD>ᥭ<EFBFBD><E1A5AD> 0 <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ed_size+1
 .enable_null:
         pusha
@@ -827,9 +752,8 @@ popa
 	mov 	[eax],bl
 	popa
 	ret
-
+;- 㤠<><E3A4A0><EFBFBD><EFBFBD><EFBFBD> ᨬ<><E1A8AC><EFBFBD><EFBFBD>
-        ;- 㤠<><E3A4A0><EFBFBD><EFBFBD><EFBFBD> ᨬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+;<3B>室<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> edx=ed_size;ecx=ed_pos
-	;<3B>室<EFBFBD><E5AEA4><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> edx=ed_size;ecx=ed_pos
 .del_char:
 	mov     esi,ed_text
         test	word ed_flags,ed_shift_on
@@ -876,7 +800,6 @@ popa
 	
 	pop edi
 	ret
-
 ;<3B><><EFBFBD><EFBFBD>᫨<EFBFBD><E1ABA8> <20><><EFBFBD><EFBFBD><EFBFBD>訢<EFBFBD><E8A8A2><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ;ᮣ<><E1AEA3>襭<EFBFBD><E8A5AD> <20> ebp - <20><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD> ed_size
 .clear_bg:
@@ -930,7 +853,6 @@ popa
 ;eax=dword ed_pos
 ;ebp=-梥<> ed_color or shift_color 
 .draw_rectangle:
-;        mov	eax,dword ed_pos
 	mov	ecx,dword ed_offset
 	sub     eax,ecx
         lea	ebx,[eax*2+eax]
@@ -1014,8 +936,6 @@ pusha
 	jc	@f
 	call	.draw_cursor
 	jmp	.drc
-
-
 ._blur:
 	test	word ed_flags,ed_always_focus
 	jne	@f
@@ -1042,9 +962,9 @@ ret
 ;popa
 ;ret
 }
-ed_figure_only= 1000000000000000b
+ed_figure_only= 1000000000000000b   ;<3B><><EFBFBD><EFBFBD> ᨬ<><E1A8AC><EFBFBD><EFBFBD> 
 ed_always_focus= 100000000000000b
-ed_focus=10b
+ed_focus=                     10b   ;䮪<><E4AEAA> <20>ਫ<EFBFBD><E0A8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ed_shift_on=                1000b   ;<3B>᫨ <20><> <20><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD><EFBFBD> -<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> shift,<2C>᫨ <20><><EFBFBD> <20><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 㦥 <20><><EFBFBD> - <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 㤥ন<E3A4A5><E0A6A8><EFBFBD> shift
 ed_shift=                    100b   ;<3B><><EFBFBD><EFBFBD>砥<EFBFBD><E7A0A5><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>⨨ <20><> shift <20>.<2E>. <20>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ed_shift_off=   1111111111111011b
@@ -1052,6 +972,8 @@ ed_shift_bac=              10000b   ;
 ed_shift_cl=    1111111111100011b
 ed_left_fl=               100000b
 ed_right_fl=    1111111111011111b
+ed_offset_fl=            1000000b
+ed_offset_cl=   1111111110111111b
 ed_insert=              10000000b
 ed_insert_cl=   1111111101111111b
 ed_height=14 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -1081,13 +1003,15 @@ macro key_edit_boxes start,end
 	mov	edi,start
 	mov	ecx,((end-start)/ed_struc_size)
 @@:
+;	push	eax
 	call	edit_box.key
+;	pop	eax
 	add	edi,ed_struc_size
 	loop	@b
 }
 ed_struc_size=66
 struc  edit_box width,left,top,color,focus_border_color,\
-       blur_border_color,text_color,max,text,flags,size
+       blur_border_color,text_color,max,text,flags
 {
 .width dd width
 .left dd left
@@ -1099,7 +1023,7 @@ struc  edit_box width,left,top,color,focus_border_color,\
 .max dd max
 .text dd text
 .flags dw flags+0
-.size dd size+0
+.size dd 0
 .pos dd 0
 .offset dd 0
 .cl_curs_x dd 0

programs/develop/examples/editbox/trunk/editbox.asm

@@ -81,22 +81,22 @@ draw_window:		;
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ;DATA <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
 editboxes:
-edit1 edit_box 168,5,30,0xffffff,0,0,0,512,ed_buffer.1,ed_focus
+edit1 edit_box 168,5,10,0xffffff,0,0,0,99,ed_buffer.2,ed_figure_only
-edit2 edit_box 168,5,10,0xffffff,0,0,0,99,ed_buffer.2,ed_figure_only
+edit2 edit_box 168,5,30,0xffffff,0,0,0,512,ed_buffer.1,ed_focus
 edit3 edit_box 35,5,50,0xffffff,0,0,0,9,ed_buffer.3,ed_figure_only
 edit4 edit_box 16,5,70,0xffffff,0,0,0,1,ed_buffer.4,ed_figure_only
 editboxes_end:
-;data_of_code dd 0
+data_of_code dd 0
 ed_buffer:
-.1: rb 513;256
+.1: rb 514;256
-.2: rb 100
+.2: rb 101
-.3: rb 10
+.3: rb 11
-.4: rb 2
+.4: rb 3
+;<3B><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>室<EFBFBD><E5AEA4><EFBFBD> <20><><EFBFBD> ⮣<> <20><><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD>९<EFBFBD><E0A5AF><EFBFBD><EFBFBD><EFBFBD> ᫥<><E1ABA5><EFBFBD>騥<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0
 ;text_b: db '<27><><EFBFBD>-<2D><> ᨬ<><E1A8AC><EFBFBD><EFBFBD><EFBFBD>'
 ;buffer: dd 0
 buffer_end:
-hed db   'EDITBOX optimization and retype <Lrz> date 06.03.2007',0
+hed db   'EDITBOX optimization and retype <Lrz> date 07.03.2007',0
 i_end1:
 rb 1024
 i_end:  
-keymap: