WebSVN – Kolibri OS – Diff – /programs/system/icon_new/@icon.asm

-;¨®£¤  ¥¢¥à® ®¯à¥¤¥«ï¥âáï è¨à¨  ¬¥îèª¨
-ICONS_DAT	equ '/rd/1/icons.dat'
 ICON_STRIP	equ '/rd/1/iconstrp.png'
-ICON_SIZE	equ 68
+ICON_INI	equ '/rd/1/settings/icon.ini'
+ICON_SIZE	equ 68	  ;à §¬¥à ®¡« áâ¨ ¤«ï ¨ª®ª¨ á  ¤¯¨áìî
-IMG_SIZE	equ 32
+IMG_SIZE	equ 32	  ;à §¬¥à ¨ª®®ª
-TEXT_BOTTOM_Y	equ 14
+TEXT_BOTTOM_Y	equ 14	  ;®âáâã¯ ¯® Y â¥ªáâ  ®â ¨§  ¨ª®ª¨
-IMAGE_TOP_Y	equ 10	  ;>=1
+IMAGE_TOP_Y	equ 10	  ;>=1 ®®à¤¨ â  Y ¨ª®ª¨ ¢ ®¡« áâ¨ ¤«ï ¤ ®© ¨ª®ª¨
-ALIGN_SIZE	equ 68
+ALIGN_SIZE	equ 68	  ;à §¬¥à á¥âª¨ ¢ëà ¢¨¢ ¨ï
-NAME_LENGTH	equ 11
+NAME_LENGTH	equ 11	 ;¤«¨  ¨¬¥¨ ¨ª®ª¨
-MIN_NO_MOVING	equ 8
+MIN_NO_MOVING	equ 8	 ;ç¥à¥§ áâ®«ìª® ¯¨ªá¥«¥© á¤¢¨£  ¬ëè¨  ç¨ ¥âáï â áª ¨¥ ¨ª®ª¨
-			   ;¤«ï ¤¨ «®£  á®§¤ ¨ï/à¥¤ ªâ¨à®¢ ¨ï
+		     ;--------¤«ï ¤¨ «®£  á®§¤ ¨ï/à¥¤ ªâ¨à®¢ ¨ï
 ICONSX		equ 20
 ICONSY		equ 80
 ICONS_DRAW_COUNTW equ 10  ;ª®«¨ç¥áâ¢® ¨ª®®ª ¢ è¨à¨ã
 ICONS_DRAW_COUNTH equ 2   ;ª®«¨ç¥áâ¢® ¨ª®®ª ¢ ¢ëá®âã
 SPCW		equ 3	  ;¯à®¡¥« ¬¥¦¤ã ¨ª®ª ¬¨ ¯® £®à¨§®â «¨
 include '../../macros.inc'
 include '../../proc32.inc'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../dll.inc'
 ;include '../../debug.inc'
 ;------------------------------------------------------------------------------
 START:		; start of execution
 	mcall	68,11
 	stdcall dll.Load,IMPORTS
 	test	eax,eax
 	and	eax,0x7
 	mov	[cur_band_compensation],eax
 ;########## § £àã¦ ¥¬ ¤ ë¥ ¨ª®®ª ¢ ¯ ¬ïâì ##########################
-	mcall	70,fiIni		     ;¢ë¤¥«ï¥¬ ¯ ¬ïâì, ¤®áâ â®ç®© ¤«ï åà ¥¨ï ini ä ©« . ñ â®ç® å¢ â¨â ¤«ï åà ¥¨ï ¤ ëå ®¡ ¨ª®ª å
+	mcall	70,fiIni		     ;¢ë¤¥«ï¥¬ ¯ ¬ïâì, ¤®áâ â®ç®© ¤«ï åà ¥¨ï ini ä ©« .
-	test	eax,eax
+	test	eax,eax 		;ñ â®ç® å¢ â¨â ¤«ï åà ¥¨ï ¤ ëå ®¡ ¨ª®ª å
 	jnz	ErrorIni
 	mcall	-1
   NoErrIni:
+	m2m	[PIcoDB],[BegData]
+	mov	edi,IconsID
+	xor	eax,eax
+	mov	ecx,100h/4
-	m2m	[PIcoDB],[BegData]
+	rep stosd
 	mov	[nLoadIcon],0
 	stdcall [ini_enum_sections],IconIni,LoadIconsData
 ;int3
 	mov	eax,dword[PIcoDB]
 	jne	@f
 	mov	dword[eax],0
 	mov	dword[SizeData],0
    @@:
 ;######################################################################
 	call	FillIconsOffs		       ;§ ¯®«ï¥â MaxNumIcon,IconsOffs
 	mcall	40,0100000b		       ;ã¦ë â®«ìª® á®¡ëâ¨ï ¬ëè¨, ¯¥à¥à¨á®¢ª  ¨ª®®ª ¡ã¤¥â ¢ ¤àã£®¬ ¯®â®ª¥
 	mov	[sbIcons.max_area],eax
 	mcall	51,1,BGRedrawThread,stack_bredraw	;§ ¯ãáª ¥¬ ¯®â®ª ¯¥à¥à¨á®¢ª¨ ¨ª®®ª
+	stdcall [OpenDialog_Init],OpenDialog_data
-	stdcall [OpenDialog_Init],OpenDialog_data
+;dph [MaxNumIcon]
 messages:
 	mcall	10
 	;debug_newline
 close:
 	mcall	-1
+LButtonPress:
 LButtonPress:
 	stdcall GetNumIcon,[MouseX],[MouseY],-1
 ;int3
 	cmp	eax,-1
 	sub	bx,[wsY]
     .mov2:
-	stdcall SetPosition,[SelIcon],eax,ebx
 	stdcall SetPosition,[SelIcon],eax,ebx
 	m2m	[PIcoDB],[BegData]
 	stdcall [ini_enum_sections],IconIni,Ini_SavePos  ;in RButton.inc
 	jmp	messages
 ;-------------------------------------------------------------------------------
-RButtonPress:
 	cmp	[RButtonActiv],1
-	je	messages
+RButtonPress:
 	mov	[RButtonActiv],1
 ;        mov     eax,1
 	pop	esi edi ebx
 	ret
 endp
 proc RestoreBackgrnd,NumIcon:DWORD
 	push	ebx edi
 	mov	eax,[NumIcon]
 	cmp	eax,[MaxNumIcon]
 	mcall	15,9
 	pop	edi ebx
 	ret
 endp
-;ret eax=numIcon
-proc AddIcon stdcall,x,y,lpIcon,lpName,lpExeFile,lpParams
-	push	ebx edi esi
-	mov	eax,[x]
-	mov	ebx,[y]
-	xor	edx,edx
-	test	eax,8000h
-	jnz	@f
-	mov	dx,[wsW]    ;¥á«¨  ¤®, â® ¯à¥®¡à §®¢ë¢ ¥¬ ¢
-	shr	edx,1		;®âà¨æ â¥«ìë¥ ª®®à¤¨ âë
-	add	dx,[wsX]
-	cmp	eax,edx
-	jbe	@f
-	sub	ax,[wsW]
-	inc	eax
-      @@:
-	test	ebx,8000h
-	jnz	@f
-	mov	dx,[wsY]
-	shr	edx,1
-	add	dx,[wsH]
-	cmp	ebx,edx
-	jbe	@f
-	sub	bx,[wsH]
-	inc	ebx
-      @@:
-				;¯®¯à ¢ª    á«ãç © ¢ëå®¤  §  ªà © íªà
-	test	eax,8000h
-	jnz	@f
-	mov	dx,[wsXe]
-	sub	edx,ICON_SIZE
-	cmp	eax,edx
-	jbe	@f
-	mov	eax,edx
-     @@:
-	test	ebx,8000h
-	jnz	@f
-	mov	dx,[wsYe]
-	sub	edx,ICON_SIZE
-	cmp	ebx,edx
-	jbe	@f
-	mov	ebx,edx
-     @@:
-	mov	[x],eax
-	mov	[y],ebx
-	xor	al,al
-	or	ecx,-1
-	mov	edi,[lpName]
-	repne	scasb
-	sub	edi,[lpName]
-	mov	ebx,edi
-	mov	edi,[lpExeFile]
-	repne	scasb
-	sub	edi,[lpExeFile]
-	add	ebx,edi
-	mov	edi,[lpParams]
-	repne	scasb
-	sub	edi,[lpParams]
-	add	ebx,edi
-	mov	edi,[lpIcon]
-	repne	scasb
-	sub	edi,[lpIcon]
-	add	ebx,edi
-	add	ebx,4
-	mov	ecx,dword[SizeData]
-	add	ecx,ebx
-	mov	edx,[IconsOffs]
-	mcall	68,20
-	mov	edx,dword[SizeData]
-	mov	dword[SizeData],ecx
-	mov	dword[BegData],eax
-	mov	edi,eax
-	add	edi,edx
-	mov	esi,[lpName]
-    @@: lodsb
-	stosb
-	test	al,al
-	jnz	@b
-	mov	esi,[lpExeFile]
-    @@: lodsb
-	stosb
-	test	al,al
-	jnz	@b
-	mov	esi,[lpParams]
-    @@: lodsb
-	stosb
-	test	al,al
-	jnz	@b
-	mov	esi,[lpIcon]
-    @@: lodsb
-	stosb
-	test	al,al
-	jnz	@b
-	mov	eax,[x]
-	mov	ebx,[y]
-	shl	eax,16
-	mov	ax,bx
-	mov	dword[edi],eax
-	stdcall FillIconsOffs
-	pop	esi edi ebx
-	ret
-endp
-proc EditIcon stdcall,NumIcon,lpIcon,lpName,lpExeFile,lpParams
-	push	edi
-	mov	eax,[NumIcon]
-	mov	edi,[IconsOffs+eax*4]
-	xor	al,al
-	or	ecx,-1
-	repne	scasb
-	repne	scasb
-	repne	scasb
-	repne	scasb
-	push	dword[edi]
-	stdcall DelIcon,[NumIcon]
-	pop	edx
-	xor	eax,eax
-	mov	ax,dx
-	shr	edx,16
-	stdcall AddIcon,edx,eax,DAreaIcon,DAreaName,DAreaPath,DAreaParams
-	pop	edi
-	ret
-endp
-proc SetPosition stdcall,NumIcon,x,y
-	push	edi
-	mov	eax,[NumIcon]
-	mov	edi,[IconsOffs+eax*4]
-	xor	al,al
-	or	ecx,-1
-	repne	scasb
-	repne	scasb
-	repne	scasb
-	repne	scasb
-	mov	eax,[x]
-	shl	eax,16
-	mov	ax,word[y]
-	mov	dword[edi],eax
-	pop	edi
-	ret
-endp
-proc GetNumIcon stdcall,x,y,NumIconI  ;®¬¥à ¨ª®ª¨, ª®â®àë© ¯à®¢¥àïâì ¥  ¤® ¨«¨ -1
-local posX:WORD,\
-      posY:WORD
-	push	ebx edi
-	mov	ecx,[MaxNumIcon]
-	test	ecx,ecx
-	jnz	@f
-	or	eax,-1
-	pop	edi ebx
-	ret
-     @@:
-	mov	ebx,ecx
-	dec	ebx
-   .TestIcon:
-	cmp	dword[NumIconI],-1
-	je	@f
-	cmp	ebx,[NumIconI]
-	jne	@f
-	dec	ebx
-	dec	ecx
-	test	ecx,ecx
-	jz	.NoIcon
-     @@:
-	push	ecx
-	or	ecx,-1
-	xor	al,al
-	mov	edi,[IconsOffs+ebx*4]
-	repne	scasb
-	repne	scasb
-	repne	scasb
-	repne	scasb
-	mov	ax,[edi+2]
-	test	ax,8000h
-	jz	@f
-	add	ax,[wsXe]
-	jmp	.gni1
-      @@:
-	add	ax,[wsX]
-     .gni1:
-	mov	[posX],ax
-	mov	ax,[edi]
-	test	ax,8000h
-	jz	@f
-	add	ax,[wsYe]
-	jmp	.gni2
-      @@:
-	add	ax,[wsY]
-     .gni2:
-	mov	[posY],ax
-	mov	eax,[x]
-	mov	edx,[y]
-	cmp	ax,[posX]
-	jb	@f
-	add	word[posX],ICON_SIZE
-	cmp	ax,[posX]
-	ja	@f
-	cmp	dx,[posY]
-	jb	@f
-	add	word[posY],ICON_SIZE
-	cmp	dx,[posY]
-	ja	@f
-	jmp	.OkIcon
-     @@:
-	dec	ebx
-	pop	ecx
-	;loop    .TestIcon
-	dec	ecx
-	jnz	.TestIcon
-	jmp	.NoIcon
-   .OkIcon:
-	mov	eax,ebx
-	pop	edi ebx
-	ret
-   .NoIcon:
-	or	eax,-1
-	pop	edi ebx
-	ret
-endp
-proc DelIcon stdcall,NumIcon
-	push	ebx edi esi
-	cmp	[MaxNumIcon],0
-	je	.end
-	cmp	[MaxNumIcon],1
-	je	.OhneIco
-	mov	ebx,[NumIcon]
-	mov	eax,[MaxNumIcon]
-	dec	eax
-	mov	[MaxNumIcon],eax
-	cmp	ebx,eax
-	je	@f
-	shl	ebx,2
-	mov	ecx,dword[BegData]
-	add	ecx,dword[SizeData]
-	sub	ecx,[IconsOffs+4+ebx]
-	mov	edx,[IconsOffs+4+ebx]
-	sub	edx,[IconsOffs+ebx]
-	sub	dword[SizeData],edx
-	mov	esi,[IconsOffs+4+ebx]
-	mov	edi,[IconsOffs+ebx]
-	rep	movsb
-	jmp	.endDel
-     @@:
-	mov	ecx,dword[BegData]
-	add	ecx,dword[SizeData]
-	sub	ecx,[IconsOffs+ebx*4]
-	sub	dword[SizeData],ecx
-  .endDel:
-	stdcall FillIconsOffs
-	jmp	.end
-.OhneIco:
-	mov	edi,[BegData]
-	mov	[SizeData],0
-	mov	dword[edi],0
-	mov	[MaxNumIcon],0
-	mov	dword[IconsOffs],0
-   .end:
-	mcall	15,3
-	pop	esi edi ebx
-	ret
 endp
 				 ;§ ¯®«ï¥â MaxNumIcon,IconsOffs
 proc FillIconsOffs
 	push	ebx edi
 	mov	edi,[BegData]
 	xor	edx,edx
 	mov	ebx,dword[SizeData]
 	add	ebx,dword[BegData]
 	or	ecx,-1
  .CalcNumIc:
 	repne	scasb
 	repne	scasb
 	repne	scasb
 	repne	scasb
 	add	edi,4
 	jae	@f
 	jmp	.CalcNumIc
    @@:
+	mov	dword[IconsOffs+edx],0
 	mov	dword[IconsOffs+edx],0
 	pop	edi ebx
 	ret
 endp
 	mov	eax,1
 	pop	edi esi ebx
 	ret
      .lid1:
+	mov	ebx,[sec_name]		;ª®¯¨àã¥¬ ID
+	mov	ax,[ebx]
+	mov	edi,[nLoadIcon]
+	mov	word[edi*4+IconsID],ax
+	mov	word[edi*4+IconsID+2],0
+	mov	edi,[PIcoDB]
+	stdcall [ini_get_str],[f_name],[sec_name],keyName,edi,4096,0
+	test	eax,eax
-	mov	edi,[PIcoDB]
+	jz	@f
-	mov	esi,[sec_name]
+	xor	eax,eax
-    @@: lodsb
+	pop	edi esi ebx
+	ret
-	stosb
+     @@:
+	xor	al,al
-	test	al,al
+	or	ecx,-1
+	repne	scasb
 	jnz	@b
 	stdcall [ini_get_str],[f_name],[sec_name],keyPath,edi,4096,0
 	test	eax,eax
      @@:
 	mov	word[edi],ax
 	add	edi,4
 	mov	[PIcoDB],edi
+	inc	[nLoadIcon]
 	mov	eax,1
 	pop	edi esi ebx
 	ret
