WebSVN – Kolibri OS – Diff – /programs/other/t_edit_synt/te_syntax.asm

 use32
-  org 0x0
+  org 0
   db 'MENUET01' ;¨¤¥â¨ä. ¨á¯®«ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
-  dd 0x01
-  dd start
-  dd i_end ; à §¬¥à ¯à¨«®¦¥¨ï
+  dd 1, start, i_end, mem, stacktop, file_name, sys_path
-  dd mem
-  dd stacktop
-  dd file_name
-  dd sys_path
 MAX_COLOR_WORD_LEN equ 40
 BUF_SIZE equ 4096 ;buffer for copy|paste
-maxSyntaxFileSize equ 310000
 CAPT_PATH_WIDTH equ 50 ;è¨à¨  ¯®¤¯¨á¨ ¯¥à¥¤ â¥ªáâ®¢ë¬ ¯®«¥¬
 include '../../macros.inc'
 include '../../proc32.inc'
+include '../../KOSfuncs.inc'
-include '../../develop/libraries/box_lib/load_lib.mac'
+include '../../load_img.inc'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
-include '../../dll.inc'
+include '../../system/skincfg/trunk/kglobals.inc'
+include '../../system/skincfg/trunk/unpacker.inc'
 include 'te_data.inc'
 include 'te_work.inc' ;text work functions
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-; ªà®á ¤«ï § £àã§ª¨ ¨§®¡à ¦¥¨© á ¨á¯®«ì§®¢ ¨¥¬ ¡¨¡«¨®â¥ª¨ libimg.obj
-;¤«ï ¨á¯®«ì§®¢ ¨ï ¬ ªà®á  ã¦ë ¯¥à¥¬¥ë¥:
-; - run_file_70 FileInfoBlock
-; - image_data dd 0
-macro load_image_file path,buf,size
-{
-	;path - ¬®¦¥â ¡ëâì ¯¥à¥¬¥®© ¨«¨ áâà®ª®¢ë¬ ¯ à ¬¥âà®¬
-	if path eqtype '' ;¯à®¢¥àï¥¬ § ¤  «¨ áâà®ª®© ¯ à ¬¥âà path
-		jmp @f
-			local .path_str
-			.path_str db path ;ä®à¬¨àã¥¬ «®ª «ìãî ¯¥à¥¬¥ãî
-			db 0
-		@@:
-		;32 - áâ ¤ àâë©  ¤à¥á ¯® ª®â®à®¬ã ¤®«¦¥ ¡ëâì ¡ãä¥à á á¨áâ¥¬ë¬ ¯ãâ¥¬
-		copy_path .path_str,[32],file_name,0
-	else
-		copy_path path,[32],file_name,0 ;ä®à¬¨àã¥¬ ¯®«ë© ¯ãâì ª ä ©«ã ¨§®¡à ¦¥¨ï, ¯®¤à §ã¬¥¢ ¥¬ çâ® ® ¢ ®¤®© ¯ ¯ª¥ á ¯à®£à ¬¬®©
-	end if
-	stdcall mem.Alloc, dword size ;¢ë¤¥«ï¥¬ ¯ ¬ïâì ¤«ï ¨§®¡à ¦¥¨ï
-	mov [buf],eax
-	mov [run_file_70.Function], 0
-	mov [run_file_70.Position], 0
-	mov [run_file_70.Flags], 0
-	mov [run_file_70.Count], dword size
-	mov [run_file_70.Buffer], eax
-	mov byte[run_file_70+20], 0
-	mov [run_file_70.FileName], file_name
-	mcall 70,run_file_70 ;§ £àã¦ ¥¬ ä ©« ¨§®¡à ¦¥¨ï
-	cmp ebx,0xffffffff
-	je @f
-		;®¯à¥¤¥«ï¥¬ ¢¨¤ ¨§®¡à ¦¥¨ï ¨ ¯¥à¥¢®¤¨¬ ¥£® ¢® ¢à¥¬¥ë© ¡ãä¥à image_data
-		stdcall dword[img_decode], dword[buf],ebx,0
-		mov dword[image_data],eax
-		;¯à¥®¡à §ã¥¬ ¨§®¡à ¦¥¨¥ ª ä®à¬ âã rgb
-		stdcall dword[img_to_rgb2], dword[image_data],dword[buf]
-		;ã¤ «ï¥¬ ¢à¥¬¥ë© ¡ãä¥à image_data
-		stdcall dword[img_destroy], dword[image_data]
-	@@:
-}
 image_data dd 0 ;ãª § â¥«ì   ¢à¥¬¥ãî ¯ ¬ïâì. ¤«ï ã¦¥ ¯à¥®¡à §®¢ ¨ï ¨§®¡à ¦¥¨ï
 icon_tl_sys dd 0 ;ãª § â¥«ì   ¯ ¬ïâì ¤«ï åà ¥¨ï á¨áâ¥¬ëå ¨ª®®ª
 align 4
 start:
-	mcall 48,3,sc,sizeof.system_colors
+	mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors
-	mcall 68,11
+	mcall SF_SYS_MISC,SSF_HEAP_INIT
 	or eax,eax
 	jz button.exit
-	mcall 66,1,1 ;scan code
+	mcall SF_KEYBOARD,SSF_SET_INPUT_MODE,1 ;scan code
-	mcall 40,0x27
-;-------------------------------------------------
-	mov ecx,maxSyntaxFileSize
-	stdcall mem.Alloc,ecx
-	mov [options_file],eax
-	mov [options_file_end],eax
-	add [options_file_end],ecx
 	mcall SF_SET_EVENTS_MASK,0xC0000027
-load_libraries l_libs_start,load_lib_end
+	load_libraries l_libs_start,load_lib_end
-;¯à®¢¥àª    áª®«ìª® ã¤ ç® § £ã§¨« áì ¡¨¡«¨®â¥ª
+	;¯à®¢¥àª    áª®«ìª® ã¤ ç® § £ã§¨« áì ¡¨¡«¨®â¥ª
-	cmp dword [lib0+ll_struc_size-4],0
+	cmp dword[lib0+ll_struc_size-4],0
 	jz @f
 		mcall -1 ;exit not correct
 	@@:
 ;---------------------------------------------------------------------
-	stdcall dword[tl_data_init],dword tree1
+	stdcall [tl_data_init], tree1
 ; ç¨â ¥¬ ä ©« á ªãàá®à ¬¨ ¨ «¨¨ï¬¨
-	load_image_file 'tl_sys_16.png', icon_tl_sys,54+3*256*13
+	include_image_file '..\..\media\log_el\trunk\tl_sys_16.png', icon_tl_sys
-	mov eax,dword[icon_tl_sys]
+	mov eax,[icon_tl_sys]
-	mov dword[tree1.data_img_sys],eax
+	mov [tree1.data_img_sys],eax
 ;---------------------------------------------------------------------
 ; ç¨â ¥¬ bmp ä ©« á ¨ª®ª ¬¨ ã§«®¢
-	load_image_file 'tl_nod_16.png', icon_tl_sys,54+3*256*2
+	include_image_file '..\t_edit\tl_nod_16.png', icon_tl_sys
-	mov eax,dword[icon_tl_sys]
+	mov eax,[icon_tl_sys]
-	mov dword[tree1.data_img],eax
+	mov [tree1.data_img],eax
 ;------------------------------------------------------------------------------
-  copy_path fn_syntax_dir,sys_path,file_name,0 ;¡¥à¥¬ ¯ãâì ª ¯ ¯ª¥ á ä ©« ¬¨ á¨â ªá¨á
-  mov eax,70
+	copy_path fn_syntax_dir,sys_path,file_name,0 ;¡¥à¥¬ ¯ãâì ª ¯ ¯ª¥ á ä ©« ¬¨ á¨â ªá¨á
-  mov ebx,tree_file_struct
-  int 0x40
+	mcall SF_FILE,tree_file_struct
-cmp ebx,-1
+	cmp ebx,-1
-je .end_dir_init
+	je .end_dir_init
-  mov eax,dir_mem
+		mov eax,dir_mem
-  add eax,32+4+1+3+4*6+8
+		add eax,32+4+1+3+4*6+8
-mov ecx,ebx
+		mov ecx,ebx
-@@:
+		@@:
-  cmp byte[eax],'.' ;ä¨«ìâàã¥¬ ä ©«ë á ¨¬¥ ¬¨ '.' ¨ '..'
+			cmp byte[eax],'.' ;ä¨«ìâàã¥¬ ä ©«ë á ¨¬¥ ¬¨ '.' ¨ '..'
-  je .filter
+			je .filter
-    stdcall dword[tl_node_add],tree1,0x10000,eax ;1*2^16 - £¤¥ 1 ®¬¥à ¨ª®ª¨ á ª¨£®©
+			stdcall [tl_node_add],tree1,0x10000,eax ;1*2^16 - £¤¥ 1 ®¬¥à ¨ª®ª¨ á ª¨£®©
-    stdcall dword[tl_cur_next],tree1
+			stdcall [tl_cur_next],tree1
-  .filter:
+		.filter:
-  add eax,304
+			add eax,304
-  loop @b
+		loop @b
-  stdcall dword[tl_cur_beg],tree1 ;áâ ¢¨¬ ªãàá®à    ç «® á¯¨áª
+		stdcall [tl_cur_beg],tree1 ;áâ ¢¨¬ ªãàá®à    ç «® á¯¨áª
+		or dword[tree1.style], tl_cursor_pos_limited ;®£à ¨ç¨¢ ¥¬ ¤¢¨¦¥¨¥ ªãàá®à  ¢ ¯à¥¤¥« å á¯¨áª
-.end_dir_init:
+	.end_dir_init:
 ;--- load color option file ---
 stdcall [ted_init], tedit0
 mov byte[file_name],0
 align 4
 red_win:
 	call draw_window
 align 4
 still:
-  mcall 10
+  mcall SF_WAIT_EVENT
   cmp al,1 ;¨§¬. ¯®«®¦¥¨¥ ®ª
   jz red_win
   cmp al,2
   jz key
   cmp al,3
   jz button
   cmp al,6
   jz mouse
   jmp still
 align 4
 draw_window:
 	pushad
-	mcall 12,1
+	mcall SF_REDRAW,SSF_BEGIN_DRAW
 	mov edx,[sc.work]
 	or  edx,0x33000000
 	mov edi,hed
-	mcall 0,<10,555>,<10,333>
+	mcall SF_CREATE_WINDOW,<10,555>,<10,333>
+	mcall SF_THREAD_INFO,procinfo,-1
+	mov edi,tedit0 ;§ ç¥¨¥ edi ã¦® ¤«ï EvSize ¨ ted_wnd_t
-	mcall 9,procinfo,-1
-	mov eax,8 ;ª®¯ª
-	mov ebx,5*65536+90
-	mov ecx,195*65536+20
+	call EvSize
-	mov edx,200
-	mov esi,[sc.work_button];0xd0
-	mcall
+	mov esi,[sc.work_button];0xd0
 	mcall SF_DEFINE_BUTTON,5*65536+90,195*65536+20,200
 	;mov eax,8
 	mov ebx,100*65536+85
 	mov ecx,195*65536+20
 	mov edx,201
 	mov esi,0xd00000
 	mcall
-	mov eax,4 ;à¨á®¢ ¨¥ â¥ªáâ
 	mov ebx,10*65536+200
 	mov ecx,[sc.work_button_text]
 	or  ecx,0x80000000
-	mov edx,txt122
-	mcall
 	mcall SF_DRAW_TEXT,10*65536+200,,txt_load_f
 	mov ebx,105*65536+200
 	mov ecx,0xffff00
-	or  ecx,0x80000000
-	mov edx,txt148
-	mcall
+	or  ecx,0x80000000
 	mcall ,105*65536+200,,txt_save_f
-	mov ebx,195*65536+10
-	mov ecx,[sc.work_text]
-	or  ecx,0x80000000
+	mov ecx,[sc.work_text]
-	mov edx,txt_inp_file
+	or  ecx,0x80000000
-	int 0x40
+	mcall ,195*65536+10,,txt_inp_file
 	add ebx,20
 	mov edx,txt_out_file
 	int 0x40
 	push dword PathShow_data_1
 	call [PathShow_draw]
 	stdcall [edit_box_draw],dword edit1
 	stdcall [tl_draw],dword tree1
 	;scroll 1
 	mov [ws_dir_lbox.all_redraw],1
 	stdcall [scrollbar_ver_draw],dword ws_dir_lbox
 	stdcall [ted_draw], tedit0
