retype fuction .check_offset

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

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

@@ -1,4 +1,5 @@
-; <Lrz> 23.01.2007 ¯®ä¨ªá¥« ¡ £¨ ¢ë§¢ ­ë¥ ­¥ ¯à ¢¨«ì­ë¬ ª®¤®¬ )).
+; <Lrz> 26.01.2007 ­®à¬ «ì­ ï à ¡®â  ª®¬¯ ­¥­â  ¨á¯à ¢¨« äãªæ¨î .check_offset
+; <Lrz> 24.01.2007 ¯®ä¨ªá¥« ¡ £¨ ¢ë§¢ ­ë¥ ­¥ ¯à ¢¨«ì­ë¬ ª®¤®¬ )).
 ; <Lrz> 22.01.2007 ¨§¡ ¢¨«áï ®â £«îª®¢ ¯à¨ à ¡®â¥ á ¢ë¤¥«¥­¨¥¬ ¨ 㤠«¥­¨¥, ª®à४⭠ï à ¡®â  ª« ¢¨è¥© del & backspase
 ; <Lrz> 20.01.2007 ॠ«¨§®¢ « ¢ë¤¥«¥­¨¥ ⥪áâ  ¯® shift
 ; <Lrz> 12.12.2006 ॠ«¨§®¢ « ¯®¤¤¥à¦ªã ª­®¯ª¨ insert ¨ ᥣ®¤ï ª®¬¯®­¥­â ¯®ç⨠ࠡ®â ¥â!!!!
@@ -100,14 +101,14 @@ ret
 ;	div ecx      ;à §¤¥«¨âì - ®áâ â®ª ¢ edx
 ;	push edx     ;¯®«®¦¨âì ¢ á⥪
 ;	;dec edi	     ;ᬥ饭¨¥ ­¥®¡å®¤¨¬®¥ ¤«ï § ¯¨á¨ á ª®­æ  áâப¨
- ;	call .str;¯¥à¥©â¨ ­  á ¬ã ᥡï â.¥. ¢ë§¢ âì á ¬ã á¥¡ï ¨ â ª ¤® ⮣® ¬®¬¥­â  ¯®ª  ¢ eax ­¥ áâ ­¥â ¬¥­ìè¥ ç¥¬ ¢ ecx
+;	call .str;¯¥à¥©â¨ ­  á ¬ã ᥡï â.¥. ¢ë§¢ âì á ¬ã á¥¡ï ¨ â ª ¤® ⮣® ¬®¬¥­â  ¯®ª  ¢ eax ­¥ áâ ­¥â ¬¥­ìè¥ ç¥¬ ¢ ecx
 ;	pop eax
 ;	@@: ;cmp al,10 ;¯à®¢¥à¨âì ­¥ ¬¥­ìè¥ «¨ §­ ç¥­¨¥ ¢ al 祬 10 (¤«ï á¨á⥬ë áç¨á«¥­ï 10 ¤ ­­ ï ª®¬ ­¤  - «¨è­ ï))
 ;	;sbb al,$69  ;- ç¥áâ­® ¤ ­­ ï ¨­áâàãªæ¨ï ¬¥­ï § áâ ¢«ï¥â § ¤ã¬ âìáï â.¥. ï ­¥ §­ î ª ª íâ® à ¡®â ¥â
 ;	;das	    ;¯®á«¥ ¤ ­­®© ª®¬ ­¤ë ª ª ¡ë ¯à®¨á室¨â 㬥­ì襭¨¥ al ­  66h  (¢ ª­¨£¥ ­ ¯¨á ­® ¤à㣮¥)
 ;	or al,0x30  ;¤ ­­ ï ª®¬ ­¤  ª®à®ç¥  祬 ¤¢¥ ¢ëè¥ 
 ;	stosb	    ;§ ¯¨á âì í«¥¬¥­â ¨§ ॣ¨áâà  al ¢ ï祪㠯 ¬ï⨠es:edi
- ;
+;
 ;	ret	    ;¢¥à­ãâìáï ç¥­ì ¨­â¥à¥á­ë© 室 â.ª. ¯®ª  ¢ á⥪¥ åà ­¨âìáï ª®«-¢® ¢ë§®¢®¢ â® á⮫쪮 à § ¬ë ¨ ¡ã¤¥¬ ¢ë§ë¢ âìáï
 
 ;----------------------------------------------------------
@@ -281,40 +282,42 @@ ret
 ;----------------------------------------------------------
 .check_offset:
 	pushad
-	push	dword ed_offset          ;á®åà ­¨¬ ᬥ饭¨¥
+	mov	ecx,ed_pos
+	mov	ebx,ed_offset
+	cmp	ebx,ecx
+	ja	.sub_8
+
+	push	ebx
 	call	.get_n			;¯®«ã稬 ª®«-¢® ᨬ¢®«®¢ ¢ ¯ à¥ ॣ¨áâ஢ edx:eax 
-	mov	ebx,eax
-	mov	eax,ed_pos
-	xor 	edx,edx
-	idiv	ebx
-	xor 	edx,edx
-	imul    eax,ebx
-	mov	ed_offset,eax
 	pop	ebx
