WebSVN – Kolibri OS – Diff – /programs/other/t_edit/t_edit.asm

-;Îãðîìíàÿ áëàãîäàðíîñòü Maxxxx32, Diamond, Heavyiron
+;£à®¬ ï ¡« £®¤ à®áâì Maxxxx32, Diamond, Heavyiron
-;è äðóãèì ïðîãðàììèñòàì, à òàêæå
+;¨ ¤àã£¨¬ ¯à®£à ¬¬¨áâ ¬,   â ª¦¥
-;Òåïëîâó Àëåêñåþ ( www.lrz.land.ru)
+;¥¯«®¢ã «¥ªá¥î ( www.lrz.land.ru)
 use32
   org 0x0
-  db 'MENUET01' ;èäåíòèô. èñïîëíÿåìîãî ôàéëà âñåãäà 8 áàéò
+  db 'MENUET01' ;¨¤¥â¨ä. ¨á¯®«ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
   dd 0x01
   dd start
-  dd i_end ; ðàçìåð ïðèëîæåíèÿ
+  dd i_end ; à §¬¥à ¯à¨«®¦¥¨ï
   dd mem
   dd stacktop
-  dd file_name;buf_cmd_lin
+  dd file_name ; command line
   dd sys_path
 MAX_COLOR_WORD_LEN equ 40
-maxChars equ 100002 ;(...+2)
+maxChars equ 100002 ;(...+2)
 BUF_SIZE equ 1000 ;bufer for copy|paste
 maxColWords equ 10000
-include '../../macros.inc'
+include '../../proc32.inc'
-include '../../develop/libraries/box_lib/load_lib.mac'
+include '../../macros.inc'
-include '../../develop/libraries/box_lib/trunk/tree_list.mac'
+include '../../develop/libraries/box_lib/load_lib.mac'
-include '../../develop/libraries/box_lib/trunk/editbox.mac'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 ;---------------------------------------------------------------------
   push dword tree1
   call dword[tl_data_init]
 ;---------------------------------------------------------------------
-; ÷èòàåì bmp ôàéë ñ êóðñîðàìè è ëèíèÿìè
+; ç¨â ¥¬ bmp ä ©« á ªãàá®à ¬¨ ¨ «¨¨ï¬¨
   copy_path fn_icon_tl_sys,sys_path,file_name,0x0
   mov ecx,3*256*13
   cmp ebx,0
   jg @f
     mov dword[tree1.data_img_sys],0
   @@:
 ;---------------------------------------------------------------------
-; ÷èòàåì bmp ôàéë ñ èêîíêàìè óçëîâ
+; ç¨â ¥¬ bmp ä ©« á ¨ª®ª ¬¨ ã§«®¢
   copy_path fn_icon_tl_nod,sys_path,file_name,0x0
   mov ecx,3*256*2
   call mem_Alloc
   cmp ebx,0
   jg @f
     mov dword[tree1.data_img],0
   @@:
 ;------------------------------------------------------------------------------
-  copy_path fn_syntax_dir,sys_path,file_name,0x0 ;áåðåì ïóòü ê ïàïêå ñ ôàéëàìè ñèíòàêñèñà
+  copy_path fn_syntax_dir,sys_path,file_name,0x0 ;¡¥à¥¬ ¯ãâì ª ¯ ¯ª¥ á ä ©« ¬¨ á¨â ªá¨á
   mov eax,70
   mov ebx,tree_file_struct
   int 0x40
   mov eax,dir_mem
   add eax,32+4+1+3+4*6+8
 mov ecx,ebx
 @@:
-  cmp byte[eax],'.' ;ôèëüòðóåì ôàéëû ñ èìåíàìè '.' è '..'
+  cmp byte[eax],'.' ;ä¨«ìâàã¥¬ ä ©«ë á ¨¬¥ ¬¨ '.' ¨ '..'
   je .filter
     push dword tree1
-    push dword 0x10000 ;1*2^16 - ãäå 1 íîìåð èêîíêè ñ êíèãîé
+    push dword 0x10000 ;1*2^16 - £¤¥ 1 ®¬¥à ¨ª®ª¨ á ª¨£®©
     push dword eax
     call dword[tl_node_add]
   mov ebx,10*65536+485
   mov ecx,10*65536+280
   mov edx,[sc.work]
   or  edx,0x73000000
   mov edi,hed
-  mcall
+  int 0x40
+  mov edi,tedit0
   mcall 9,procinfo,-1