+endp
+proc GenerateID ;ax = ID
+	push	ebx edi
+	mov	ebx,[MaxNumIcon]
+	test	ebx,ebx
+	jnz	@f
+	mov	eax,'00'
+	pop	edi ebx
+	ret
+     @@:
+	mov	eax,dword[IconsID+ebx*4-4]
+  .inc:
+	inc	ah
+	cmp	ah,'9'+1
+	jne	@f
+	mov	ah,'A'
+       @@:
+	cmp	ah,'F'+1
+	jne	@f
+	mov	ah,'0'
+	inc	al
+       @@:
+	cmp	al,'9'+1
+	jne	@f
+	mov	al,'A'
+       @@:
+	cmp	al,'F'+1
+	jne	@f
+	mov	al,'0'
+       @@:
+	mov	edi,IconsID
+	;cmp     dword[edi],0
+	;je      @f
+	mov	ecx,100h
+    @@: scasd
+	je	.inc
+	cmp	dword[edi],0
+	je	@f
+	loop	@b
+     @@:
+	pop	edi ebx
+	ret
+endp
 endp
 include 'iconman.inc'
 include 'bgredraw.inc'
 include 'RButton.inc'
 fiIni	dd 5	       ;¤«ï ini ä ©«
 	dd 0
 	dd 0
 	dd 0
 	dd bufIni
+	db 0
-	db '/rd/1/settings/icon.ini',0
+	dd IconIni
 IconsFile	db ICON_STRIP,0
 NameIconsDat	db ICONS_DAT,0
 align 4
-MaxNumIcon	dd 0	       ;ª®«¨ç¥áâ¢® ¨ª®®ª
+MaxNumIcon	dd 0		;ª®«¨ç¥áâ¢® ¨ª®®ª
-IconNoDraw	dd -1		;-1 «¨¡® ®¬¥à ¨ª®ª¨, ª®â®àãî ¥  ¤® à¨á®¢ âì( ª®£¤  ¥ñ â áª îâ :))
+IconNoDraw	dd -1		;-1 «¨¡® ®¬¥à ¨ª®ª¨, ª®â®àãî ¥  ¤® à¨á®¢ âì( ª®£¤  ¥ñ â áª îâ )
 bFixIcons	dd 1
 bNotSave	dd 0
 LButtonActiv	dd 0
 RButtonActiv	dd 0
 MovingActiv	dd 0
 DlgAddActiv	dd 0
-IconIni 	db '/rd/1/settings/icon.ini',0
+IconIni 	db ICON_INI,0
 pthNotify	db '/rd/1/@notify',0
-	ini_get_str,'ini_get_str',\
+	ini_get_str		,'ini_get_str',\
-	ini_set_str,'ini_set_str',\
+	ini_set_str		,'ini_set_str',\
-	ini_get_color,'ini_get_color',\
+	ini_get_color		,'ini_get_color',\
-	ini_get_int,'ini_get_int',\
+	ini_get_int		,'ini_get_int',\
-	ini_set_int,'ini_set_int',\
+	ini_set_int		,'ini_set_int',\
-	ini_del_section,'ini_del_section'
+	ini_del_section 	,'ini_del_section',\
+	ini_exist_sect		,'ini_exist_sect'
 ;ini.get_str (f_name, sec_name, key_name, buffer, buf_len, def_val)
 ;ini.set_str (f_name, sec_name, key_name, buffer, buf_len)
+;-------------------------------------------------------------------------------
+;----- RButton.inc -------------------------------------------------------------
+;-------------------------------------------------------------------------------
+if lang eq ru
+ MinRMenuW	 dd 18*6+10
 else
-;-------------------------------------------------------------------------------
+ MinRMenuW	 dd 15*6+10
-;----- RButton.inc -------------------------------------------------------------
+end if
  RMenuOnMoving	db 'âªà¥¯¨âì ¨ª®ª¨',0
  RMenuAdd	db '®¡ ¢¨âì',0
  RMenuDel	db '¤ «¨âì',0
  RMenuProp	db '¢®©áâ¢ ',0
 else