+	mcall SF_REDRAW,SSF_END_DRAW
+	popad
+	ret
+MIN_M_WND_H equ 100 ;¬¨¨¬ «ì ï ¢ëá®â  £« ¢®£® ®ª
+;input:
+; edi = pointer to tedit struct
+align 4
+EvSize:
+	pushad
+	mov ebx,ted_scr_h
+	mov esi,ted_scr_w
+	m2m ted_wnd_w,[procinfo.client_box.width] ;áâ ¢¨¬ è¨à¨ã ®ª  à¥¤ ªâ®à  à ¢®© è¨à¨¥ ¢á¥£® ®ª
+	mov eax,ted_wnd_l
+	sub ted_wnd_w,eax ;®â¨¬ ¥¬ ®âáâã¯ á«¥¢
+	movzx eax,word[esi+sb_offs_size_x]
+	sub ted_wnd_w,eax ;®â¨¬ ¥¬ è¨à¨ã ¢¥àâ. áªà®««¨£
+	m2m ted_wnd_h,[procinfo.client_box.height] ;áâ ¢¨¬ ¢ëá®âã ®ª  à¥¤ ªâ®à  à ¢®© ¢ëá®â¥ ¢á¥£® ®ª
+	cmp ted_wnd_h,MIN_M_WND_H
+	jg @f
+		mov ted_wnd_h,MIN_M_WND_H
+	@@:
+	movzx eax,word[ebx+sb_offs_size_y]
+	sub ted_wnd_h,eax	      ;®â¨¬ ¥¬ ¢ëá®âã £®à¨§. áªà®««¨£
+	mov eax,ted_wnd_t
+	sub ted_wnd_h,eax	      ;®â¨¬ ¥¬ ®âáâã¯ á¢¥àåã
-	mcall 12,2
+	stdcall [ted_init_scroll_bars], tedit0,2
 	popad
 	ret
 align 4
 mouse:
 	stdcall [tl_mouse],tree1
 	stdcall [edit_box_mouse],edit1
 	stdcall [ted_mouse], tedit0
 	jmp still
 ;output:
 ; ah = symbol
 align 4
 proc KeyConvertToASCII, table:dword
 	push ebx
 	mov ebx,dword[table] ;convert scan to ascii
 	ror ax,8
 	xor ah,ah
 	add bx,ax
 	mov ah,byte[ebx]
 	pop ebx
 	ret
 endp
 align 4
 key:
-	mcall 66,3 ;66.3 ¯®«ãç¨âì á®áâ®ï¨¥ ã¯à ¢«ïîé¨å ª« ¢¨è
+	mcall SF_KEYBOARD,SSF_GET_CONTROL_KEYS ;66.3 ¯®«ãç¨âì á®áâ®ï¨¥ ã¯à ¢«ïîé¨å ª« ¢¨è
 	xor esi,esi
 	mov ecx,1
-	test al,0x03 ;[Shift]
+	test al,3 ;[Shift]
 	jz @f
 		mov cl,2
 		or esi,KM_SHIFT
 	@@:
 	test al,0x0c ;[Ctrl]
 	jz @f
 		or esi,KM_CTRL
 	@@:
 	test al,0x30 ;[Alt]
 	jz @f
 		mov cl,3
 		or esi,KM_ALT
 	@@:
 	test al,0x80 ;[NumLock]
 	jz @f
 		or esi,KM_NUMLOCK
 	@@:
-	mcall 26,2,,conv_tabl ;26.2 ¯®«ãç¨âì à áª« ¤ªã ª« ¢¨ âãàë
+	mcall SF_SYSTEM_GET,SSF_KEYBOARD_LAYOUT,,conv_tabl ;26.2 ¯®«ãç¨âì à áª« ¤ªã ª« ¢¨ âãàë
-	mcall 2
+	mcall SF_GET_KEY
 	stdcall [tl_key],tree1
 	test word [edit1.flags],10b;ed_focus ; ¥á«¨ ¥ ¢ ä®ªãá¥, ¢ëå®¤¨¬
 	je @f
 		cmp ah,0x80 ;if key up
 		ja still
 		cmp ah,42 ;[Shift] (left)
 		je still
 		cmp ah,54 ;[Shift] (right)
 		je still
 		cmp ah,56 ;[Alt]
 		je still
 		cmp ah,29 ;[Ctrl]
 		je still
 		cmp ah,69 ;[Pause Break]
 		je still
-		stdcall KeyConvertToASCII, dword conv_tabl
+		stdcall KeyConvertToASCII, conv_tabl
 		stdcall [edit_box_key],edit1
 		jmp still
 	@@:
 	stdcall [ted_key], tedit0, conv_tabl,esi
 	jmp still
 align 4
 button:
-;  cmp [menu_active],1 ;¥á«¨  ¦ «¨ ¬¥î, â® á ç «  à¥ ªæ¨ï   ¬¥î
-;  jne @f ;mouse.menu_bar_1
-;    mov [menu_active],0
+	mcall SF_GET_BUTTON
-;    jmp still
-;  @@:
-  mcall 17 ;¯®«ãç¨âì ª®¤  ¦ â®© ª®¯ª¨
-  cmp ah,200
+	cmp ah,200
-  jne @f
+	jne @f
-    call but_OpenSyntax
+		call but_OpenSyntax
-  @@:
+	@@:
-  cmp ah,201
+	cmp ah,201
-  jne @f
+	jne @f
-    call but_SaveSyntax
+		call but_SaveSyntax
-  @@:
+	@@:
-  cmp ah,1
+	cmp ah,1
-  jne still
+	jne still
 .exit:
-  ;push eax
-  stdcall mem.Free,[options_file]
+	stdcall mem.Free,[options_file]
+	stdcall mem.Free,[unpac_mem]
-  stdcall [tl_data_clear], tree1
+	stdcall [tl_data_clear], tree1
-  stdcall [ted_delete], tedit0
+	stdcall [ted_delete], tedit0
-  mcall -1 ;¢ëå®¤ ¨§ ¯à®£à ¬¬ë
+	mcall SF_TERMINATE_PROCESS ;¢ëå®¤ ¨§ ¯à®£à ¬¬ë
 align 4
 but_OpenSyntax:
 push eax
 	stdcall [tl_node_get_data],tree1
 	mov [fn_col_option],eax
 	call InitColText
 pop eax
 	ret
 align 4
 but_SaveSyntax:
 	stdcall [ted_save_file], tedit0,run_file_70,[edit1.text]
 	ret
 align 4
 but_ctrl_o:
 	push eax
 	call get_wnd_in_focus
 	cmp eax,0
 	je @f
 		stdcall [ted_open_file], eax,str_file_70,[edit1.text]
 	@@:
 	pop eax
 	ret
 ;á®§¤ ¨¥ ®¢®£® ä ©«
 align 4
 but_ctrl_n:
 	push eax
 	call get_wnd_in_focus
 	cmp eax,0
 	je @f
 		stdcall [ted_clear], eax,1
 		stdcall [ted_draw], eax
 	@@:
 	pop eax
 	ret
 ;®¯à¥¤¥«ï¥¬ ª ª®¥ ¨§ ®ª® à¥¤ ªâ®à  ¢ ä®ªãá¥
 align 4
 get_wnd_in_focus:
 	xor eax,eax
 	cmp dword[el_focus],tedit0
 	jne @f
 		mov eax,tedit0
 	@@:
 	;cmp dword[el_focus],tedit1
 	;jne @f
 	;       mov eax,tedit1
 	;@@:
 	ret
-hed db 'TextEditor syntax file converter 10.11.15',0 ;¯®¤¯¨áì ®ª
+hed db 'TextEditor syntax file converter 15.01.19',0 ;¯®¤¯¨áì ®ª
 conv_tabl rb 128 ; â ¡«¨æ  ¤«ï ª®¢¥àâ¨à®¢ ¨ï scan-ª®¤  ¢ ascii-ª®¤
-txt122 db ' £à. ä ©«',0
+txt_load_f db ' £à. ä ©«',0
-txt148 db '®åà. ä ©«',0
+txt_save_f db '®åà. ä ©«',0
 txt_inp_file db 'áå. ä ©«:',0
 txt_out_file db 'ëå. ä ©«:',0
-txt_no_kpack db 'âªàë¢ ¥¬ë© ä ©« á¦ â Kpack-®¬.',13,10,'«ï à ¡®âë á ä ©«®¬ à á¯ ªã©â¥ ¥£® ¨á¯®«ì§ãï á¨áâ¥¬ãî ¯à®£à ¬¬ã Kpack.',13,10,' ¡®â  á® á¦ âë¬¨ ä ©« ¬¨ ¯®ª  ¥ ¯®¤¤¥à¦¨¢ ¥âáï.',0
 head_f_i:
 head_f_l db 'System error',0
 err_message_found_lib_0 db 'Sorry I cannot found library ',39,'box_lib.obj',39,0
 err_message_import_0 db 'Error on load import library ',39,'box_lib.obj',39,0
 err_message_found_lib_1 db 'Sorry I cannot found library ',39,'libimg.obj',39,0
 err_message_import_1 db 'Error on load import library ',39,'libimg.obj',39,0
 ;library structures
 l_libs_start:
 	lib0 l_libs lib_name_0, sys_path, file_name, system_dir_0, err_message_found_lib_0, head_f_l, import_box_lib,err_message_import_0, head_f_i
 	lib1 l_libs lib_name_1, sys_path, file_name, system_dir_1, err_message_found_lib_1, head_f_l, import_libimg,err_message_import_1, head_f_i
 load_lib_end:
 IncludeIGlobals
 align 16
 i_end:
+IncludeUGlobals
 	procinfo process_information
 		rb 1024
 	thread:
 		rb 1024
 stacktop:
   sys_path:
     rb 4096
   file_name:
     rb 4096
   file_name_rez:
     rb 4096
 mem:

Subversion Repositories Kolibri OS

(root)/programs/other/t_edit_synt/te_syntax.asm @ 7579 – Rev 5911 → 7575