WebSVN – Kolibri OS – Diff – /programs/develop/libraries/box_lib/trunk/t_edit.asm

 		stdcall ted_show_help_f1,edi
 		jmp .end_key_fun
 	@@:
 	cmp ah,KEY_F3 ;[F3]
 	jne @f
-		stdcall ted_but_find_next,edi
+		stdcall ted_but_find,edi,0
 		jmp .end_key_fun
 	@@:
 	test esi,KM_CTRL ;Ctrl+...
 ; ted_gp_opt = 1 if found text line
 ; ted_gp_opt = 2 if found text line and column
 ; edx = tex[1] if error
 ; ted_gp_opt = 0 if text no found
 align 16
-ted_get_pos_by_coords:
+proc ted_get_pos_by_coords uses eax ebx
-  push eax ;Row
-  push ebx ;Col
-  xor eax,eax
+	xor eax,eax ;Row
-  xor ebx,ebx
+	xor ebx,ebx ;Col
   mov ted_gp_opt,0
   mov edx,ted_tex
   @@:
     call ted_iterat_next
     cmp edx,ted_tex_1
   cmp ted_gp_opt,0
   jne @f
     mov edx,ted_tex_1
     ;call ted_get_text_perv_pos
   @@:
-  pop ebx eax
   ret
+endp
 ;input:
 ; eax = Row
 ; edi = pointer to tedit struct
 align 16
 ted_go_to_pos:
 	push eax ebx
 	mov eax,ted_scr_h
 	sub ecx,[eax+sb_offs_position]
-	cmp ecx,0 ;ted_cur_y < 0
+	cmp ecx,0 ;ted_cur_x < 0
 	jge @f
 		add [eax+sb_offs_position],ecx ;¯à®ªàãâª  áªà®««¨£  ¢«¥¢®
 		xor ecx,ecx
 	@@:
 	mov ebx,5 ;5 - ¦¥« ¥¬ë© ®âáâã¯ á«¥¢
 ;description:
 ; äãªæ¨ï  å®¤¨â â¥ªáâ   ª®â®àë© ãª §ë¢ ¥â ted_buffer_find
 ;input:
 ; f_opt = ¯ à ¬¥âàë ¯®¨áª :
+;   (0 - ¨áª âì ¨¦¥ ªãàá®à , 1 - ¨áª âì ¢ëè¥ ªãàá®à , 2 - ¨áª âì ®â  ç «  ä ©« )
+;   ¥á«¨ ãáâ ®¢«¥ 31-© ¡¨â, â® ¥ ®¡®¢«ï¥âáï ®ª®
+;output:
-;   (0 - ¨áª âì ¢ëè¥ ªãàá®à , 1 - ¨áª âì ¨¦¥ ªãàá®à , 2 - ¨áª âì ®â  ç «  ä ©« )
+; eax = ¡ë« «¨  ©¤¥ ¨áª®¬ë© â¥ªáâ (0 - ¥â, 1 - ¤ )
 align 16
-proc ted_but_find, edit:dword, f_opt:dword
+proc ted_but_find uses ebx ecx edx edi esi, edit:dword, f_opt:dword
 	push [edit]
-	cmp dword[f_opt],2
+	cmp word[f_opt],2
 	jne @f
-		call ted_but_find_first
+		call _but_find_first
-		jmp .end_f
+		jmp .end0
 	@@:
-	cmp dword[f_opt],0
+	cmp word[f_opt],0
 	jne @f
-		call ted_but_find_next
+		call _but_find_next
-		jmp .end_f
+		jmp .end0
 	@@:
-	cmp dword[f_opt],1
+	cmp word[f_opt],1
-	jne .end_f
+	jne .end0
+		call _but_find_perv
+	.end0:
+	bt dword[f_opt],31
+	jc .end1
+	or eax,eax
+	jz @f
+		;â¥ªáâ  ©¤¥, ®¡®¢«ï¥¬ ®ª®
+		stdcall ted_draw,edi
+		jmp .end1
+	@@:
+		;â¥ªáâ ¥  ©¤¥, ¯à®¡ã¥¬ ¢ë§¢ âì á®®¡é¥¨¥
+		cmp ted_fun_find_err,0
+		je .end1
-		call ted_but_find_perv
+			call ted_fun_find_err ;¯®«ì§®¢ â¥«ìáª ï äãªæ¨ï
-	.end_f:
+	.end1:
 	ret
 endp
