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

   dd file_name ; command line
   dd sys_path
 MAX_COLOR_WORD_LEN equ 40
 maxChars equ 100002 ;(...+2)
-BUF_SIZE equ 1000 ;bufer for copy|paste
+BUF_SIZE equ 1000 ;buffer for copy|paste
-maxColWords equ 10000
+maxSyntaxFileSize equ 410000
 include '../../proc32.inc'
 include '../../macros.inc'
 include '../../develop/libraries/box_lib/load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
-include 'lang.inc'
-include 't_data.inc'
+include 'lang.inc'
-include 'strlen.inc'
+include 't_data.inc'
-include 't_work.inc' ;text work functions
+include 'strlen.inc'
 include 't_draw.inc' ;draw main window functions
-include 't_button.inc'
+include 't_button.inc' ;text work functions
+@use_library
-@use_library
+align 4
-align 4
+start:
-start:
   mcall 48,3,sc,sizeof.system_colors
-  m2m [wScr.bckg_col],[sc.work]
+  mov eax,[sc.work]
-  m2m [wScr.frnt_col],[sc.work_button]
+  mov [wScr.bckg_col],eax
+  mov [hScr.bckg_col],eax
-  m2m [wScr.line_col],[sc.work_button_text]
+  mov eax,[sc.work_button]
   mov [wScr.frnt_col],eax
-  m2m [hScr.bckg_col],[sc.work]
+  mov [hScr.frnt_col],eax
 	jz	@f
 	mcall -1 ;exit not correct
 @@:
 ;---------------------------------------------------------------------
-  stdcall ted_init, tedit0
+  stdcall [ted_init], tedit0
   stdcall dword[tl_data_init], tree1
 ;---------------------------------------------------------------------
   add eax,304
   loop @b
 .end_dir_init:
+;--- load color option file ---
+	mov ebx,dword[fn_col_option]
+	copy_path ebx,fn_syntax_dir,file_name_rez,0x0
-;--- load color option file ---
+	copy_path file_name_rez,sys_path,file_name,0x0
-  stdcall InitColText, tedit0
+	stdcall [ted_init_syntax_file], tedit0,run_file_70,file_name
 ;--- get cmd line ---
   cmp byte[buf_cmd_lin+3],0 ;buf_cmd_lin
   mov edi,tedit0
   mcall 9,procinfo,-1
   stdcall EvSize,edi
-  mov eax,13 ;âåðõíèé ïðÿìîóãîëüíèê, äëÿ î÷èñòêè âåðõíåé ïàíåëè
+  mov eax,13 ;¢¥àå¨© ¯àï¬®ã£®«ì¨ª, ¤«ï ®ç¨áâª¨ ¢¥àå¥© ¯ ¥«¨
   xor ebx,ebx
   mov ecx,ted_wnd_t
   mov bx,word [procinfo.client_box.width]
     int 0x40
   @@:
   cmp [err_ini0],1
   je @f
-    stdcall draw_main_win, tedit0
+    stdcall [ted_draw], tedit0
   @@:
   stdcall [edit_box_mouse], dword edit1
   test word [edit1.flags],10b;ed_focus ; ¥á«¨ ¥ ¢ ä®ªãá¥, ¢ëå®¤¨¬
-  jne still
-;-----------------------------------------------
-  cmp [hScr.delta2],0
-  jne .horizontal
-.vertical:
-  mov eax,[wScr.max_area]
-  cmp eax,[wScr.cur_area]
-  jbe .horizontal
-; mouse event for Vertical ScrollBar
-  stdcall [scrollbar_ver_mouse], dword wScr
-  mov eax,wScr.redraw
-  xor ebx,ebx
-  cmp [eax],ebx
-  je @f
-  mov [eax],ebx
+  jne still
-  stdcall draw_main_win, tedit0
-  jmp still
-@@:
-  cmp [wScr.delta2],0
-  jne still
-.horizontal:
-    mov   eax,[hScr.max_area]
-    cmp   eax,[hScr.cur_area]
-    jbe   .other
-; mouse event for Horizontal ScrollBar
-	push dword hScr
-	call [scrollbar_hor_mouse]
-	mov eax,hScr.redraw
-	xor ebx,ebx
-	cmp [eax],ebx
-	je .other
-	mov [eax],ebx
-  stdcall draw_main_win, tedit0
-  jmp still
-.other:
-  cmp [wScr.delta2],0
-  jne still
-  cmp [hScr.delta2],0
-  jne still
-  stdcall mouse_wnd_main, tedit0
+  stdcall [ted_mouse], tedit0
-  cmp byte[tedit0.panel_id],TE_PANEL_FIND ;if not panel
+  cmp byte[tedit0.panel_id],TED_PANEL_FIND ;if not panel
   jne @f
     stdcall [edit_box_mouse], dword edit2
   @@:
-  cmp byte[tedit0.panel_id],TE_PANEL_SYNTAX ;if not panel
+  cmp byte[tedit0.panel_id],TED_PANEL_SYNTAX ;if not panel
   jne .menu_bar_1 ;@f
   stdcall [tl_mouse], tree1
   jne	.mnu_1
   cmp [menu_data_1.cursor_out],dword 4
   je	button.exit
   cmp [menu_data_1.cursor_out],dword 3
   jne	@f
-    stdcall but_SaveFile, tedit0
+    stdcall [ted_but_save_file], tedit0,run_file_70,[edit1.text]
   @@:
   cmp [menu_data_1.cursor_out],dword 2
   jne	@f
