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

 ; ¬ ªà®á ¤«ï á¨áâ¥¬®© ¡¨¡«¨®â¥ª¨ box_lib.obj
 ; í«¥¬¥â TextEditor ¤«ï Kolibri OS
-; ä ©« ¯®á«¥¤¨© à § ¨§¬¥ï«áï 29.04.2010 IgorA
+; ä ©« ¯®á«¥¤¨© à § ¨§¬¥ï«áï 03.05.2010 IgorA
 ;   ª®¤ ¯à¨¬¥¥  GPL2 «¨æ¥§¨ï
 ;input:
 ; edi = pointer to tedit struct
   tc dd ?   ; +10 ¢à¥¬. á®§¤ ¨ï
   td dd ?   ; +14 ¢à¥¬. ã¤ «¥¨ï
 ends
 ;------------------------------------------------------------------------------
+ted_symbol_tab db 26
 if lang eq ru
 txtFindCapt db '®¨áª',0
 end if
 ;------
 align 4
-EvChar db 0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0
+EvChar db 0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
     db 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-  call mem_Alloc
+	call mem_Alloc
-  mov ted_arr_key_pos,eax
+	mov ted_arr_key_pos,eax
-  add eax,1024
+	add eax,1024
-  mov ted_syntax_file,eax
+	mov ted_syntax_file,eax
 	stdcall ted_init_scroll_bars,edi,3
-  pop edi ecx eax
+	pop edi ecx eax
-  ret
+	ret
+endp
+MIN_W_SCRL_ARE equ 3 ;¬¨¨¬ «ì ï ®â®¡à ¦ ¥¬ ï ®¡« áâì ¤«ï ¢¥àâ. áªà®««¨£
+MIN_H_SCRL_ARE equ 3 ;¬¨¨¬ «ì ï ®â®¡à ¦ ¥¬ ï ®¡« áâì ¤«ï £®à¨§. áªà®««¨£
+;input:
+; opt = 1 - ¬¥ïâì æ¢¥â áªà®««¨£®¢, 2 - ¬¥ïâì ¢¥è¨¥ à §¬¥àë
+align 4
+proc ted_init_scroll_bars, edit:dword, opt:dword
+	pushad
+	mov esi,ted_scr_w
+	mov ebx,ted_scr_h
+	bt dword[opt],0
+	jae @f
+		mov ecx,ted_color_wnd_work
+		mov dword[esi+sb_offs_bckg_col],ecx
+		mov dword[ebx+sb_offs_bckg_col],ecx
+		mov ecx,ted_color_wnd_capt
+		mov dword[esi+sb_offs_frnt_col],ecx
+		mov dword[ebx+sb_offs_frnt_col],ecx
+		mov ecx,ted_color_wnd_bord
+		mov dword[esi+sb_offs_line_col],ecx
+		mov dword[ebx+sb_offs_line_col],ecx
+	@@:
+	bt dword[opt],1
+	jae .no_size
+			mov edx,ted_wnd_l
+			add edx,ted_rec_l
+			mov word[ebx+sb_offs_start_x],dx ;¢ëáâ ¢«ï¥¬ «¥¢ë© ®âáâã¯ £®à¨§. áªà®««¨£
+		mov eax,ted_wnd_h ;calculate lines in page
+			mov edx,ted_wnd_t
+			add edx,eax
+			mov word[ebx+sb_offs_start_y],dx ;¢ëáâ ¢«ï¥¬ ¢¥àå¨© ®âáâã¯ £®à¨§. áªà®««¨£
+		sub eax,ted_rec_t
+		xor edx,edx
+		mov ecx,ted_rec_h
+		div ecx
+		cmp eax,MIN_W_SCRL_ARE
+		jg @f
+			mov eax,MIN_W_SCRL_ARE
+		@@:
+		mov dword[esi+sb_offs_cur_area],eax
+		mov eax,ted_wnd_w ;calculate cols in page
+			mov edx,ted_wnd_l ;«¥¢ë© ®âáâã¯ ®ª
+			add edx,eax ;¤®¡ ¢«ï¥¬ è¨à¨ã ®ª
+			mov word[esi+sb_offs_start_x],dx ;¢ëáâ ¢«ï¥¬ «¥¢ë© ®âáâã¯ ¢¥àâ. áªà®««¨£
+			mov edx,ted_wnd_t
+			mov word[esi+sb_offs_start_y],dx ;¢ëáâ ¢«ï¥¬ ¢¥àå¨© ®âáâã¯ ¢¥àâ. áªà®««¨£
+			mov edx,ted_wnd_h
+			mov word[esi+sb_offs_size_y],dx ;¢ëáâ ¢«ï¥¬ ¢ëá®âã ¢¥àâ. áªà®««¨£
+		sub eax,ted_rec_l
+			mov word[ebx+sb_offs_size_x],ax ;¢ëáâ ¢«ï¥¬ è¨à¨ã £®à¨§. áªà®««¨£
+		xor edx,edx
+		mov ecx,ted_rec_w
+		div ecx
+		cmp eax,MIN_H_SCRL_ARE
+		jg @f
+			mov eax,MIN_H_SCRL_ARE
+		@@:
+		dec eax
+		mov dword[ebx+sb_offs_cur_area],eax ;ãáâ  ¢«¨¢ ¥¬ ç¨á«® á¨¬¢®«®¢, ª®â®àë¥ ¢« §ïâ ¢ íªà  ¤«ï £®à¨§. áªà®««¨£
+	.no_size:
+	popad
+	ret
 endp
 align 4
 proc ted_delete, edit:dword
 ; eax = key kodes
 align 4
 proc ted_key, edit:dword, table:dword, control:dword
 	pushad
 	mov edi,dword[edit]
