fixed position of signatures when pressing [f1]

update 'asm' syntax file

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

programs/develop/libraries/box_lib/trunk/t_edit.mac

@@ -1,6 +1,6 @@
 ; ¬ ªà®á ¤«ï á¨á⥬­®© ¡¨¡«¨®â¥ª¨ box_lib.obj
 ; í«¥¬¥­â TextEditor ¤«ï Kolibri OS
-; ä ©« ¯®á«¥¤­¨© à § ¨§¬¥­ï«áï 20.01.2016 IgorA
+; ä ©« ¯®á«¥¤­¨© à § ¨§¬¥­ï«áï 21.01.2016 IgorA
 ; ­  ª®¤ ¯à¨¬¥­¥­  GPL2 «¨æ¥­§¨ï
 
 ;input:
@@ -106,8 +106,7 @@ KEY_F3 equ 0x0000003D
 
 
 align 4
-proc ted_init, edit:dword
+proc ted_init uses eax ecx edi, edit:dword
-	push eax ecx edi
 	mov edi,dword[edit]
 
 	mov ecx,sizeof.symbol
@@ -130,7 +129,6 @@ proc ted_init, edit:dword
 	mov ted_syntax_file,eax
 
 	stdcall ted_init_scroll_bars,edi,3
-	pop edi ecx eax
 	ret
 endp
 
@@ -210,12 +208,10 @@ proc ted_init_scroll_bars, edit:dword, opt:dword
 endp
 
 align 4
-proc ted_delete, edit:dword
+proc ted_delete uses edi, edit:dword
-	push edi
 	mov edi,dword[edit]
 	invoke mem.free,ted_tex
 	invoke mem.free,ted_arr_key_pos ;ted_syntax_file
-	pop edi
 	ret
 endp
 
@@ -529,8 +525,7 @@ endp
 ;output:
 ; al = 1 - can save
 align 4
-proc ted_can_save, edit:dword
+proc ted_can_save uses ecx edi, edit:dword
-	push ecx edi
 	mov edi,dword[edit]
 
 	mov ecx,ted_tim_ch
@@ -540,7 +535,6 @@ proc ted_can_save, edit:dword
 	jne @f
 		dec al
 	@@:
-	pop edi ecx
 	ret
 endp
 
@@ -549,8 +543,7 @@ endp
 ;output:
 ; al = 1 - selected
 align 4
-proc ted_is_select
+proc ted_is_select uses ebx
-	push ebx
 	xor al,al
 	cmp ted_drag_m,1
 	je @f
@@ -563,15 +556,13 @@ proc ted_is_select
 		jne @f
 		xor al,al
 	@@:
-	pop ebx
 	ret
 endp
 
 ;input:
 ; edi = pointer to tedit struct
 align 4
-proc ted_sel_normalize
+proc ted_sel_normalize uses ecx esi
-	push ecx esi
 	push edi
 		mov esi,edi
 		add esi,ted_offs_sel
@@ -606,7 +597,6 @@ proc ted_sel_normalize
 		jg .swp_f
 
 	.end_f:
-	pop esi ecx
 	ret
 endp
 
@@ -615,8 +605,7 @@ endp
 ;description:
 ; ”ã­ªæ¨ï ¢ë§ë¢ ¥¬ ï ¯à¨ ­ ç «¥ ¢ë¤¥«¥­¨ï
 align 4
-proc ted_sel_start
+proc ted_sel_start uses eax ecx
-	push eax ecx
 	mov eax,ted_scr_h
 	mov ecx,ted_cur_x
 	add ecx,dword[eax+sb_offs_position]
@@ -628,7 +617,6 @@ proc ted_sel_start
 	add ecx,dword[eax+sb_offs_position]
 	mov ted_sel_y0,ecx
 	mov ted_sel_y1,ecx
-	pop ecx eax
 	ret
 endp
 
@@ -682,8 +670,7 @@ endp
 ;input:
 ; cl_al_mem = 1 - clear all memory
 align 4
-proc ted_clear, edit:dword, cl_al_mem:dword
+proc ted_clear uses ecx edi, edit:dword, cl_al_mem:dword
-	push ecx edi
 	mov edi,dword[edit]
 
 	mov ted_cur_x,0
@@ -727,7 +714,6 @@ proc ted_clear, edit:dword, cl_al_mem:dword
 	pop edx
 
 	.exit:
-	pop edi ecx
 	ret
 endp
 
@@ -1445,9 +1431,7 @@ endp
 ;description:
 ; ”ã­ªæ¨ï 㤠«ï¥â ¢ë¤¥«¥­­ë© ⥪áâ
 align 4
-proc ted_sel_text_del, del_opt:dword
+proc ted_sel_text_del uses ebx ecx edx esi, del_opt:dword
-	push ebx ecx edx esi
-
 	call ted_is_select
 	cmp al,0
 	je .end_f
@@ -1494,7 +1478,6 @@ proc ted_sel_text_del, del_opt:dword
 			mov ted_sel_y1,0
 		@@:
 	.end_f:
-	pop esi edx ecx ebx
 	ret
 endp
 
@@ -2455,8 +2438,7 @@ endp
 ; eax = ª®¤ ®è¨¡ª¨
 ; ebx = ª®««¨ç¥á⢮ ¯à®ç¨â ­­ëå ¡ ©â
 align 4
-proc ted_open_file, edit:dword, file:dword, f_name:dword ;äã­ªæ¨ï ®âªàëâ¨ï ä ©« 
+proc ted_open_file uses ecx edx edi, edit:dword, file:dword, f_name:dword ;äã­ªæ¨ï ®âªàëâ¨ï ä ©« 
-	push ecx edx edi
 	mov edi,dword[edit]
 
 	; *** ¯à®¢¥à塞 à §¬¥à ¯ ¬ï⨠¨ ¥á«¨ ­¥ 墠⠥â ⮠㢥«¨ç¨¢ ¥¬ ***
@@ -2527,7 +2509,6 @@ proc ted_open_file, edit:dword, file:dword, f_name:dword ;
 		;if open file
 		call ted_on_open_file
 	.ret_f:
-	pop edi edx ecx
 	ret
 endp
 
@@ -2564,8 +2545,7 @@ proc ted_but_select_word, edit:dword
 endp
 
 align 4
-proc ted_but_cut, edit:dword
+proc ted_but_cut uses edi, edit:dword
-	push edi
 	mov edi,dword[edit]
 
 	stdcall ted_but_copy,edi
@@ -2579,7 +2559,6 @@ proc ted_but_cut, edit:dword
 		je @f
 			call ted_fun_draw_panel_buttons
 	@@:
-	pop edi
 	ret
 endp
 
@@ -2754,8 +2733,7 @@ proc ted_but_sumb_lover uses edi esi, edit:dword
 endp
 
 align 4
-proc ted_but_reverse, edit:dword
+proc ted_but_reverse uses eax ebx edi, edit:dword
-  push eax ebx edi
 	mov edi,dword[edit]
 
 	call ted_is_select
@@ -2782,13 +2760,11 @@ proc ted_but_reverse, edit:dword
 		call ted_revers
 	@@:
 	stdcall ted_draw,edi
-  pop edi ebx eax
 	ret
 endp
 
 align 4
-proc ted_but_undo, edit:dword
+proc ted_but_undo uses eax edi, edit:dword
-	push eax edi
 	mov edi,dword[edit]
 
 	mov eax,ted_tim_undo
@@ -2801,13 +2777,11 @@ proc ted_but_undo, edit:dword
 		je @f
 			call ted_fun_draw_panel_buttons
 	@@:
-	pop edi eax
 	ret
 endp
 
 align 4
-proc ted_but_redo, edit:dword
+proc ted_but_redo uses edi, edit:dword
-	push edi
 	mov edi,dword[edit]
 
 	cmp ted_tim_undo,1
@@ -2819,7 +2793,6 @@ proc ted_but_redo, edit:dword
 		je @f
 			call ted_fun_draw_panel_buttons
 	@@:
-	pop edi
 	ret
 endp
 
@@ -3273,9 +3246,7 @@ proc ted_draw, edit:dword
 	shl ecx,16
 	mov cx,word[eax+sb_offs_size_y]
 	inc cx
-  mov edx,ted_color_wnd_capt ;[sc.work]
+	mcall 13,,,ted_color_wnd_capt ;[sc.work]
-  mov eax,13
-  int 0x40
 
 	;right-bottom square
 	mov ebx,ted_wnd_l
@@ -3479,7 +3450,7 @@ proc ted_draw_help_f1
 	pushad
 	cmp ted_rec_t,13 ;¬¨­¨¬ «ì­ ï ¢ëá®â  ¤«ï à¨á®¢ ­¨ï á¯à ¢ª¨
 	jle @f
-		mov eax,13 ;clear place before draw help
+		;clear place before draw help
 		mov ebx,ted_wnd_l
 		add ebx,ted_rec_l
 		shl ebx,16
@@ -3489,8 +3460,7 @@ proc ted_draw_help_f1
 		add ecx,13
 		shl ecx,16
 		add ecx,ted_rec_h
-		mov edx,ted_color_wnd_capt
+		mcall 13,,,ted_color_wnd_capt
-		int 0x40
 
 	cmp ted_help_id,-1
 	je @f
@@ -3513,11 +3483,12 @@ proc ted_draw_help_f1
 		mov ecx,dword[ecx]
 		or	ecx,0xc0000000 ;SetTextStyles
 		mov esi,edi
-			mov edi,ted_color_wnd_work
+		mcall 4,,,,,ted_color_wnd_work
-			mov eax,4
-			int 0x40
 		mov edi,esi
 
+		mov esi,edx
+		call tl_strlen
+
 		;*** draw help string ***
 		mov ecx,ted_color_wnd_bord
 		or ecx,0x80000000
@@ -3525,8 +3496,11 @@ proc ted_draw_help_f1
 		cmp edx,0
 		je @f
 			add edx,ted_help_text_f1
-			add ebx,0x500000
+			inc eax
-			int 0x40
+			imul eax,6 ;è¨à¨­  ᨬ¢®«  ¢ á¨áâ. èà¨äâ¥
+			shl eax,16			
+			add ebx,eax
+			mcall 4
 	@@:
 	popad
 	ret

programs/other/t_edit/t_draw.inc

@@ -123,32 +123,22 @@ or ecx,0x40000000
 ; edi = pointer to tedit struct
 align 4
 proc draw_panel_find
-;push edi
-;mov edi,dword[edit]
 	cmp ted_panel_id,TED_PANEL_FIND ;if not panel
 	jne @f
 	push eax ebx ecx edx
-
-  mov eax,13 ;рисование прямоугольника
-  mov ebx,TED_PANEL_WIDTH
 		mov ecx,ted_wnd_t
 		shl ecx,16
 		mov cx,20
-  mov edx,[sc.work]
+		mcall SF_DRAW_RECT,TED_PANEL_WIDTH,,[sc.work]
-  int 0x40
 
-  mov eax,4 ;рисование текста
 		mov ebx,30*65536+25
 		add ebx,ted_wnd_t
 		mov ecx,[sc.work_text]
 		or ecx,0x80000000
-  mov edx,txtFindCapt
+		mcall SF_DRAW_TEXT,,,txtFindCapt
-  int 0x40
 
-  stdcall [edit_box_draw], dword edit2
+		stdcall [edit_box_draw], edit2
 
-  mov eax,13 ;рисование прямоугольника
-  mov ebx,TED_PANEL_WIDTH
 		mov ecx,ted_wnd_t
 		add cx,20+15 ; 15 - height text box
 		shl ecx,16
@@ -156,38 +146,28 @@ proc draw_panel_find
 		mov edx,ted_scr_h
 		add cx,word[edx+sb_offs_size_y]
 		sub cx,20+15-1 ; 15 - height text box
-  mov edx,[sc.work]
+		mcall SF_DRAW_RECT,TED_PANEL_WIDTH,,[sc.work]
-  int 0x40
 
-  mov eax,8 ;кнопка
-  mov ebx,5*65536+85
 		mov ecx,ted_wnd_t
 		add cx,20+15+5
 		shl ecx,16
 		mov cx,20
-  mov edx,201 ;button id
+		mcall SF_DEFINE_BUTTON,5*65536+85,,201,[sc.work_button] ;201 - button id
-  mov esi,[sc.work_button]
-  int 0x40
 
-  mov eax,4 ;рисование текста
 		mov ebx,15*65536+(20+15+10)
 		add ebx,ted_wnd_t
 		mov ecx,[sc.work_text]
 		or ecx,0x80000000
-  mov edx,txtFindNext
+		mcall SF_DRAW_TEXT,,,txtFindNext
-  int 0x40
-
 	pop edx ecx ebx eax
 	jmp .end_f
 	@@:
 	push eax edx
-    mov eax,8
 		mov edx,201
 		or edx,0x80000000
-    int 0x40
+		mcall SF_DEFINE_BUTTON
 	pop edx eax
 	.end_f:
-;pop edi
 	ret
 endp
 
@@ -195,19 +175,14 @@ endp
 ; edi = pointer to tedit struct
 align 4
 proc draw_panel_syntax
-;push edi
-;mov edi,dword[edit]
 	cmp ted_panel_id,TED_PANEL_SYNTAX ;if not panel
 	jne @f
 	pushad
 
-  mov eax,13 ;рисование прямоугольника
-  mov ebx,TED_PANEL_WIDTH
 	mov ecx,ted_wnd_t
 	shl ecx,16
 	mov cx,20
-  mov edx,[sc.work]
+	mcall SF_DRAW_RECT,TED_PANEL_WIDTH,,[sc.work] ;ðèñîâàíèå âåðõíåãî ôîíîâîãî ïðÿìîóãîëüíèêà
-  int 0x40 ;рисование верхнего фонового прямоугольника
 
 	stdcall dword[tl_draw], tree1
 	mov [ws_dir_lbox.all_redraw],1 ;äëÿ ïîëíîé ïåðåðèñîâêè äî÷åðíåãî ñêðîëëèíãà
@@ -226,42 +201,33 @@ proc draw_panel_syntax
 	inc cx
 	int 0x40 ;ðèñîâàíèå íèæíåãî ôîíîâîãî ïðÿìîóãîëüíèêà
 
-  mov eax,8 ;кнопка
-  mov ebx,5*65536+65
 	mov ecx,ted_wnd_t
 	add ecx,25
 	add ecx,dword[tree1.box_height]
 	shl ecx,16
 	mov cx,20
-  mov edx,200 ;button id
+	mcall SF_DEFINE_BUTTON,(5 shl 16)+65,,200,[sc.work_button] ;200 - button id
-  mov esi,[sc.work_button]
-  int 0x40
 
-  mov eax,4 ;рисование текста
+	mov ebx,(30 shl 16)+5
-  mov ebx,30*65536+5
 	add ebx,ted_wnd_t
 	mov ecx,[sc.work_text]
 	or ecx,0x80000000
-  mov edx,txtFormatCapt
+	mcall SF_DRAW_TEXT,,,txtFormatCapt
-  int 0x40
 
-  mov ebx,10*65536+31
+	mov ebx,(10 shl 16)+31
 	add ebx,dword[tree1.box_height]
 	add ebx,ted_wnd_t
-  mov edx,txtFormatApply
+	mcall ,,,txtFormatApply
-  int 0x40
 
 	popad
 	jmp .end_f
 	@@:
 		push eax edx
-      mov eax,8
 		mov edx,200
 		or edx,0x80000000
-      int 0x40 ;если нет панели то удаляем кнопку
+		mcall SF_DEFINE_BUTTON ;åñëè íåò ïàíåëè òî óäàëÿåì êíîïêó
 		pop edx eax
 	.end_f:
-;pop edi
 	ret
 endp
 
@@ -277,8 +243,7 @@ EvSize:
 	m2m ted_wnd_w,[procinfo.client_box.width] ;ñòàâèì øèðèíó îêíà ðåäàêòîðà ðàâíîé øèðèíå âñåãî îêíà
 	mov eax,ted_wnd_l
 	sub ted_wnd_w,eax ;îòíèìàåì îòñòóï ñëåâà
-  mov eax,dword[esi+sb_offs_size_x]
+	movzx eax,word[esi+sb_offs_size_x]
-  and eax,0xffff
 	sub ted_wnd_w,eax ;îòíèìàåì øèðèíó âåðò. ñêðîëëèíãà
 
 	m2m ted_wnd_h,[procinfo.client_box.height] ;ñòàâèì âûñîòó îêíà ðåäàêòîðà ðàâíîé âûñîòå âñåãî îêíà
@@ -287,8 +252,7 @@ EvSize:
 		mov ted_wnd_h,MIN_M_WND_H
 	@@:
 
-  mov ax,word[ebx+sb_offs_size_y]
+	movzx eax,word[ebx+sb_offs_size_y]
-  and eax,0xffff
 	sub ted_wnd_h,eax	      ;îòíèìàåì âûñîòó ãîðèç. ñêðîëëèíãà
 	mov eax,ted_wnd_t
 	sub ted_wnd_h,eax	      ;îòíèìàåì îòñòóï ñâåðõó
@@ -300,7 +264,7 @@ EvSize:
 	mov tl_box_top,eax ;=ted_wnd_t
 	add tl_box_top,20
 
-  mov dword[edit2.top],eax ;=ted_wnd_t
+	mov [edit2.top],eax ;=ted_wnd_t
 	add dword[edit2.top],20
 
 	popad
@@ -314,7 +278,7 @@ align 4
 draw_but_icon:
 	push eax ebx
 
-	mov eax,8 ;кнопка
+	mov eax,SF_DEFINE_BUTTON
 	push ecx edx esi
 		mov ebx,edx
 		mov edx,ecx
@@ -330,11 +294,11 @@ draw_but_icon:
 		jge @f ;êíîïêà íå âëåçëà â îêíî
 			mov esi,[sc.work_button]
 			int 0x40 ;ñòàâèì êíîïêó
-			mov eax,7 ;bmp
+			mov eax,SF_PUT_IMAGE
 		@@:
 	pop esi edx ecx
 
-	cmp eax,7
+	cmp eax,SF_PUT_IMAGE
 	jne @f ;êíîïêà íå âëåçëà â îêíî
 		mov ebx,[bmp_icon]
 		bt ecx,30 ;if (ecx & 0x40000000)

programs/other/t_edit/wnd_k_words.inc

@@ -20,7 +20,7 @@ end if
 align 4
 prop_start:
 pushad
-	mcall 40,0xC0000027 ;¬ áª  ®¦¨¤ ¥¬ëå ᮡë⨩
+	mcall SF_SET_EVENTS_MASK,0xC0000027 ;¬ áª  ®¦¨¤ ¥¬ëå ᮡë⨩
 	inc byte[wnd_k_words_run]
 
 	;­ áâனª  ᯨ᪠ ®¡ê¥ªâ®¢
@@ -41,10 +41,8 @@ popad
 align 4
 prop_red_win:
 pushad
-	mcall 12,1
+	mcall SF_REDRAW,SSF_BEGIN_DRAW
 
-	xor eax,eax
-	mov edi,txt_caption
 	mov bx,word[procinfo.box.left]
 	add bx,5 ;word[buf_0.l]
 	shl ebx,16
@@ -53,43 +51,31 @@ pushad
 	add cx,42 ;word[buf_0.t]
 	shl ecx,16
 	mov cx,250
-	mov edx,0xffffd0
+	mcall SF_CREATE_WINDOW,,,0x33ffffd0,,txt_caption
-	or  edx,0x33000000
-	int 0x40
-
-	mov eax,8
-	mov ebx,(5 shl 16)+19
-	mov ecx,(5 shl 16)+19
-	mov edx,3
-	mov esi,[sc.work_button]
-	int 0x40
 
+	mcall SF_DEFINE_BUTTON,(5 shl 16)+19,(5 shl 16)+19,3,[sc.work_button]
 	add ebx,(25 shl 16)
-	mov edx,4
+	mcall ,,,4
-	int 0x40
 
-	mov eax,7
 	mov ebx,[bmp_icon]
 	add ebx,7*IMAGE_TOOLBAR_ICON_SIZE
-	mov ecx,(20 shl 16)+20
+	mcall SF_PUT_IMAGE,,(20 shl 16)+20,(5 shl 16)+5 ;­ ©â¨
-	mov edx,(5 shl 16)+5 ;­ ©â¨
-	int 0x40
 
 	sub ebx,2*IMAGE_TOOLBAR_ICON_SIZE
 	mov edx,(30 shl 16)+5 ;ª®¯¨à®¢ âì
 	int 0x40
 
 	mov dword[w_scr_t3.all_redraw],1
-	stdcall [scrollbar_ver_draw],dword w_scr_t3
+	stdcall [scrollbar_ver_draw], w_scr_t3
 	stdcall [tl_draw], tree3
 	stdcall [edit_box_draw], edit3