-  call EvSize
+  stdcall EvSize,edi
-  mov eax,13 ;rect
+  mov eax,13 ;âåðõíèé ïðÿìîóãîëüíèê, äëÿ î÷èñòêè âåðõíåé ïàíåëè
   xor ebx,ebx
-  xor ecx,ecx
+  mov ecx,ted_wnd_t
-  mov bx,word [procinfo.client_box.width]
-  inc bx
+  mov bx,word [procinfo.client_box.width]
-  mov cx,word [wndMain.top]
-  mcall
-  push dword edit1
-  call [edit_box_draw]
+  inc bx
+  int 0x40
 ; draw for Menu 1
-  push dword menu_data_1
+  stdcall [edit_box_draw], dword edit1
-  call [menu_bar_draw]
+  stdcall [menu_bar_draw], dword menu_data_1
   call draw_but_toolbar
   cmp [err_ini0],1
   jne @f
     mov eax,4
-    mov ebx,[wndMain.left]
+    mov ebx,ted_wnd_l
-    add ebx,[recMain.left]
+    add ebx,ted_rec_l
     shl ebx,16
-    add ebx,[wndMain.top]
+    add ebx,ted_wnd_t
     int 0x40
   @@:
   cmp [err_ini0],1
   je @f
-    call draw_main_win
-  @@:
-  cmp [err_opn],1
-  jne @f
-    ;mov eax,4
-    mov ebx,10*65536+35
-    mov ecx,0x80ff0000
-    mov edx,txtErrOpen
-    mcall
+    stdcall draw_main_win, tedit0
   @@:
   mcall 12,2
 still:
   mov eax,10
   mcall
-  cmp al,1 ;èçì. ïîëîæåíèå îêíà
+  cmp al,1 ;¨§¬. ¯®«®¦¥¨¥ ®ª
   jz red_win
   jmp still
 mouse:
-  push dword edit1
+mouse:
-  call [edit_box_mouse]
+  stdcall [edit_box_mouse], dword edit1
 .vertical:
   mov eax,[wScr.max_area]
   cmp eax,[wScr.cur_area]
   jbe .horizontal
 ; mouse event for Vertical ScrollBar
-  push dword wScr
-  call [scrollbar_ver_mouse]
+  stdcall [scrollbar_ver_mouse], dword wScr
   mov eax,wScr.redraw
   xor ebx,ebx
   cmp [eax],ebx
   je @f
   mov [eax],ebx
-  call draw_main_win
-  ;call mouse_wnd_main
+  stdcall draw_main_win, tedit0
   jmp still
 @@:
   cmp [wScr.delta2],0
   jne still
 	mov eax,hScr.redraw
 	xor ebx,ebx
 	cmp [eax],ebx
 	je .other
 	mov [eax],ebx
-  call draw_main_win
+  stdcall draw_main_win, tedit0
   jmp still
 .other:
   cmp [wScr.delta2],0
   jne still
   cmp [hScr.delta2],0
   jne still
-  call mouse_wnd_main
+  stdcall mouse_wnd_main, tedit0
   cmp byte[panel_id],TE_PANEL_FIND ;if not panel
   jne @f
     je still
 ;    cmp [keyUpr],0
 ;    jne still
-    call KeyConvertToASCII
-    push dword edit2
+    call KeyConvertToASCII
-    call [edit_box_key]
+    stdcall [edit_box_key], dword edit2
     jmp still
   @@:
     @@:
     cmp ah,33 ;Ctrl+F
     jne @f
     cmp byte[panel_id],TE_PANEL_FIND
     je @f
-      call but_find
+      stdcall but_find, tedit0
     @@:
     cmp ah,44 ;Ctrl+Z
     je but_undo
     cmp ah,46 ;Ctrl+C
     jne @f
     @@:
     cmp ah,80 ;Shift+Down
     jne @f
       call sel_KeyDown
     @@:
-    ;mov [dragk],1 ;íà÷èíàåì âûäåëåíèå îò êëàâèàòóðû
+    ;mov [dragk],1 ; ç¨ ¥¬ ¢ë¤¥«¥¨¥ ®â ª« ¢¨ âãàë
     jmp .key_MoveCur
   .key_Shift:
 ;-------------------------------------------------
   cmp ah,72 ;178 ;Up
   jne @f
     push dx
-    call draw_cursor_sumb
+    stdcall draw_cursor_sumb, tedit0
     call CurMoveUp
     cmp dl,8
     jne .no_red_0
       call OnInitialUpdate
