Palitra v0.7.6 - Loading/saving colors from/to file.

git-svn-id: svn://kolibrios.org@4187 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
eAndrew 2013-11-07 13:41:14 +00:00
parent 5f5f29ec11
commit e5ff0c6176
8 changed files with 671 additions and 607 deletions

View File

@ -0,0 +1 @@
゚ホ}B<

View File

@ -9,7 +9,7 @@
#/SYS/refrscrn "" 1 # Refresh screen #/SYS/refrscrn "" 1 # Refresh screen
/SYS/NETWORK/NETCFG A 1 # /SYS/NETWORK/NETCFG A 1 #
/SYS/NETWORK/ZEROCONF "" 1 # Network configuration /SYS/NETWORK/ZEROCONF "" 1 # Network configuration
/SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 #SET BG /SYS/MEDIA/PALITRA "H" 1 # SET BG
/SYS/@PANEL "" 1 # Start panel /SYS/@PANEL "" 1 # Start panel
/SYS/@DOCKY "" 1 # Start docky /SYS/@DOCKY "" 1 # Start docky
/SYS/SETUP BOOT 1 # Load device settings /SYS/SETUP BOOT 1 # Load device settings

View File

@ -9,7 +9,7 @@
#/SYS/refrscrn "" 1 # Refresh screen #/SYS/refrscrn "" 1 # Refresh screen
/SYS/NETWORK/NETCFG A 1 # /SYS/NETWORK/NETCFG A 1 #
/SYS/NETWORK/ZEROCONF "" 1 # Network configuration /SYS/NETWORK/ZEROCONF "" 1 # Network configuration
/SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 #SET BG /SYS/MEDIA/PALITRA "H" 1 # SET BG
/SYS/@PANEL "" 1 # Start panel /SYS/@PANEL "" 1 # Start panel
/SYS/@DOCKY "" 1 # Start docky /SYS/@DOCKY "" 1 # Start docky
/SYS/SETUP BOOT 1 # Load device settings /SYS/SETUP BOOT 1 # Load device settings

View File

@ -9,7 +9,7 @@
#/SYS/refrscrn "" 1 # Refresh screen #/SYS/refrscrn "" 1 # Refresh screen
/SYS/NETWORK/NETCFG A 1 # /SYS/NETWORK/NETCFG A 1 #
/SYS/NETWORK/ZEROCONF "" 1 # Network configuration /SYS/NETWORK/ZEROCONF "" 1 # Network configuration
/SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 #SET BG /SYS/MEDIA/PALITRA "H" 1 # SET BG
/SYS/@PANEL "" 1 # Start panel /SYS/@PANEL "" 1 # Start panel
/SYS/@DOCKY "" 1 # Start docky /SYS/@DOCKY "" 1 # Start docky
/SYS/SETUP BOOT 1 # Load device settings /SYS/SETUP BOOT 1 # Load device settings

View File

@ -9,7 +9,7 @@
#/SYS/refrscrn "" 1 # Refresh screen #/SYS/refrscrn "" 1 # Refresh screen
/SYS/NETWORK/NETCFG A 1 # /SYS/NETWORK/NETCFG A 1 #
/SYS/NETWORK/ZEROCONF "" 1 # Network configuration /SYS/NETWORK/ZEROCONF "" 1 # Network configuration
/SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 #SET BG /SYS/MEDIA/PALITRA "H" 1 # SET BG
/SYS/@PANEL "" 1 # Start panel /SYS/@PANEL "" 1 # Start panel
/SYS/@DOCKY "" 1 # Start docky /SYS/@DOCKY "" 1 # Start docky
/SYS/SETUP BOOT 1 # Load device settings /SYS/SETUP BOOT 1 # Load device settings

View File

@ -9,7 +9,7 @@
#/SYS/refrscrn "" 1 # Refresh screen #/SYS/refrscrn "" 1 # Refresh screen
/SYS/NETWORK/NETCFG A 1 # /SYS/NETWORK/NETCFG A 1 #
/SYS/NETWORK/ZEROCONF "" 1 # Network configuration /SYS/NETWORK/ZEROCONF "" 1 # Network configuration
/SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 #SET BG /SYS/MEDIA/PALITRA "H" 1 # SET BG
/SYS/@PANEL "" 1 # Start panel /SYS/@PANEL "" 1 # Start panel
/SYS/@DOCKY "" 1 # Start docky /SYS/@DOCKY "" 1 # Start docky
/SYS/SETUP BOOT 1 # Load device settings /SYS/SETUP BOOT 1 # Load device settings