-	cmp	ax,bx
-	je	@f
-;;;;;;;; ¤ ­­ë¥ ¤«ï § ªà è¨¢ ­¨ï ¢á¥© ¯®«®áë ¯àאַ㣮«ì­¨ª 
-	mov	ebx,ed_left
-	inc	ebx
-	shl	ebx,16
-	mov	bx,ed_width
-	dec 	ebx
-	mov	edx,ed_color
-	call    .draw_bg_eax
-	mov	dword [esp+28],0
-@@:	popad
-	ret
-;==========================================================
-;=== ®¡à ¡®âª  ª« ¢¨ âãàë =================================
-;==========================================================
-.key:
-pusha
-	test	word ed_flags,ed_focus ; ¥á«¨ ­¥ ¢ 䮪ãá¥, ¢ë室¨¬
-	je     .no_figure ;@f
+	mov	edx,ebx
+	add	edx,eax		;ed_offset+width editbox
+	cmp	edx,ecx
+	ja	@f
+
+	mov	edx,ed_size
+	sub	edx,eax
+	cmp	edx,8
+	jbe	.add_8
+	mov	ebx,edx
+;	add	ebx,8
+	jmp	.chk_d
+
+.sub_8: cmp	ecx,0
+	je	.sub_min
+	cmp	ebx,8
+        jbe	.sub_min
+	sub	ebx,8	;ebx=ed_offset
+	jmp	.chk_d
+.sub_min:
+        xor	ebx,ebx
+	jmp	.chk_d
+
+.add_8:	mov	ebx,edx
 ;	;-----------  ®â« ¤ª 
 ;	pushad
 ;	mov	[data_of_code],0
-;	mov eax,edi;word ed_flags
+;	mov eax,ebx;ed_offset
 ;	mov edi,data_of_code
 ;	call .str
 ;	;à¨á®¢ ­¨¥ ä®­ 
@@ -333,6 +336,49 @@ pusha
 ;	popad
 ;	;----------- ®â« ¤ª 
 
+.chk_d:	mov	ed_offset,ebx
+
+	call    .draw_bg
+	mov	dword [esp+28],-1
+	popad
+	ret
+
+@@:
+	mov	dword [esp+28],0
+	popad
+	ret
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;	mov	ebx,eax
+;	mov	eax,ed_pos
+;	xor 	edx,edx
+;	idiv	ebx
+;	xor 	edx,edx
+;	imul    eax,ebx
+;	mov	ed_offset,eax
+;	pop	ebx
+;	cmp	ax,bx
+;	je	@f
+;;;;;;;; ¤ ­­ë¥ ¤«ï § ªà è¨¢ ­¨ï ¢á¥© ¯®«®áë ¯àאַ㣮«ì­¨ª 
+;	mov	ebx,ed_left
+;	inc	ebx
+;	shl	ebx,16
+;	mov	bx,ed_width
+;	dec 	ebx
+;	mov	edx,ed_color
+;	call    .draw_bg_eax
+;	mov	dword [esp+28],0
+;@@:	popad
+;	ret
+;==========================================================
+;=== ®¡à ¡®âª  ª« ¢¨ âãàë =================================
+;==========================================================
+.key:
+pusha
+	test	word ed_flags,ed_focus ; ¥á«¨ ­¥ ¢ 䮪ãá¥, ¢ë室¨¬
+	je     .no_figure ;@f
+
 	xor	ecx,ecx
 	push	eax	
 	inc	ecx
@@ -453,9 +499,9 @@ pusha
 ; ¢áâ ¢«ï¥¬ ª®¤ ª« ¢¨è¨ â㤠, £¤¥ ªãàá®à
 	; 㢥«¨ç¨¢ ¥¬ §­ ç¥­¨¥ à §¬¥à  ¨ ¯®§¨æ¨¨
 	inc	 dword ed_size
-	call	.draw_all2
 	inc	 dword ed_pos
-	jmp    .shift;.draw_cursor_text
+	call	.draw_all2
+	jmp	.shift;.draw_cursor_text
 .delete:	
 	mov	edx,ed_size
 	mov	ecx,ed_pos
@@ -509,7 +555,13 @@ pusha
 	and    word ed_flags,ed_shift_cl
 	call	.clear_cursor
 	call	.check_offset
-	call	.get_n
+;;;;;;;;;;;;;;;
+	cmp	eax,0
+	je      @f
+	call	.draw_bg
+	ret
+;;;;;;;;;;;;;;;
+@@:	call	.get_n
 	push	eax
 	mov	ebx,ed_offset
 	add	eax,ebx	;eax = w_off= ed_offset+width
@@ -591,7 +643,7 @@ pusha
 
 .shift: ;;;;;;;SHIFT
 		
-    	call	.draw_bg
+    	call	.draw_bg	;­¥ ®¯â¨¬ «ì­®
 	test      word ed_flags,ed_shift
         je	.f_exit
 ;;;;;;SHIFT end

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

@@ -92,7 +92,7 @@ edit2 edit_box 168,10,30,0xffffff,0,0,0,99,ed_buffer.2,ed_figure_only
 edit3 edit_box 35,10,70,0xffffff,0,0,0,9,ed_buffer.3,ed_figure_only
 edit4 edit_box 16,10,90,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
 .2: rb 100
@@ -101,7 +101,7 @@ ed_buffer:
 ;text_b: db 'Š®«-¢® ᨬ¢®«®¢'
 ;buffer: dd 0
 buffer_end:
-hed db   'EDITBOX optimization and retype <Lrz> date 24.01.2007'
+hed db   'EDITBOX optimization and retype <Lrz> date 26.01.2007'
 i_end1:
 rb 2048
 i_end: