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.12.10',0
+hed db 'kol_f_edit 13.12.10',0
 MAX_OBJ_CAPTIONS equ 1000 ;à §¬¥à ¤®¯®«¨â¥«ìëå ¯®¤¯¨á¥© ¯®¤¯¨á¥©
 WND_CAPT_COLOR equ 0xb0d0ff
 BUF_SIZE equ 1000
 ;modif
-CPP_MOD_ACM equ 2 ;á®¡ëâ¨ï ¬ëè¨
+BIT_MOD_ACI equ 0 ;¯®¤ª«îç¥¨ï ä ©«®¢
-BIT_MOD_ACM equ 1 ;á®¡ëâ¨ï ¬ëè¨
-CPP_MOD_ACI equ 4 ; ¢ª«îç¥¨ï
-BIT_MOD_ACI equ 2 ; ¢ª«îç¥¨ï
-CPP_MOD_ACD equ 8 ;¤ ë¥ ®¡ê¥ªâ®¢
+BIT_MOD_ACM equ 1 ;á®¡ëâ¨ï ®â ¬ëè¨
-BIT_MOD_ACD equ 3 ;¤ ë¥ ®¡ê¥ªâ®¢
-CPP_MOD_ABU equ 16 ;á¢ï§ë¢ ¨¥ ª®¯®ª
+BIT_MOD_ACD equ 2 ;¤ ë¥ ®¡ê¥ªâ®¢
-BIT_MOD_ABU equ 4 ;á¢ï§ë¢ ¨¥ ª®¯®ª
+BIT_MOD_ABU equ 3 ;á¢ï§ë¢ ¨¥ ª®¯®ª
-CPP_MOD_WI_CA equ 16 ; áâ¨«ì ®ª  ¯®¤¯¨áì
+;CPP_MOD_WI_CA equ 16 ; áâ¨«ì ®ª  ¯®¤¯¨áì
-CPP_MOD_WI_AO equ 32 ; áâ¨«ì ®ª  ª®®à¤¨ âë ®â®á¨â¥«ì® ª«¨¥âáª®© ®¡« áâ¨
+;CPP_MOD_WI_AO equ 32 ; áâ¨«ì ®ª  ª®®à¤¨ âë ®â®á¨â¥«ì® ª«¨¥âáª®© ®¡« áâ¨
-CPP_MOD_WI_RD equ 64 ; áâ¨«ì ®ª  ¯¥à¥à¨á®¢ª  ®ª
+;CPP_MOD_WI_RD equ 64 ; áâ¨«ì ®ª  ¯¥à¥à¨á®¢ª  ®ª
-CPP_MOD_WI_GR equ 128 ; áâ¨«ì ®ª  £à ¤¨¥â
+;CPP_MOD_WI_GR equ 128 ; áâ¨«ì ®ª  £à ¤¨¥â
-CPP_MOD_CHE equ 512 ; ch_flag_en - ¢ë¡à  CheckBox
+;CPP_MOD_CHE equ 512 ; ch_flag_en - ¢ë¡à  CheckBox
-CPP_MOD_TXT_ASCII_0 equ 1 ; â¥ªáâ § ª ç¨¢. 0
+BIT_MOD_TXT_ASCII_0 equ 0 ; â¥ªáâ § ª ç¨¢. 0
-CPP_MOD_TXT_TRAN equ 4 ; â¥ªáâ ¯à®§à çë©
+BIT_MOD_TXT_NO_TRAN equ 1 ; â¥ªáâ ¯à®§à çë©
-CPP_MOD_TXT_CHAR2 equ 2 ; â¥ªáâ 2-¬ èà¨äâ®¬
+BIT_MOD_TXT_CHAR2 equ 2 ; â¥ªáâ 2-¬ èà¨äâ®¬
-CPP_MOD_EDIT_FOC equ 1 ; EditBox ¢ ä®ªãá¥
+;CPP_MOD_EDIT_FOC equ 1 ; EditBox ¢ ä®ªãá¥
-CPP_MOD_EDIT_FIO equ 2 ;
+;CPP_MOD_EDIT_FIO equ 2 ;
-CPP_MOD_RE_GR equ 1 ; £à ¤¨¥âë© ¯àï¬®ã£®«ì¨ª
+;CPP_MOD_RE_GR equ 1 ; £à ¤¨¥âë© ¯àï¬®ã£®«ì¨ª
-CPP_MOD_BUT_NFON equ 1 ; áâ¨«ì Button ¥ à¨á®¢ âì ª®¯ªã
+BIT_MOD_BUT_NFON equ 0 ; áâ¨«ì Button ¥ à¨á®¢ âì ª®¯ªã
-CPP_MOD_BUT_NBORD equ 2 ; áâ¨«ì Button ¥ à¨á®¢ âì £à ¨æã
+BIT_MOD_BUT_NBORD equ 1 ; áâ¨«ì Button ¥ à¨á®¢ âì £à ¨æã
 macro load_image_file path,buf,size ;¬ ªà®á ¤«ï § £àã§ª¨ ¨§®¡à ¦¥¨©
 	rezerv	 db ?
 	FileName dd ?
 ends
 struct object
-	c db ? ;0
+	id dd ? ;¨¤¥â¨ä¨ª â®à ®¡ê¥ªâ
-	txt rb MAX_LEN_OBJ_TXT ;1
+	txt rb MAX_LEN_OBJ_TXT ;â¥ªáâ®¢ë¥ á¢®©áâ¢
-	lvl db 0 ;1+mt
+	lvl db 0
-	clo db 0 ;2+mt
+	clo db 0
-	rb 8 ;3+mt ¥ ¨á¯®«ì§ã¥âáï, ®âáâ «®áì ®â Win ¢¥àá¨¨
-	typid dd ? ;3+8+mt
+	typid dd ? ;®¬¥à ®¡ê¥ªâ  ®¯à¥¤¥«ïîé¥£® â¨¯ ¯¥à¥¬¥®©
-	modif dd ? ;7+8+mt
+	modif dd ? ;¡¨â®¢ë¥ á¢®©áâ¢
 ends
 struct ObjOpt
-	db ?
+	dd ?
 	bl_type db ?
 	graph db ?
 	info rb 30
-	caption rb 200
+	caption rb MAX_OPT_CAPTION
 	Col rw MAX_OPT_FIELDS
 	img rw MAX_OPT_FIELDS ;¨¤¥ªáë ª àâ¨®ª (¢ ä ©«¥ 'icon.bmp')
 icon_tl_sys dd 0 ;ãª § â¥¥«ì   ¯ ¬ïâì ¤«ï åà ¥¨ï á¨áâ¥¬ëå ¨ª®®ª
 icon_font_s1 dd 0 ;ãª § â¥«ì   ¢à¥¬¥ãî ¯ ¬ïâì ¤«ï § £àã§ª¨ èà¨äâ
+fn_syntax db 'asm.syn',0 ;¨¬ï § £àã¦ ¥¬®£® ä ©«  á¨â ªá¨á
+;¬ ªà®á ¤«ï ¯à®¢¥àª¨ ¡¨â®¢®£® á¢®©áâ¢
+macro test_bool_prop obj_reg,n_prop
+{
+	bt dword[obj_reg+u_object.modif-u_object],n_prop
 fn_syntax db 'asm.syn',0 ;¨¬ï § £àã¦ ¥¬®£® ä ©«  á¨â ªá¨á
 include 'ced_wnd_m.inc'
 include 'ced_wnd_prop.inc' ;ä ©« á äãªæ¨ï¬¨ ®ª  á¢®©áâ¢ ®¡ê¥ªâ
 	je .open_end ;jmp if not open file
 		mov [err_ini1],0
 		mov eax,obj_opt ;¤®¡ ¢«ï¥¬ ®¡ê¥ªâë
 		@@:
-			mov bl,byte[eax]
+			mov ebx,dword[eax]
-			cmp bl,0
+			cmp ebx,0
 			je @f
 			;xor ecx,ecx ;¢ ecx ¡ã¤¥â ¨¤¥ªá ¨ª®ª¨
 			mov cx,word[eax+obj_opt.img-obj_opt]
 			cmp cx,0
 		mov [err_opn],0
 		stdcall dword[tl_info_clear], tree2
 		mov eax,ced_info ;¤®¡ ¢«ï¥¬ ®¡ê¥ªâë
 		@@:
-			mov bl,byte[eax]
+			mov ebx,dword[eax]
-			cmp bl,0
+			cmp ebx,0
 			je @f
 			call find_obj_in_opt ;edi = pointer to ObjOpt struct
 			mov cx,word[edi+obj_opt.img-obj_opt]
 			cmp cx,0
 			jge .zero
 				xor cx,cx ;çâ®-¡ë ¥ £«îç¨«® á ®âà¨æ â¥«ìë¬ ¨¤¥ªá®¬
 			.zero:
 			shl ecx,16 ;¢ ecx ¨¤¥ªá ¨ª®ª¨
-			mov cl,byte[eax+1+MAX_LEN_OBJ_TXT] ;ãà®¢¥ì ®¡ê¥ªâ
+			mov cl,byte[eax++u_object.lvl-u_object] ;ãà®¢¥ì ®¡ê¥ªâ
 			;tl_node_close_open - ¥ ¯®¤å®¤¨â, â.ª. ¤¥©áâ¢ã¥â   ã§«ë ¨¬¥îé¨¥ ¤®ç¥à¨¥
 		je @f
 		stdcall [tl_node_poi_get_data], edx,tree2
 		pop esi ;¯®«ãç ¥¬ ¤ ë¥ ã§«
 		mov bl,byte[edx+2] ;bl - ãà®¢¥ì ®¡ê¥ªâ
-		mov byte[esi+1+MAX_LEN_OBJ_TXT],bl
+		mov byte[esi+u_object.lvl-u_object],bl
 		mov bl,byte[edx+3] ;bl - ®âªàëâ¨¥/§ ªàëâ¨¥ ®¡ê¥ªâ
-		mov byte[esi+2+MAX_LEN_OBJ_TXT],bl
+		mov byte[esi+u_object.clo-u_object],bl
 		;¢ëç¨á«ï¥¬ ®¢ë© ¨¤¥ªá ¤«ï â¨¯  ®¡ê¥ªâ
-		mov ebx,[esi+3+8+MAX_LEN_OBJ_TXT] ;ebx - â¨¯ ®¡ê¥ªâ
+		mov ebx,[esi+u_object.typid-u_object] ;ebx - â¨¯ ®¡ê¥ªâ
 		;á®åà ï¥¬ â¨¯ ®¡ê¥ªâ
 		push ebx
 			imul ebx,sizeof.TreeList
 			add ebx,[tree2.data_nodes] ;ebx - ãª § â¥«ì ®¡ê¥ªâ ãª §ë¢ îé¨© â¨¯
 			stdcall get_obj_npp,ebx
-			mov [esi+3+8+MAX_LEN_OBJ_TXT],eax
-			mov eax,esi
+			mov [esi+u_object.typid-u_object],eax
 			mov eax,esi
 			;ª®¯¨àã¥¬ ®¡ê¥ªâ ¢ ¯ ¬ïâì ¤«ï á®åà ¥¨ï
 			xor ecx,ecx
 			mov cx,word[tree2.info_size]
 			cld
 			rep movsb
 		;¢®ááâ  ¢«¨¢ ¥¬ â¨¯ ®¡ê¥ªâ
-		pop dword[eax+3+8+MAX_LEN_OBJ_TXT]
+		pop dword[eax+u_object.typid-u_object]
 		stdcall [tl_node_poi_get_next_info], edx,tree2
 		pop edx ;¯¥à¥å®¤¨¬ ª á«¥¤ãé¥¬ã ã§«ã
 		jmp @b
 	@@:
-	mov byte[edi],0
+	mov dword[edi],0 ;¬¥âª  ª®æ  ä ©«
-	inc edi
+	add edi,4
 	mov ecx,edi
 			popad
 	@@:
 	;call draw_window
 	ret
-align 4
-proc set_obj_win_param, col:dword, edit:dword
-	pushad
-		stdcall get_obj_text_col, [foc_obj], [col] ;edx - text
-		stdcall get_obj_text_len_col, [foc_obj], [col] ;eax - ¤«¨  ¯®«ï
-		mov edi,[edit]
-		cmp eax,1
-		jl @f
-			dec eax
-			mov ed_max,eax ;ed_max = edi+.max
-			mov ed_focus_border_color, dword 0xff
-			mov ed_blur_border_color, dword 0x808080
-			stdcall [edit_box_set_text], edi,edx ;®¡®¢«ï¥¬ editbox
-			jmp .end_f
-		@@:
-			mov ed_max,dword MAX_LEN_OBJ_TXT
-			mov ed_focus_border_color, dword 0xffffff ;¤¥« ¥¬ ¥¢¨¤¨¬ãî  ªâ¨¢ãî à ¬ªã
-			mov ed_blur_border_color, dword 0xffffff ;¤¥« ¥¬ ¥¢¨¤¨¬ãî ä®®¢ãî à ¬ªã
-			stdcall [edit_box_set_text], edi,txt_null
-		.end_f:
-	popad
-	ret
-endp
 ;äãªæ¨ï ¢ë§ë¢ ¥¬ ï ¯à¨  ¦ â¨¨ Enter ¢ ®ª¥ tree1
 ;¤®¡ ¢«ï¥â ®¢ë© ®¡ê¥ªâ ¢ ®ª® tree2
 align 4
 on_add_object:
 	je @f
 		xor ecx,ecx
 		mov cx,word[eax+obj_opt.img-obj_opt] ;cx - ¨¤¥ªá £« ¢®© ¨ª®ª¨ ¤®¡ ¢«ï¥¬®£® ®¡ê¥ªâ
 		shl ecx,16
 		stdcall mem_clear, u_object,sizeof.object
-		mov bl,byte[eax]
+		mov ebx,dword[eax]
-		mov byte[u_object.c],bl
+		mov dword[u_object.id],ebx
 		stdcall dword[tl_node_add], u_object, ecx, tree2 ;¤®¡ ¢«ï¥¬ ®¡ê¥ªâ
 	@@:
 pop ecx ebx eax
 	call draw_window
 	ret
 mouse_dd dd ?
 el_focus dd tree1
 ;¤¥à¥¢® á® á¯¨áª®¬ ¢®§¬®¦ëå â¨¯®¢ ®¡ê¥ªâ®¢
 tree1 tree_list sizeof.ObjOpt,20+2, tl_key_no_edit+tl_draw_par_line+tl_list_box_mode,\
-,16, 0xffffff,0xb0d0ff,0xd000ff, 5,50,125,280, 0,3,0, el_focus,\
+,16, 0xffffff,0xb0d0ff,0xd000ff, 5,50,125,280, 0,obj_opt.info-obj_opt,0, el_focus,\
 	w_scr_t1,on_add_object
 ;¤¥à¥¢® á ®¡ê¥ªâ ¬¨ ¢ ¯®«ì§®¢ â¥«ìáª®¬ ä ©«¥
 tree2 tree_list sizeof.object,MAX_CED_OBJECTS+2, tl_draw_par_line,\
-,16, 0xffffff,0xb0d0ff,0xd000ff, 155,50,130,280, 13,1,MAX_LEN_OBJ_TXT, el_focus,\
+,16, 0xffffff,0xb0d0ff,0xd000ff, 155,50,130,280, 13,u_object.txt-u_object,MAX_LEN_OBJ_TXT, el_focus,\
 	w_scr_t2,on_file_object_select
 msgbox_0:
 	db 0 ;eof options
 cur_x dd 0
 cur_y dd 0
+foc_obj dd 0 ;®¡ê¥ªâ ¢ ä®ªãá¥
-foc_obj dd 0 ;®¡ê¥ªâ ¢ ä®ªãá¥
+obj_count_txt_props dd 0 ;ª®«¨ç¥áâ¢® ¨á¯®«ì§ã¥¬ëå â¥ªáâ®¢ëå á¢®©áâ¢
 obj_m_win dd 0 ;áâàãªâãà  £« ¢®£® ®ª

Subversion Repositories Kolibri OS

(root)/programs/develop/kol_f_edit/kol_f_edit.asm – Rev 1715 → 1717