-    call but_OpenFile
+    call ted_but_open_file
   @@:
   cmp [menu_data_1.cursor_out],dword 1
   jne	@f
-    call but_NewFile
+    call ted_but_new_file
   @@:
   ;cmp [menu_data_1.cursor_out],dword 0
   ;jne @f
 .mnu_1:
   jmp still
 endp
 align 4
 key:
   mcall 66,3 ;66.3 ¯®«ãç¨âì á®áâ®ï¨¥ ã¯à ¢«ïîé¨å ª« ¢¨è
-  xor ebx,ebx
+  xor esi,esi
   mov ecx,1
   test al,0x03 ;[Shift]
   jz @f
     mov cl,2
-    or ebx,KM_SHIFT
+    or esi,KM_SHIFT
   @@:
   test al,0x0c ;[Ctrl]
   jz @f
-    or ebx,KM_CTRL
+    or esi,KM_CTRL
   @@:
   test al,0x30 ;[Alt]
   jz @f
     mov cl,3
-    or ebx,KM_ALT
+    or esi,KM_ALT
   @@:
   test al,0x80 ;[NumLock]
   jz @f
-    or ebx,KM_NUMLOCK
+    or esi,KM_NUMLOCK
+  @@:
   @@:
   mcall 26,2,,conv_tabl ;26.2 ¯®«ãç¨âì à áª« ¤ªã ª« ¢¨ âãàë
   mcall 2 ;¯®«ãç ¥¬ ª®¤  ¦ â®© ª« ¢¨è¨
-  ;stdcall [tl_key], tree1 ;???
+  ;stdcall [tl_key], tree1
   test word [edit1.flags],10b;ed_focus ; ¥á«¨ ¥ ¢ ä®ªãá¥, ¢ëå®¤¨¬
   je @f
     stdcall KeyConvertToASCII, dword conv_tabl
     stdcall [edit_box_key], dword edit2
     jmp still
   @@:
-  stdcall ted_key, tedit0, conv_tabl
+  stdcall [ted_key], tedit0, conv_tabl,esi
+  jmp still
   jmp still
 align 4
 button:
 ;  cmp [menu_active],1 ;¥á«¨  ¦ «¨ ¬¥î, â® á ç «  à¥ ªæ¨ï   ¬¥î
 ;  jne @f ;mouse.menu_bar_1
 ;    mov [menu_active],0
 ;    jmp still
 ;  @@:
   mcall 17 ;¯®«ãç¨âì ª®¤  ¦ â®© ª®¯ª¨
   cmp ah,3
   jne @f
-    call but_NewFile
+    call ted_but_new_file
   @@:
   cmp ah,4
   jne @f
-    call but_OpenFile
+    call ted_but_open_file
   @@:
   cmp ah,5
   jne @f
-    stdcall but_SaveFile, tedit0
+    stdcall [ted_but_save_file], tedit0,run_file_70,[edit1.text]
   @@:
   cmp ah,6
   jne @f
-    stdcall ted_but_select_word, tedit0
+    stdcall [ted_but_select_word], tedit0
   @@:
   cmp ah,7
   jne @f
-    stdcall ted_but_cut, tedit0
+    stdcall [ted_but_cut], tedit0
   @@:
   cmp ah,8
   jne @f
-    stdcall ted_but_copy, tedit0
+    stdcall [ted_but_copy], tedit0
   @@:
   cmp ah,9
   jne @f
-    stdcall ted_but_paste, tedit0
+    stdcall [ted_but_paste], tedit0
   @@:
   cmp ah,10
   jne @f
-    stdcall but_find, tedit0
+    call ted_but_find
   @@:
   cmp ah,11
   jne @f
     call but_find_key_w
   @@:
   cmp ah,13
   jne @f
-    stdcall but_sumb_upper, tedit0
+    stdcall [ted_but_sumb_upper], tedit0
   @@:
   cmp ah,14
   jne @f
-    stdcall but_sumb_lover, tedit0
+    stdcall [ted_but_sumb_lover], tedit0
   @@:
   cmp ah,15
   jne @f
-    stdcall but_reverse, tedit0
+    stdcall [ted_but_reverse], tedit0
   @@:
   cmp ah,16
   jne @f
-    stdcall ted_but_undo, tedit0
+    stdcall [ted_but_undo], tedit0
   @@:
   cmp ah,17
   jne @f
-    stdcall ted_but_redo, tedit0
+    stdcall [ted_but_redo], tedit0
   @@:
   cmp ah,18
   jne @f
     stdcall but_sumb_invis, tedit0
   @@:
   jne @f
     stdcall ted_but_open_syntax, tedit0
   @@:
   cmp ah,201
   jne @f
-    stdcall but_FindText, tedit0
+    stdcall [ted_but_find_next], tedit0
   @@:
   cmp ah,1
   jne still
 .exit:
-  stdcall ted_can_save, tedit0
+  stdcall [ted_can_save], tedit0
   cmp al,1
   jne @f
     stdcall [mb_create],msgbox_8,thread ;message: save changes in file?
     jmp still
   @@:
   mov ecx,[bmp_icon]
   call mem_Free
-  stdcall ted_delete, tedit0
+  stdcall [ted_delete], tedit0
   stdcall dword[tl_data_clear], tree1
   mcall -1 ;¢ëå®¤ ¨§ ¯à®£à ¬¬ë
 txtErrIni0 db '¥ ®âªàë«áï ä ©« á ¨ª®ª ¬¨',0
 err_ini0 db 0

Subversion Repositories Kolibri OS

(root)/programs/other/t_edit/t_edit.asm – Rev 1456 → 1457