+;description:
-;description:
+; äãªæ¨ï  å®¤¨â â¥ªáâ ®â  ç «  ä ©« , ¨«¨ ®â ª®æ  â¥ªãé¥£® ¢ë¤¥«¥¨ï
+;output:
-; äãªæ¨ï  å®¤¨â â¥ªáâ   ª®â®àë© ãª §ë¢ ¥â ted_buffer_find
+; eax = ¡ë« «¨  ©¤¥ ¨áª®¬ë© â¥ªáâ (0 - ¥â, 1 - ¤ )
-; ¨é¥â ®â  ç «  ä ©« , ¨«¨ ®â ª®æ  â¥ªãé¥£® ¢ë¤¥«¥¨ï
+; ebx, ecx, edx, edi, edi - ¯®àâïâáï
-align 16
-proc ted_but_find_first, edit:dword
+align 16
-	pushad
+proc _but_find_first, edit:dword
 	mov edi,[edit]
 			call ted_iterat_next
 			cmp edx,ted_tex_1
 			jle @f
 			jmp @b
 	@@:
-	call but_find
+	call _but_find_select
-	popad
 	ret
 endp
 ;description:
+; äãªæ¨ï  å®¤¨â â¥ªáâ ¢ëè¥ ªãàá®à
+;output:
-; äãªæ¨ï  å®¤¨â â¥ªáâ   ª®â®àë© ãª §ë¢ ¥â ted_buffer_find
+; eax = ¡ë« «¨  ©¤¥ ¨áª®¬ë© â¥ªáâ (0 - ¥â, 1 - ¤ )
-; ¨é¥â ¢ëè¥ ªãàá®à
+; ebx, ecx, edx, edi, edi - ¯®àâïâáï
 align 16
-proc ted_but_find_perv, edit:dword
-	pushad
+proc _but_find_perv, edit:dword
 	mov edi,[edit]
 	call ted_is_select
 	or al,al
 	jz @f
 			call ted_iterat_perv
 			cmp edx,ted_tex_1
 			jle @f
 			jmp @b
 	@@:
-	call but_find
+	call _but_find_select
-	popad
 	ret
 endp
 ;description:
+; äãªæ¨ï  å®¤¨â â¥ªáâ ¨¦¥ ªãàá®à
+;output:
-; äãªæ¨ï  å®¤¨â â¥ªáâ   ª®â®àë© ãª §ë¢ ¥â ted_buffer_find
+; eax = ¡ë« «¨  ©¤¥ ¨áª®¬ë© â¥ªáâ (0 - ¥â, 1 - ¤ )
-; ¨é¥â ¨¦¥ ªãàá®à
+; ebx, edx, edi, esi - ¯®àâïâáï
 align 16
-proc ted_but_find_next, edit:dword
-	pushad
+proc _but_find_next, edit:dword
 	mov edi,[edit]
 	call ted_get_pos_by_cursor
 			call ted_iterat_next
 			cmp edx,ted_tex_1
 			jle @f
 			jmp @b
 	@@:
-	call but_find
+	call _but_find_select
-	popad
 	ret
 endp
+;description:
 ; ¢á¯®¬®£ â¥«ì ï äãªæ¨ï, ¢ë¤¥«ï¥â  ©¤¥ë© â¥ªáâ
 ;input:
 ; bh = ¡ë« «¨  ©¤¥ ¨áª®¬ë© â¥ªáâ (0 - ¥â, 1 - ¤ )
 ; esi = first symbol pointer
 align 16
-but_find:
+_but_find_select:
 	or bh,bh
 	jz @f
 		call ted_get_text_coords
 		inc ebx ;move cursor right
 		call ted_go_to_pos
 		mov edx,esi
 		call ted_get_text_coords
 		mov ted_sel_x0,ebx
 		mov ted_sel_y0,eax
-		stdcall ted_draw,edi
+		xor eax,eax
+		inc eax
-		jmp .end_find
+		jmp .end0
 	@@:
-		;¯®¯ ¤ ¥¬ áî¤  ¥á«¨ â¥ªáâ ¥  ©¤¥
+		xor eax,eax ;â¥ªáâ ¥  ©¤¥
-		cmp ted_fun_find_err,0
-		je .end_find
-			call ted_fun_find_err ;¯®«ì§®¢ â¥«ìáª ï äãªæ¨ï
-	.end_find:
+	.end0:
 	ret
 ;input:
 ; rpl_text = â¥ªáâ ¤«ï § ¬¥ë
 ; r_opt = ¯ à ¬¥âàë ¯®¨áª :
-;   (0 - ¨áª âì ¢ëè¥ ªãàá®à , 1 - ¨áª âì ¨¦¥ ªãàá®à , 2 - ¨áª âì ®â  ç «  ä ©« )
+;   (0 - ¨áª âì ¨¦¥ ªãàá®à , 1 - ¨áª âì ¢ëè¥ ªãàá®à , 2 - ¨áª âì ®â  ç «  ä ©« )
 ; n_tim = ä¨ªá¨à®¢ âì § ¬¥ã ¢ ¨§¬¥¥¨ïå (0 - ¥â, 1 - ¤ )
 ;output:
 ; eax = 0 - ¥ ã¤ ç®, 1 - ã¤ ç®
 align 16
 proc ted_but_replace uses edx edi esi, edit:dword, rpl_text:dword, r_opt:dword, n_tim:dword