-      call draw_main_win
+      stdcall draw_main_win, tedit0
       pop dx
       jmp @f
     .no_red_0:
-    call draw_main_cursor
+    stdcall draw_main_cursor, tedit0
     pop dx
-    mov [dragk],0 ;çàêàí÷èâàåì âûäåëåíèå îò êëàâèàòóðû
+    mov [dragk],0 ;§ ª ç¨¢ ¥¬ ¢ë¤¥«¥¨¥ ®â ª« ¢¨ âãàë
   @@:
   cmp ah,80 ;177 ;Down
   jne @f
     push dx
-    call draw_cursor_sumb
+    stdcall draw_cursor_sumb, tedit0
     call CurMoveDown
     cmp dl,8
     jne .no_red_1
       call OnInitialUpdate
-      call draw_main_win
+      stdcall draw_main_win, tedit0
       pop dx
       jmp @f
     .no_red_1:
-    call draw_main_cursor
+    stdcall draw_main_cursor, tedit0
     pop dx
-    mov [dragk],0 ;çàêàí÷èâàåì âûäåëåíèå îò êëàâèàòóðû
+    mov [dragk],0 ;§ ª ç¨¢ ¥¬ ¢ë¤¥«¥¨¥ ®â ª« ¢¨ âãàë
   @@:
   cmp ah,75 ;176 ;Left
   jne @f
     push dx
-    call draw_cursor_sumb
+    stdcall draw_cursor_sumb, tedit0
     call CurMoveLeft
     cmp dl,8
     jne .no_red_2
       call OnInitialUpdate
-      call draw_main_win
+      stdcall draw_main_win, tedit0
       pop dx
       jmp @f
     .no_red_2:
-    call draw_main_cursor
+    stdcall draw_main_cursor, tedit0
     pop dx
-    mov [dragk],0 ;çàêàí÷èâàåì âûäåëåíèå îò êëàâèàòóðû
+    mov [dragk],0 ;§ ª ç¨¢ ¥¬ ¢ë¤¥«¥¨¥ ®â ª« ¢¨ âãàë
   @@:
   cmp ah,77 ;179 ;Right
   jne @f
     push dx
-    call draw_cursor_sumb
+    stdcall draw_cursor_sumb, tedit0
     call CurMoveRight
     cmp dl,8
     jne .no_red_3
       call OnInitialUpdate
-      call draw_main_win
+      stdcall draw_main_win, tedit0
       pop dx
       jmp @f
     .no_red_3:
-    call draw_main_cursor
+    stdcall draw_main_cursor, tedit0
     pop dx
-    mov [dragk],0 ;çàêàí÷èâàåì âûäåëåíèå îò êëàâèàòóðû
+    mov [dragk],0 ;§ ª ç¨¢ ¥¬ ¢ë¤¥«¥¨¥ ®â ª« ¢¨ âãàë
   @@:
   cmp ah,71 ;180 ;Home
   jne @f
     push dx
-    call draw_cursor_sumb
+    stdcall draw_cursor_sumb, tedit0
     call CurMoveX_FirstChar
     cmp dl,8
     jne .no_red_4
       call OnInitialUpdate
-      call draw_main_win
+      stdcall draw_main_win, tedit0
       pop dx
       jmp @f
     .no_red_4:
-    call draw_main_cursor
+    stdcall draw_main_cursor, tedit0
     pop dx
-    mov [dragk],0 ;çàêàí÷èâàåì âûäåëåíèå îò êëàâèàòóðû
+    mov [dragk],0 ;§ ª ç¨¢ ¥¬ ¢ë¤¥«¥¨¥ ®â ª« ¢¨ âãàë
   @@:
   cmp ah,79 ;181 ;End
   jne @f
     push dx
-    call draw_cursor_sumb
+    stdcall draw_cursor_sumb, tedit0
     call CurMoveX_LastChar
     cmp dl,8
     jne .no_red_5
       call OnInitialUpdate
-      call draw_main_win
+      stdcall draw_main_win, tedit0
       pop dx
       jmp @f
     .no_red_5:
-    call draw_main_cursor
+    stdcall draw_main_cursor, tedit0
     pop dx
-    mov [dragk],0 ;çàêàí÷èâàåì âûäåëåíèå îò êëàâèàòóðû
+    mov [dragk],0 ;§ ª ç¨¢ ¥¬ ¢ë¤¥«¥¨¥ ®â ª« ¢¨ âãàë
   @@:
   cmp ah,73 ;184 ;PageUp
   jne @f
     push dx
     call CurMovePageUp
     cmp dl,0
     pop dx
     je @f
     call OnInitialUpdate
