WebSVN – Kolibri OS – Diff – /programs/develop/kol_f_edit/kol_f_edit.asm

 include 'strlen.inc'
 include 'obj_codes.inc'
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc, dll.Load
-hed db 'kol_f_edit 10.03.11',0
+hed db 'kol_f_edit 11.04.13',0
 ;CPP_MOD_RE_GR equ 1 ;£à ¤¨¥âë© ¯àï¬®ã£®«ì¨ª
 BIT_MOD_BUT_NFON equ 0 ;áâ¨«ì Button ¥ à¨á®¢ âì ª®¯ªã
 BIT_MOD_BUT_NBORD equ 1 ;áâ¨«ì Button ¥ à¨á®¢ âì £à ¨æã
 BIT_MOD_IMPORT_FUNCT_COMMENT equ 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 - áâ ¤ àâë©  ¤à¥á ¯® ª®â®à®¬ã ¤®«¦¥ ¡ëâì ¡ãä¥à á á¨áâ¥¬ë¬ ¯ãâ¥¬
-macro load_image_file path,buf,size ;¬ ªà®á ¤«ï § £àã§ª¨ ¨§®¡à ¦¥¨©
+		copy_path .path_str,[32],file_name,0x0
-{
+	else
+		copy_path path,[32],file_name,0x0 ;ä®à¬¨àã¥¬ ¯®«ë© ¯ãâì ª ä ©«ã ¨§®¡à ¦¥¨ï, ¯®¤à §ã¬¥¢ ¥¬ çâ® ® ¢ ®¤®© ¯ ¯ª¥ á ¯à®£à ¬¬®©
-	copy_path path,sys_path,fp_icon,0x0 ;ä®à¬¨àã¥¬ ¯®«ë© ¯ãâì ª ä ©«ã ¨§®¡à ¦¥¨ï, ¯®¤à §ã¬¥¢ ¥¬ çâ® ® ¢ ®¤®© ¯ ¯ª¥ á ¯à®£à ¬¬®©
+	end if
 	stdcall mem.Alloc, dword size ;¢ë¤¥«ï¥¬ ¯ ¬ïâì ¤«ï ¨§®¡à ¦¥¨ï
 	mov [run_file_70.Position], 0
 	mov [run_file_70.Flags], 0
 	mov [run_file_70.Count], dword size
 	m2m [run_file_70.Buffer], [buf]
 	mov byte[run_file_70+20], 0
-	mov [run_file_70.FileName], fp_icon
+	mov [run_file_70.FileName], file_name
 	mov ebx,run_file_70
 	int 0x40 ;§ £àã¦ ¥¬ ä ©« ¨§®¡à ¦¥¨ï
 	cmp ebx,0xffffffff
 	je @f
 		;®¯à¥¤¥«ï¥¬ ¢¨¤ ¨§®¡à ¦¥¨ï ¨ ¯¥à¥¢®¤¨¬ ¥£® ¢® ¢à¥¬¥ë© ¡ãä¥à image_data
 fn_skin_3 db 'oper.bmp',0
 IMAGE_FILE_SKIN1_SIZE equ 3*(SKIN_W1+3)*SKIN_H+54
 IMAGE_FILE_SKIN2_SIZE equ 3*(SKIN_W2+3)*SKIN_H+54
 IMAGE_FILE_SKIN3_SIZE equ 3*(SKIN_W3+3)*SKIN_H+54
 fn_font_s1 db 'font6x9.bmp',0
 IMAGE_FILE_FONT1_SIZE equ 96*144*3 ;à §¬¥à ä ©«  á 1-¬ á¨áâ¥¬ë¬ èà¨äâ®¬
 fn_icon db 'icon.bmp',0
-count_main_icons equ 35 ;ç¨á«® ¨ª®®ª ¢ ä ©«¥ icon.bmp
-bmp_icon rb 0x300*count_main_icons
+count_main_icons equ 35 ;ç¨á«® ¨ª®®ª ¢ ä ©«¥ icon.bmp
 bmp_icon rb 0x300*count_main_icons
 fn_icon_tl_sys db 'tl_sys_16.png',0
 TREE_ICON_SYS16_BMP_SIZE equ 256*3*11+54 ;à §¬¥à bmp ä ©«  á á¨áâ¥¬ë¬¨ ¨ª®ª ¬¨
 	mcall 40,0x27
 	stdcall dword[tl_data_init], tree1
 	stdcall dword[tl_data_init], tree2
-	copy_path fn_icon,sys_path,fp_icon,0x0 ;ä®à¬¨àã¥¬ ¯®«ë© ¯ãâì ª ä ©«ã ¨§®¡à ¦¥¨ï, ¯®¤à §ã¬¥¢ ¥¬ çâ® ® ¢ ®¤®© ¯ ¯ª¥ á ¯à®£à ¬¬®©
+	copy_path fn_icon,sys_path,file_name,0x0 ;ä®à¬¨àã¥¬ ¯®«ë© ¯ãâì ª ä ©«ã ¨§®¡à ¦¥¨ï, ¯®¤à §ã¬¥¢ ¥¬ çâ® ® ¢ ®¤®© ¯ ¯ª¥ á ¯à®£à ¬¬®©
 	mov eax,70 ;load icon file
 	mov [run_file_70.Function], 0
 	mov [run_file_70.Position], 54
 	mov [run_file_70.Flags], 0
 	mov [run_file_70.Count], 0x300*count_main_icons
 	mov [run_file_70.Buffer], bmp_icon
 	mov [run_file_70.rezerv], 0
-	mov [run_file_70.FileName], fp_icon
+	mov [run_file_70.FileName], file_name
 	mov ebx,run_file_70
 	int 0x40
 		mov dword[tree1.data_img],bmp_icon
 		mov dword[tree2.data_img],bmp_icon
 	@@:
 	;á¨áâ¥¬ë¥ ¨ª®ª¨ 16*16 ¤«ï tree_list
-	load_image_file fn_icon_tl_sys, icon_tl_sys,TREE_ICON_SYS16_BMP_SIZE
+	load_image_file 'tl_sys_16.png', icon_tl_sys,TREE_ICON_SYS16_BMP_SIZE
 	;¥á«¨ ¨§®¡à ¦¥¨¥ ¥ ®âªàë«®áì, â® ¢ icon_tl_sys ¡ã¤ãâ
 	;¥ ¨¨æ¨ «¨§¨à®¢ ë¥ ¤ ë¥, ® ®è¨¡ª¨ ¥ ¡ã¤¥â, â. ª. ¡ãä¥à ã¦®£® à §¬¥à
 	mov eax,dword[icon_tl_sys]
 	mov dword[tree1.data_img_sys],eax
 	load_image_file fn_skin_3, icon_font_s1,IMAGE_FILE_SKIN3_SIZE
 	stdcall [buf2d_create_f_img], buf_skin3,[icon_font_s1] ;á®§¤ ¥¬ ¡ãä¥à
 	stdcall mem.Free,[icon_font_s1] ;®á¢®¡®¦¤ ¥¬ ¯ ¬ïâì
 	;á¨¬¢®«ë 1-£® á¨áâ¥¬®£® èà¨äâ
-	load_image_file fn_font_s1, icon_font_s1,IMAGE_FILE_FONT1_SIZE
+	load_image_file 'font6x9.bmp', icon_font_s1,IMAGE_FILE_FONT1_SIZE
 	stdcall [buf2d_create_f_img], buf_font,[icon_font_s1] ;á®§¤ ¥¬ ¡ãä¥à
 	stdcall mem.Free,[icon_font_s1] ;®á¢®¡®¦¤ ¥¬ ¯ ¬ïâì
 	stdcall [buf2d_conv_24_to_8], buf_font,1 ;¤¥« ¥¬ ¡ãä¥à ¯à®§à ç®áâ¨ 8 ¡¨â
 		stdcall dword[tl_cur_beg], tree1 ;¯¥à¥®á¨¬ ªãàá®à ¢¢¥àå
 	.open_end:
+	stdcall [ted_init], tedit0
+	copy_path fn_syntax,sys_path,file_name,0x0
+	; *** init syntax file ***
+	; ¯à®¢¥àï¥¬ à §¬¥à ä ©«  á¨â ªá¨á
+	mov eax,70
+	mov [run_file_70.Function], 5
+	mov [run_file_70.Position], 0
+	mov [run_file_70.Flags], 0
+	mov dword[run_file_70.Count], 0
-	stdcall [ted_init], tedit0
+	mov dword[run_file_70.Buffer], open_b
+	mov byte[run_file_70+20], 0
+	mov dword[run_file_70.FileName], file_name
+	mov ebx,run_file_70
+	int 0x40
+	cmp eax,0
-	copy_path fn_syntax,sys_path,fp_icon,0x0
+	jne @f
+	mov edi,tedit0
+	mov ecx,dword[open_b+32] ;+32 qword: à §¬¥à ä ©«  ¢ ¡ ©â å
+	mov ted_syntax_file_size,ecx
+	stdcall mem.Alloc,ecx ;¢ë¤¥«ï¥¬ ¯ ¬ïâì ¤«ï ä ©«  á¨â ªá¨á
+	mov ted_syntax_file,eax
+	;¯à®¡ã¥¬ ®âªàëâì ä ©« á¨â ªá¨á
+	mov ebx,run_file_70
+	mov dword[ebx], 0
+	mov dword[ebx+4], 0
+	mov dword[ebx+8], 0
+	mov dword[ebx+12], ecx
+	mov dword[ebx+16], eax ;ted_syntax_file
+	mov  byte[ebx+20], 0
+	m2m dword[ebx+21], file_name
+	mcall 70
-	stdcall [ted_init_syntax_file], tedit0,run_file_70,fp_icon
+	cmp eax,0
+	jne @f
+		stdcall [ted_init_syntax_file],edi
+		jmp .end_0
+	@@:
-	;mov edi,tedit0
+		notify_window_run txt_not_syntax_file
-    ;call [ted_text_colored]
+	.end_0:
 	;get cmd line
 cur_y dd 0
 foc_obj dd 0 ;®¡ê¥ªâ ¢ ä®ªãá¥
 obj_count_txt_props dd 0 ;ª®«¨ç¥áâ¢® ¨á¯®«ì§ã¥¬ëå â¥ªáâ®¢ëå á¢®©áâ¢
 obj_m_win dd 0 ;áâàãªâãà  £« ¢®£® ®ª
+txt_not_syntax_file db '¥  ©¤¥ ä ©« ¤«ï ¯®¤á¢¥âª¨ á¨â ªá¨á .',0
+;
 if 1 ;lang eq ru
 align 16
+procinfo process_information
-procinfo process_information
+run_file_70 FileInfoBlock
-run_file_70 FileInfoBlock
+open_b rb 560
 i_end:
 	buf_cmd_lin rb 1024
-	fp_icon rb 1024 ;icon file path
+	file_name rb 1024 ;icon file path
 	fp_obj_opt rb 1024 ;obj options file patch
 	rb 1024

Subversion Repositories Kolibri OS

(root)/programs/develop/kol_f_edit/kol_f_edit.asm – Rev 3014 → 3465