+	mov edi,[edit]
+	mov eax,[r_opt]
-	mov edi,[edit]
+	bts eax,31
+	stdcall ted_but_find, edi,eax
+	or eax,eax
-	stdcall ted_but_find, edi,[r_opt]
+	jz .end0
 	xor edx,edx
+	cmp dword[n_tim],0
-	cmp dword[n_tim],0
+	je @f
-	je @f
+		call ted_set_undo
 		mov edx,ted_opt_ed_change_time
 	@@:
 	stdcall ted_sel_text_del, edx
 	or eax,0xff
-	jz @f
+	jz .end0
 		mov esi,[rpl_text]
 		stdcall tl_strlen
 		or eax,eax
-		jz @f
+		jz .end0
 		stdcall ted_text_add, edi,esi,eax,ted_opt_ed_move_cursor
 		xor eax,eax
 		inc eax
-	@@:
+	.end0:
 	ret
+endp
+;input:
+; eax - text need find
+; bl - first symbol to find
+; edx - first symbol pointer
+; edi - pointer to tedit struct
+;output:
+; bh - rezult
+; edx - last text position (if find sucess)
+; esi - first symbol pointer
+;description:
+; ãªæ¨ï ¯à®¢¥àï¥â á®¢¯ ¤ ¥â «¨ â¥ªáâ ¢ ¡ãä¥à¥ eax
+; á â¥ªáâ®¬ à¥¤ ªâ®à  ¯® ãª § â¥«î edx.
+; â ¤ àâë¥ äãªæ¨¨ ( ¯à. strcmp) âãâ ¥ ¯®¤®©¤ãâ, ¯®â®¬ã çâ®
+; ¢ ¯ ¬ïâ¨ à¥¤ ªâ®à  â¥ªáâ á®¤¥à¦¨âáï ¥ ¢ ¢¨¤¥ ascii áâà®ª.
+align 16
+ted_get_find_rezult:
+push eax
+	mov bh,1
+	mov esi,edx ;copy edx
+	@@:
+		cmp byte[edx],bl
+		jne .no_text
+		inc eax ;*** get next symbol (in find text) ***
+		mov bl,byte[eax]
+		or bl,bl
+		jz @f ;end of find text
+		call ted_iterat_next ;*** get next symbol (in editor text) ***
+		cmp edx,ted_tex_1
+		jg @b
+align 4
+		.no_text:
+	xor bh,bh
+	mov edx,esi ;restore edx
+	@@:
+pop eax
+	mov bl,byte[eax] ;restore bl
-endp
+	ret
 ;input:
 ; edi = pointer to tedit struct
 align 16
 popad
 	ret
 endp
-;input:
-; eax - text need find
-; bl - first symbol to find
-; edx - first symbol pointer
-; edi - pointer to tedit struct
-;output:
-; bh - rezult
-; edx - last text position (if find sucess)
-; esi - first symbol pointer
-;description:
-; ãªæ¨ï ¯à®¢¥àï¥â á®¢¯ ¤ ¥â «¨ â¥ªáâ ¢ ¡ãä¥à¥ eax
-; á â¥ªáâ®¬ à¥¤ ªâ®à  ¯® ãª § â¥«î edx.
-; â ¤ àâë¥ äãªæ¨¨ ( ¯à. strcmp) âãâ ¥ ¯®¤®©¤ãâ, ¯®â®¬ã çâ®
-; ¢ ¯ ¬ïâ¨ à¥¤ ªâ®à  â¥ªáâ á®¤¥à¦¨âáï ¥ ¢ ¢¨¤¥ ascii áâà®ª.
-align 16
-ted_get_find_rezult:
-push eax
-	mov bh,1
-	mov esi,edx ;copy edx
-	@@:
-		cmp byte[edx],bl
-		jne .no_text
-		inc eax ;*** get next symbol (in find text) ***
-		mov bl,byte[eax]
-		or bl,bl
-		jz @f ;end of find text
-		call ted_iterat_next ;*** get next symbol (in editor text) ***
-		cmp edx,ted_tex_1
-		jle @f ;end of editor text
-		jmp @b
-align 4
-		.no_text:
-	xor bh,bh
-	mov edx,esi ;restore edx
-	@@:
-pop eax
-	mov bl,byte[eax] ;restore bl
-	ret
 ;input:
 ;  clear_o - ¥á«¨ =1 ®ç¨áâ¨âì ®¤ã áâà®ªã, =0 ®ç¨áâ¨âì ¢á¥ áâà®ª¨ ®ª  ¤® ¨§ã
 align 16
 proc ted_clear_line_before_draw, edit:dword, coords:dword, clear_o:dword, numb_lin:dword
 	pushad

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/box_lib/trunk/t_edit.asm – Rev 7576 → 7577