-    call draw_main_win
+    stdcall draw_main_win, tedit0
   @@:
   cmp ah,81 ;183 ;PageDown
   jne @f
     push dx
     call CurMovePageDown
     cmp dl,0
     pop dx
     je @f
     call OnInitialUpdate
-    call draw_main_win
+    stdcall draw_main_win, tedit0
-    mov [dragk],0 ;çàêàí÷èâàåì âûäåëåíèå îò êëàâèàòóðû
+    mov [dragk],0 ;§ ª ç¨¢ ¥¬ ¢ë¤¥«¥¨¥ ®â ª« ¢¨ âãàë
   @@:
 ;-------------------------------------------------
     cmp [keyUpr],0
     jne still
   .key_MoveCur:
   je still
   cmp ah,0x80 ;if key up
   ja still
   call KeyConvertToASCII
-  ;mov [dragk],0 ;çàêàí÷èâàåì âûäåëåíèå îò êëàâèàòóðû
+  ;mov [dragk],0 ;§ ª ç¨¢ ¥¬ ¢ë¤¥«¥¨¥ ®â ª« ¢¨ âãàë
   push ebx
   xor ebx,ebx
     .no_ins_mod:
     call TextAdd
     call draw_but_toolbar
     cmp byte [key_new],13
     jne .dr_m_win
-      call draw_main_win
+      stdcall draw_main_win, tedit0
       jmp .dr_cur_l
     .dr_m_win:
-      call draw_cur_line
+      stdcall draw_cur_line, tedit0
     .dr_cur_l:
     pop edi esi
   @@:
   pop ebx
     cmp al,1
     je .del_one_b
       call TextDel
     .del_one_b:
     call draw_but_toolbar
-    call draw_main_win
+    stdcall draw_main_win, tedit0
     pop bx ax
   @@:
   cmp ah,182 ;Delete
     cmp al,1
     je .del_one_d
       call TextDel
     .del_one_d:
     call draw_but_toolbar
-    call draw_main_win
+    stdcall draw_main_win, tedit0
     pop bx ax
   @@:
   cmp ah,185 ;Ins
   jne @f
-    call draw_cursor_sumb
+    stdcall draw_cursor_sumb, tedit0
     xor [curMod],1
-    call draw_main_cursor
+    stdcall draw_main_cursor, tedit0
   @@:
   jmp still
 button:
-;  cmp [menu_active],1 ;åñëè íàæàëè ìåíþ, òî ñíà÷àëà ðåàêöèÿ íà ìåíþ
+;  cmp [menu_active],1 ;¥á«¨  ¦ «¨ ¬¥î, â® á ç «  à¥ ªæ¨ï   ¬¥î
 ;  jne @f ;mouse.menu_bar_1
 ;    mov [menu_active],0
 ;    jmp still
 ;  @@:
-  mcall 17 ;ïîëó÷èòü êîä íàæàòîé êíîïêè
+  mcall 17 ;¯®«ãç¨âì ª®¤  ¦ â®© ª®¯ª¨
   cmp ah,3
     call but_Copy
   @@:
   cmp ah,9
   jz  but_paste
   cmp ah,10
-  jz  but_find
+  jne @f
+    stdcall but_find, tedit0
+  @@:
   cmp ah,11
   jz  but_replace
   cmp ah,12
   jz  but_find_key_w
   cmp ah,13
   cmp ah,18
   jz  but_sumb_invis
   cmp ah,19
   jz  but_k_words_show
   cmp ah,20
+  jne @f
-  jz  but_synt_show
+    stdcall but_synt_show, tedit0
+  @@:
   cmp ah,200
   jne @f
     call but_OpenSyntax
   call mem_Free
   mov ecx,[options_file]
   call mem_Free
   push dword tree1
   call dword[tl_data_clear]
-  mcall -1 ;âûõîä èç ïðîãðàììû
+  mcall -1 ;¢ëå®¤ ¨§ ¯à®£à ¬¬ë
 txtErrOpen db '¥  ©¤¥ ä ©«, ¯à®¢¥àìâ¥ ¯à ¢¨«ì®áâì ¨¬¥¨',0
 txtErrIni0 db '¥ ®âªàë«áï ä ©« á ¨ª®ª ¬¨',0

Subversion Repositories Kolibri OS

(root)/programs/other/t_edit/t_edit.asm – Rev 1390 → 1449