- RMenuRedrawFon db 'Refresh',0
+ RMenuRedrawFon db 'Redraw',0
- RMenuAlign     db 'Snap to Grid',0
+ RMenuAlign	db 'Snap to Grid',0
- RMenuOffMoving db 'Lock icons',0
+ RMenuOffMoving db 'Fix the icons',0
- RMenuOnMoving  db 'Unlock icons',0
+ RMenuOnMoving	db 'Unfix the icons',0
- RMenuAdd       db 'New icon',0
+ RMenuAdd	db 'Add',0
- RMenuDel       db 'Delete',0
+ RMenuDel	db 'Delete',0
- RMenuProp      db 'Properties',0
+ RMenuProp	db 'Properties',0
 end if
  ErrName	db '¬ï "rbmenu" § à¥§¥à¢¨à®¢ ®',0
 else
  ErrRunProg	db 'Error runing program',0
  WarningSave	db 'Do not forget to save the changes, run the RDSave',0
  ErrNotFoundIni db 'icon.ini not found',0
- ErrName	db 'The name "rbmenu" is reserved',0
+ ErrName	db 'The name "rbmenu" reserved',0
 end if
 ;-------------------------------------------------------------------------------
 ;------- AddDlg.inc ---------------------------------------------------------------
 end if
 ;/¥ ¬¥ïâì ¯®«®¦¥¨¥
 edtName    edit_box NAME_LENGTH*6+4,70+20+IMG_SIZE,6,0FFFFFFh,06F9480h,0FFh,0h,0,NAME_LENGTH,\
 		DAreaName,mouse_dd,0,0,0
-edtExePath edit_box 281-3-20-IMG_SIZE,70+20+IMG_SIZE,26,0FFFFFFh,06F9480h,0FFh,0h,0,256,\
+edtExePath edit_box 281-3-20-IMG_SIZE,70+20+IMG_SIZE,26,0FFFFFFh,06F9480h,0FFh,0h,0,255,\
 		DAreaPath,mouse_dd,0,0,0
-edtParams  edit_box 295-20-IMG_SIZE,70+20+IMG_SIZE,46,0FFFFFFh,06F9480h,0FFh,0h,0,256,\
+edtParams  edit_box 295-20-IMG_SIZE,70+20+IMG_SIZE,46,0FFFFFFh,06F9480h,0FFh,0h,0,255,\
 		DAreaParams,mouse_dd,0,0,0
-edtIcon    edit_box 295-20-IMG_SIZE,70+20+IMG_SIZE,66,0FFFFFFh,06F9480h,0FFh,0h,0,256,\
+edtIcon    edit_box 295-20-IMG_SIZE,70+20+IMG_SIZE,66,0FFFFFFh,06F9480h,0FFh,0h,0,255,\
 		DAreaIcon,mouse_dd,0,0,0
 endEdits:
 ;\
 MouseX		rd 1
 MouseY		rd 1
 RBSlot		rd 1
 RBSlot		rd 1
 AddX		rd 1
 AddY		rd 1
 SelIcon 	rd 1
 DlgSelIcon	rd 1
 slotDlgAdd	rd 1
 DlgBufImg	rb IMG_SIZE*IMG_SIZE*3
+align 4
+bufStdIco	rb 40
+IconsOffs	rd 100		;â ¡«¨æ  á ãª § â¥«ï¬¨   ª®ªà¥âë¥ ¨ª®ª¨(¤«ï ãáª®à¥¨ï)
 PIcoDB		rd 1
-bufStdIco	rb 40
+nLoadIcon	rd 1		;®¬¥à ç¨â ¥¬®© ¨§ ini ¨ª®ª¨
-IconsOffs	rd 100
+IconsID 	rd 100		;ID ¨ª®®ª - 2 ¡ ©âa + ¡ ©â 0 + ¢ëà ¢¨¢ îé¨© ¡ ©â - áâà®ª  á 2¬ï è¥á ¤æ¥â¨à¨çë¬¨ æ¨äà ¬¨
 PIcoDB		rd 1
 nameSection	rb 4
-align 4
-icon_count	rd 1
+align 4
-strip_file	rd 1
+icon_count	rd 1
-strip_file_size rd 1
+strip_file	rd 1
 strip_file_size rd 1
 MaxPage 	rd 1
 mouse_dd	rd 1
 DAreaName	rb NAME_LENGTH+1
-DAreaPath	rb 256+1
+DAreaPath	rb 255+1
-DAreaParams	rb 256+1
+DAreaParams	rb 255+1
-DAreaIcon	rb 256+1
+DAreaIcon	rb 255+1

Subversion Repositories Kolibri OS

(root)/programs/system/icon_new/@icon.asm @ 4946 – Rev 4156 → 4336