-	mcall 12,2
+	mcall SF_REDRAW,SSF_END_DRAW
 popad
 
 ;­¥ ®âà뢠âì íâã äã­ªæ¨î ®â ¯à¥¤ë¤ã饩
 align 4
 prop_still:
-	mcall 10
+	mcall SF_WAIT_EVENT
 
 	cmp al,1 ;¨§¬. ¯®«®¦¥­¨¥ ®ª­ 
 	jz prop_red_win
@@ -111,12 +97,12 @@ prop_still:
 	mov dword[tree3.data_img_sys],0 ;â. ª. ®­¨ ¥é¥ ¨á¯®«ì§ãîâìáï ¢ ¤à㣨å í«¥¬¥­â å
 	stdcall dword[tl_data_clear], tree3
 	mov byte[wnd_k_words_run],0 ;®¡­ã«ï¥¬ áç¥â稪 ®ª®­
-	mcall -1 ;§ ªàë⨥ ®ª­  ¯®¨áª 
+	mcall SF_TERMINATE_PROCESS
 
 align 4
 prop_key:
 push eax
-	mcall 2
+	mcall SF_GET_KEY
 	stdcall [edit_box_key], edit3
 	stdcall [tl_key], tree3
 pop eax
@@ -133,7 +119,7 @@ prop_mouse:
 align 4
 prop_button:
 	pushad
-	mcall 17 ;¯®«ãç¨âì ª®¤ ­ ¦ â®© ª­®¯ª¨
+	mcall SF_GET_BUTTON
 
 	cmp ah,1
 	je prop_still.exit
@@ -153,7 +139,15 @@ prop_button:
 		stdcall str_instr, ebx,[edit3.text]
 		test al,al
 		jnz .end_add
-			stdcall dword[tl_node_add], tree3, (0 shl 16), ebx 
+			;ª«î祢®¥ á«®¢®
+			stdcall dword[tl_node_add], tree3, (1 shl 16), ebx
+			stdcall dword[tl_cur_next], tree3
+			mov edx,[ebx+MAX_COLOR_WORD_LEN]
+			or edx,edx
+			jz .end_add
+				;á¯à ¢ª  ¯® ª«î祢®¬ã á«®¢ã
+				add edx,ted_help_text_f1
+				stdcall dword[tl_node_add], tree3, 1, edx
 				stdcall dword[tl_cur_next], tree3
 		.end_add:
 		add ebx,MAX_COLOR_WORD_LEN+8 ;sizeof.TexColViv
@@ -161,6 +155,7 @@ prop_button:
 
 		stdcall dword[tl_cur_beg], tree3
 		stdcall dword[tl_draw], tree3
+		jmp .no_select_0
 	@@:
 	cmp ah,4
 	jne @f
@@ -178,7 +173,7 @@ prop_button:
 			mov ecx,MAX_COLOR_WORD_LEN
 			cld
 			rep movsb
-			mcall 54,2,12+MAX_COLOR_WORD_LEN,[tedit0.buffer]
+			mcall SF_CLIPBOARD,SSF_WRITE_CB,12+MAX_COLOR_WORD_LEN,[tedit0.buffer]
 		.no_select_0:
 	@@:
 
@@ -187,10 +182,8 @@ prop_button:
 
 ;¤¥à¥¢® á ®¡ê¥ªâ ¬¨ ¢ ¯®«ì§®¢ â¥«ì᪮¬ ä ©«¥
 align 4
-tree3 tree_list MAX_COLOR_WORD_LEN,3,\
+tree3 tree_list MAX_COLOR_WORD_LEN,3,tl_key_no_edit,\
-	tl_key_no_edit+tl_list_box_mode,\
+	16,16, 0x8080ff,0x0000ff,0xffffff, 5,30,300,160, 16, 0,0, el_focus, w_scr_t3,0
-	16,16, 0x8080ff,0x0000ff,0xffffff, 5,30,300,160, 16, 0,0, el_focus,\
-	w_scr_t3,0
 
 align 4
 edit3 edit_box 80, 70, 8, 0xffffff, 0xff, 0x80ff, 0, 0x8000, MAX_COLOR_WORD_LEN+2, string1, mouse_dd, 0