+	mov esi,ted_el_focus
+	cmp dword[esi],edi
+	jne .end_key_fun ;í«¥¬¥â ¥ ¢ ä®ªãá¥ ¢ëå®¤¨¬ ¨§ äãªæ¨¨
 	mov esi,dword[control]
 	cmp ah,KEY_F1 ;[F1]
 	jne @f
 		jne @f
 			cmp ted_fun_on_key_ctrl_o,0
 			je @f
 				call ted_fun_on_key_ctrl_o
 		@@:
+		cmp ah,31 ;Ctrl+S
+		jne @f
+			cmp ted_fun_on_key_ctrl_s,0
+			je @f
+				call ted_fun_on_key_ctrl_s
+		@@:
 		cmp ah,33 ;Ctrl+F
 		jne @f
 		cmp ted_panel_id,TED_PANEL_FIND
 		je @f
 			cmp ted_fun_on_key_ctrl_f,0
   mov ted_tim_undo,0
   mov ted_help_id,-1
   mov ecx,ted_scr_w
   mov dword[ecx+sb_offs_position],0
-  mov dword[ecx+sb_offs_max_area],100
+  mov dword[ecx+sb_offs_max_area],100 ;ç¨á«® áâà®ª ¢¨¤¨¬ëå ¢ ®¢®¬ ¤®ªã¬¥â¥
   mov dword[ecx+sb_offs_redraw],1
   mov ecx,ted_scr_h
   mov dword[ecx+sb_offs_position],0
-  mov dword[ecx+sb_offs_max_area],100
+  mov dword[ecx+sb_offs_max_area],100 ;ç¨á«® á¨¬¢®«®¢ ¢¨¤¨¬ëå ¢ ®¢®¬ ¤®ªã¬¥â¥
   mov ted_sel_x0,0
   mov ted_sel_y0,0
 	mov ecx,ted_key_words_count
 	imul ecx,sizeof.TexColViv
 	add ecx,ted_key_words_data
 	mov ted_help_text_f1,ecx
 	stdcall ted_init_scroll_bars,edi,1 ;¬¥ï¥¬ æ¢¥â  áªà®««¨£®¢
 	.no_colors:
 	popad
 	ret
 ;description:
 ; ãªæ¨ï ¯à¥®¡à §ã¥â ¥¢¨¤¨¬ë¥ á¨¬¢®«ë ¢ ¯¥ç â ¥¬ë¥   íªà ¥
 align 4
 ted_convert_invis_symb:
-  cmp ted_mode_invis,1
+	cmp ted_mode_invis,1
+	jne .end_f
+		cmp byte[edx],9
-  jne @f
+		jne @f
+			lea edx,[ted_symbol_tab]
+		@@:
-  cmp byte[edx],13
+		cmp byte[edx],13
-  jne @f
+		jne @f
-    mov edx,edi
+			mov edx,edi
-	add edx,ted_offs_symbol_new_line
+			add edx,ted_offs_symbol_new_line
-  @@:
+		@@:
+	.end_f:
-  ret
+	ret
 ;input:
 ; edi = pointer to tedit struct
   cmp ted_tim_undo,0
   je @f
     mov ecx,ted_tim_undo
+    add edx,0x500000
-    add edx,0x500000
+	mov edi,ted_color_wnd_work ;¯®àâ¨¬ à¥£¨áâà edi, ® ¢ ª®æ¥ äãªæ¨¨ íâ® ã¦¥ ¥ ¢ ¦®
-    int 0x40
+    int 0x40 ;¢ë¢®¤ ç¨á«  ®â¬¥¥ëå ¤¥©áâ¢¨©
   @@:
   popad
 	pushad
 	mov eax,ted_buffer
 	cmp byte[eax],0 ;á¬®âà¨¬ 1-© á¨¬¢®« ¨§ ¡ãä¥à
-	je @f
-		mov ebx,ted_wnd_l
+	je @f
-		add ebx,ted_rec_l
+		mov ebx,ted_rec_l
+		add bx,300
+		cmp ebx,ted_wnd_w ;áà ¢¨¢ ¥¬ ª®®à¤¨ âã ¤«ï ¢ë¢®¤ â¥ªáâ
+		jge @f ;¯®¤¯¨áì ¥ ¢« §¨â ¢ ®ª®
-		add bx,300
+		add ebx,ted_wnd_l
 		shl ebx,16
 		add ebx,ted_wnd_t
 		add ebx,3
 		mov ecx,ted_color_wnd_bord
 ;input:
 ; edi = pointer to tedit struct
 align 4
 proc ted_draw_help_f1
-  pushad
+	pushad
+	cmp ted_rec_t,13 ;¬¨¨¬ «ì ï ¢ëá®â  ¤«ï à¨á®¢ ¨ï á¯à ¢ª¨
+	jle @f
-  mov eax,13 ;clear place before draw help
+		mov eax,13 ;clear place before draw help
-  mov ebx,ted_wnd_l
+		mov ebx,ted_wnd_l
-  add ebx,ted_rec_l
+		add ebx,ted_rec_l
-  shl ebx,16
+		shl ebx,16
-  add ebx,ted_wnd_w
+		add ebx,ted_wnd_w
 		call ted_draw_cursor_sumb
 		call ted_wnd_main_click
 		jmp .no_in_wnd
 	@@:
+	mov edx,ted_el_focus
+	cmp dword[edx],edi
+	jne @f
+		call ted_wnd_main_mouse_scroll ;á¬®âà¨¬   ¯à®ªàãâªã ª®«¥á  ¬ëè¨
-	call ted_wnd_main_mouse_scroll
+	@@:
 	cmp ted_drag_m,0
 	je .no_in_wnd
 		mov ted_drag_m,0
 		stdcall ted_draw,edi
 ;description:
 ; äãªæ¨ï ¢ë§ë¢¥âáï ¯à¨  ¦ â¨¨ ª®¯ª®© ¬ëè¨ ¨ ¯®¯ ¤¥¨¨ ªãàá®à®¬ ¢ ®ª® à¥¤ ªâ®à
 align 4
 ted_wnd_main_click:
-  push ebx ecx edx
+	push ebx ecx edx
+	mov ebx,ted_el_focus
+	mov dword[ebx],edi ;áâ ¢¨¬ ä®ªãá
   push eax
     shr eax,16
     and eax,0xffff
 ;input:
 ; edi = pointer to tedit struct
 align 4
 ted_wnd_main_mouse_scroll:
 	push eax ebx ecx
-	mcall 37,7
+	mcall 37,7 ;¯à®ªàãâª  ª®«¥á  ¬ëè¨
 	cmp ax,0
 	je .no_scroll
 		mov ecx,ted_scr_w
 		mov ebx,dword[ecx+sb_offs_position] ;copy old scroll position
 		and eax,0xffff

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/box_lib/trunk/t_edit.mac @ 1459 – Rev 1457 → 1458