View File

@ -6,7 +6,7 @@
;..................................................................................................... ;.....................................................................................................
;; compiler: FASM 1.69.31 | ;; compiler: FASM 1.69.31 |
;; version: 0.3.0 | ;; version: 0.3.0 |
;; last update: 08/11/2012 | ;; last update: 07/11/2013 |
;; e-mail: dr.steshin@gmail.com | ;; e-mail: dr.steshin@gmail.com |
;..................................................................................................... ;.....................................................................................................
;; History: | ;; History: |
@ -34,6 +34,8 @@
;; 0.7.0 - „®¡ ¢«¥­  ¯¨¯¥âª  - ¢ë¡®à ­  á।­îî ª­®¯ªã ¬ëè¨ | ;; 0.7.0 - „®¡ ¢«¥­  ¯¨¯¥âª  - ¢ë¡®à ­  á।­îî ª­®¯ªã ¬ëè¨ |
;; 0.7.5 - <20> ¦ â¨¥ ¯à ¢®© ª« ¢¨è¥© ¬ëè¨ ­  ï祩ªã á 梥⮬ ãáâ ­ ¢«¨¢ ¥â ­¥ ®á­®¢®©,   ¤®¯®«­. 梥â | ;; 0.7.5 - <20> ¦ â¨¥ ¯à ¢®© ª« ¢¨è¥© ¬ëè¨ ­  ï祩ªã á 梥⮬ ãáâ ­ ¢«¨¢ ¥â ­¥ ®á­®¢®©,   ¤®¯®«­. 梥â |
;; - “¬¥­ì襭® ¬¥àæ ­¨¥ ¯à¨ à ¡®â¥ ¯¨¯¥âª¨ | ;; - “¬¥­ì襭® ¬¥àæ ­¨¥ ¯à¨ à ¡®â¥ ¯¨¯¥âª¨ |
;; 0.7.6 - <20>¥à¥à ¡®â ­ ०¨¬ H (hidden): ⥯¥àì æ¢¥â  § £à㦠îâáï ¨§ wallpaper.dat (eAndrew) |
;; - <20>ਠãáâ ­®¢ª¨ ä®­  ª­®¯ª®©, 梥â ä®­  á®åà ­ï¥âáï ¢ wallpaper.dat (eAndrew) |
;..................................................................................................... ;.....................................................................................................
;; All rights reserved. | ;; All rights reserved. |
;; | ;; |
@ -69,12 +71,12 @@
dd 0x01 dd 0x01
dd START dd START
dd I_END dd I_END
dd I_END+4096 dd I_RDATA+4096
dd I_END+4096 dd I_RDATA+4096
dd params dd params
dd 0x0 dd 0x0
include '..\..\..\macros.inc' include '../../../macros.inc'
WIN_W equ 295 ; è¨à¨­  ®ª­  WIN_W equ 295 ; è¨à¨­  ®ª­ 
WIN_H equ 195 ; ¢ëá®â  ®ª­  WIN_H equ 195 ; ¢ëá®â  ®ª­ 
@ -466,6 +468,29 @@ set_background:
mov ebx,3 ; <20>®¤äã­ªæ¨ï 3 - ¯¥à¥à¨á®¢ âì ä®­. mov ebx,3 ; <20>®¤äã­ªæ¨ï 3 - ¯¥à¥à¨á®¢ âì ä®­.
int 0x40 ; ‚ë§ë¢ ¥¬ int 0x40 ; ‚ë§ë¢ ¥¬
mov eax, [color]
mov [fi.file+0], al
shr eax, 8
mov [fi.file+1], al
shr eax, 8
mov [fi.file+2], al
mov eax, [color2]
mov [fi.file+3], al
shr eax, 8
mov [fi.file+4], al
shr eax, 8
mov [fi.file+5], al
mov [fi.p00], dword 2
mov [fi.p04], dword 0
mov [fi.p08], dword 0
mov [fi.p12], dword 6
mov [fi.p16], dword fi.file
mov [fi.p20], dword 0
mov [fi.p21], dword dat_file
mcall 70, fi
ret ret
;end_set_background ;end_set_background
@ -913,12 +938,12 @@ draw_result:
mov ecx,0x0 ; 0xX0RRGGBB (RR, GG, BB § ¤ îâ 梥â ⥪áâ ) mov ecx,0x0 ; 0xX0RRGGBB (RR, GG, BB § ¤ îâ 梥â ⥪áâ )
mov edx,cname ; 㪠§ â¥«ì ­  ­ ç «® áâப¨ mov edx,cname ; 㪠§ â¥«ì ­  ­ ç «® áâப¨
mov esi,1 ; ¢ë¢®¤¨âì esi ᨬ¢®«®¢ mov esi,1 ; ¢ë¢®¤¨âì esi ᨬ¢®«®¢
newline: ; 横« newline_s: ; 横«
int 0x40 ; <20>à¥à뢠­¨¥ int 0x40 ; <20>à¥à뢠­¨¥
add ebx,23 shl 16 ; „®¡ ¢«ï¥¬ add ebx,23 shl 16 ; „®¡ ¢«ï¥¬
add edx,1 ; „®¡ ¢«ï¥¬ add edx,1 ; „®¡ ¢«ï¥¬
cmp [edx],byte 'x' ; ‘à ¢­¥­¨¥ á ¡ ©â®¬ å cmp [edx],byte 'x' ; ‘à ¢­¥­¨¥ á ¡ ©â®¬ å
jne newline ; …᫨ ­¥ ­ã«ì ¨«¨ ­¥ à ¢­® jne newline_s ; …᫨ ­¥ ­ã«ì ¨«¨ ­¥ à ¢­®
;................................................................................................. ;.................................................................................................
; Žâà¨á®¢ª  á« ©¤¥à®¢ ; Žâà¨á®¢ª  á« ©¤¥à®¢
@ -1016,64 +1041,88 @@ draw_value:
;end_draw_value ;end_draw_value
_read_params: _read_params:
mov [fi.p00], dword 0
mov [fi.p04], dword 0
mov [fi.p08], dword 0
mov [fi.p12], dword 6
mov [fi.p16], dword fi.file
mov [fi.p20], dword 0
mov [fi.p21], dword dat_file
mcall 70, fi
mov al,[params+2] xor eax, eax
mov [params_c+0],al mov al, [fi.file+2]
shl eax, 8
mov al, [fi.file+1]
shl eax, 8
mov al, [fi.file+0]
mov [color], eax
mov al,[params+3] xor eax, eax
mov [params_c+1],al mov al, [fi.file+5]
shl eax, 8
mov al, [fi.file+4]
shl eax, 8
mov al, [fi.file+3]
mov [color2], eax
mov al,[params+4] ; mov al,[params+2]
mov [params_c+2],al ; mov [params_c+0],al
;
mov al,[params+5] ; mov al,[params+3]
mov [params_c+3],al ; mov [params_c+1],al
;
mov al,[params+6] ; mov al,[params+4]
mov [params_c+4],al ; mov [params_c+2],al
;
mov al,[params+7] ; mov al,[params+5]
mov [params_c+5],al ; mov [params_c+3],al
;
mov al,[params+8] ; mov al,[params+6]
mov [params_c+6],al ; mov [params_c+4],al
;
mov al,[params+9] ; mov al,[params+7]
mov [params_c+7],al ; mov [params_c+5],al
;
mov esi,params_c ; mov al,[params+8]
mov ecx,16 ; mov [params_c+6],al
call ascii2int ;
mov [color],eax ; mov al,[params+9]
; mov [params_c+7],al
mov al,[params+11] ;
mov [params_c+0],al ; mov esi,params_c
; mov ecx,16
mov al,[params+12] ; call ascii2int
mov [params_c+1],al ; mov [color],eax
;
mov al,[params+13] ; mov al,[params+11]
mov [params_c+2],al ; mov [params_c+0],al
;
mov al,[params+14] ; mov al,[params+12]
mov [params_c+3],al ; mov [params_c+1],al
;
mov al,[params+15] ; mov al,[params+13]
mov [params_c+4],al ; mov [params_c+2],al
;
mov al,[params+16] ; mov al,[params+14]
mov [params_c+5],al ; mov [params_c+3],al
;
mov al,[params+17] ; mov al,[params+15]
mov [params_c+6],al ; mov [params_c+4],al
;
mov al,[params+18] ; mov al,[params+16]
mov [params_c+7],al ; mov [params_c+5],al
;
mov esi,params_c ; mov al,[params+17]
mov ecx,16 ; mov [params_c+6],al
call ascii2int ;
mov [color2],eax ; mov al,[params+18]
; mov [params_c+7],al
;
; mov esi,params_c
; mov ecx,16
; call ascii2int
; mov [color2],eax
ret ret
@ -1230,6 +1279,8 @@ str_len:
; <20>ŽŠ <20><EFBFBD>…Œ…<C592><E280A6>ˆ ŠŽ<C5A0><E28099> | ; <20>ŽŠ <20><EFBFBD>…Œ…<C592><E280A6>ˆ ŠŽ<C5A0><E28099> |
;----------------------------------------------------------------------------------------------------/ ;----------------------------------------------------------------------------------------------------/
circle: circle:
dat_file db '/sys/settings/wallpaper.dat', 0
cm db 12 dup(0) cm db 12 dup(0)
color dd 00000000h ; åà ­¨â §­ ç¥­¨¥ ¢ë¡à ­­®£® æ¢¥â  color dd 00000000h ; åà ­¨â §­ ç¥­¨¥ ¢ë¡à ­­®£® 梥â 
color2 dd 00FFFFFFh ; åà ­¨â §­ ç¥­¨¥ ¢â®à®£® ¢ë¡à ­­®£® æ¢¥â  color2 dd 00FFFFFFh ; åà ­¨â §­ ç¥­¨¥ ¢â®à®£® ¢ë¡à ­­®£® 梥â 
@ -1254,10 +1305,26 @@ circle:
renmode dd 0 ; ०¨¬ ®âà¨á®¢ª¨ (1-梥⮢ ï á奬 ,2-¯¨¯¥âª ,3-ªà㣮¢ ï) renmode dd 0 ; ०¨¬ ®âà¨á®¢ª¨ (1-梥⮢ ï á奬 ,2-¯¨¯¥âª ,3-ªà㣮¢ ï)
runmode dd 1 ; ०¨¬ § ¯ã᪠ (1-normal, 2-hidden, 3-colordialog) runmode dd 1 ; ०¨¬ § ¯ã᪠ (1-normal, 2-hidden, 3-colordialog)
params db 20 dup(0) ; ¯à¨ñ¬ ¯ à ¬¥â஢ params db 20 dup(0) ; ¯à¨ñ¬ ¯ à ¬¥â஢
params_c db 9 dup(0) ; ¯à¨ñ¬­¨ª ¤«ï æ¢¥â  ; params_c db 9 dup(0) ; ¯à¨ñ¬­¨ª ¤«ï 梥â 
I_END: I_END:
fi:
.p00:
rd 1
.p04:
rd 1
.p08:
rd 1
.p12:
rd 1
.p16:
rd 1
.p20:
rb 1
.p21:
rd 1
.file:
rb 32
I_RDATA:

View File

@ -21,11 +21,7 @@ $
$ § ―γαͺ α ΰ ¬₯βΰ<CEB2>¬ H $ § ―γαͺ α ΰ ¬₯βΰ<CEB2>¬ H
------------------------------------------------------------------------------+ ------------------------------------------------------------------------------+
<EFBFBD>ணࠬ¬  § ¯ã᪠¥âáï ¢ hidden mode ¡¥§ ®âà¨á®¢ª¨ ®ª­  ¯à¨«®¦¥­¨ï ¨ ¢ ª ç¥á⢥ <EFBFBD>ணࠬ¬  § ¯ã᪠¥âáï ¢ hidden mode ¡¥§ ®âà¨á®¢ª¨ ®ª­  ¯à¨«®¦¥­¨ï ¨ § £à㦠¥â
¯¥à¥¤ ¢ ¥¬ëå ¯ à ¬¥â஢ âॡã¥â ¯¥à¥¤ çã ¤¢ãå 梥⮢ ¢ ¢¨¤¥ HEX áâப¨. <20>®á«¥ ¤¢  æ¢¥â  ¨§ /settings/wallpaper.dat. <20>®á«¥ 祣®, ¯®«ã祭­ë¥ æ¢¥â  ¡ã¤ãâ
祣®, ¯®«ã祭­ë¥ æ¢¥â  ¡ã¤ã⠨ᯮ«ì§®¢ ­ë ¤«ï § «¨¢ª¨ ä®­  à ¡®ç¥£® á⮫  £à - ¨á¯®«ì§®¢ ­ë ¤«ï § «¨¢ª¨ ä®­  à ¡®ç¥£® á⮫  £à ¤¨¥­â®¬ ¨§ 㪠§ ­­ëå 梥⮢.
¤¨¥­â®¬ ¨§ 㪠§ ­­ëå 梥⮢. <20> ¯à¨¬¥à ¢®§¬®¦­ë ¢ à¨ ­âë § ¯ã᪠:
/rd/1/media/palitra H 00FF00FF 00FF0000
/rd/1/media/palitra H 00F724A3 00736698
..............................................................................+ ..............................................................................+