Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9471 → Rev 9472

/programs/media/palitra/branch/panel.raw
File deleted
\ No newline at end of file
/programs/media/palitra/branch/build.bat
1,4 → 1,5
del palitra
@fasm.exe palitra.asm palitra
@kpack palitra
rem @kpack palitra
 
pause
if not exist palitra ( @pause )
/programs/media/palitra/branch/palitra.asm
74,20 → 74,27
include '../../../KOSfuncs.inc'
include '../../../dll.inc'
 
WIN_W equ 394 ; è¨à¨­  ®ª­ 
WIN_H equ 251 ; ¢ëá®â  ®ª­ 
WIN_X equ 250 ; ª®®à¤¨­ â  å ®ª­ 
WIN_Y equ 190 ; ª®®à¤¨­ â  ã ®ª­ 
WIN_W = 394 ; è¨à¨­  ®ª­ 
WIN_H = 251 ; ¢ëá®â  ®ª­ 
WIN_X = 250 ; ª®®à¤¨­ â  å ®ª­ 
WIN_Y = 190 ; ª®®à¤¨­ â  ã ®ª­ 
 
panel:
file "panel.raw"
CELLW = 8 ; not used yet, but has to be :)
DRAWY = 9
ICONX = WIN_W - 35
SLIDEW = 25
 
START:
mcall SF_SYS_MISC,SSF_HEAP_INIT ; ¨­¨æ¨ «¨§ æ¨ï ªãç¨
mcall SF_SYS_MISC, SSF_MEM_OPEN, i18_name
mov [icons18], eax
mcall SF_SYS_MISC, SSF_MEM_OPEN, i18bg_name
mov [icons18bg], eax
 
stdcall dll.Load, @IMPORT
or eax,eax
jnz bexit
mcall SF_SET_EVENTS_MASK,0x27 ; ãáâ ­ ¢«¨¢ ¥¬ ¬ áªã ᮡë⨩
mcall SF_SET_EVENTS_MASK,EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE ; ãáâ ­ ¢«¨¢ ¥¬ ¬ áªã ᮡë⨩
include 'params_init.inc' ; ®¡à ¡®âª  ¯ à ¬¥â஢ ª®¬ ­¤­®© áâப¨
 
;#___________________________________________________________________________________________________
98,13 → 105,13
call draw_main ; ¢ë§ë¢ ¥¬ ¯¥à¥à¨á®¢ªã ®ª­  ¯à¨«®¦¥­¨ï
still:
mcall SF_WAIT_EVENT ; äã­ªæ¨ï 10 - ¦¤ âì ᮡëâ¨ï
cmp eax,1 ; ¯¥à¥à¨á®¢ âì ®ª­® ?
cmp eax,EV_REDRAW ; ¯¥à¥à¨á®¢ âì ®ª­® ?
je red ; ¥á«¨ ¤  - ­  ¬¥âªã red
cmp eax,2 ; ­ ¦ â  ª« ¢¨è  ?
cmp eax,EV_KEY ; ­ ¦ â  ª« ¢¨è  ?
je key ; ¥á«¨ ¤  - ­  key
cmp eax,3 ; ­ ¦ â  ª­®¯ª  ?
cmp eax,EV_BUTTON ; ­ ¦ â  ª­®¯ª  ?
je button ; ¥á«¨ ¤  - ­  button
cmp eax,6 ; ᮡë⨥ ®â ¬ëè¨ ¢­¥ ®ª­ 
cmp eax,EV_MOUSE ; ᮡë⨥ ®â ¬ëè¨ ¢­¥ ®ª­ 
je mouse ; ¥á«¨ ¤  - ­  button
jmp still ; ¥á«¨ ¤à㣮¥ ᮡë⨥ - ¢ ­ ç «® 横« 
;end_still
265,23 → 272,22
call draw_palitra ; ˆ‘“…Œ €‹ˆ’“
call draw_result ; ˆ‘“…Œ …‡“‹œ’€’
 
; ”ã­ªæ¨ï 8 - ®¯à¥¤¥«¨âì/㤠«¨âì ª­®¯ªã
mcall SF_DEFINE_BUTTON, (110 shl 16)+147, (9 shl 16)+147, 0x60000007
mcall SF_DEFINE_BUTTON, <110,147>, <DRAWY,147>, 0x07+BT_HIDE
 
inc edx
mcall , 18*65536+22, 61*65536+188 ; ¨á㥬 ­¥¢¨¤¨¬ãî ª­®¯ªã ¯®¤ á« ©¤¥à®¬ red
add ebx,20*65536+20 ;23 shl 16 ; „®¡ ¢«ï¥¬
add edx,1++BT_NOFRAME
mcall , <10,22>, <62,128> ; ¨á㥬 ­¥¢¨¤¨¬ãî ª­®¯ªã ¯®¤ á« ©¤¥à®¬ red
add ebx,25*65536 ; „®¡ ¢«ï¥¬
inc edx ; ID = 9
int 0x40 ; ¨á㥬 ­¥¢¨¤¨¬ãî ª­®¯ªã ¯®¤ á« ©¤¥à®¬ green
add ebx,20*65536+20;23 shl 16 ; „®¡ ¢«ï¥¬
add ebx,25*65536 ; „®¡ ¢«ï¥¬
inc edx ; ID = 10
int 0x40 ; ¨á㥬 ­¥¢¨¤¨¬ãî ª­®¯ªã ¯®¤ á« ©¤¥à®¬ blue
add ebx, 20*65536+20;23 shl 16 ; „®¡ ¢«ï¥¬
add ebx,25*65536 ; „®¡ ¢«ï¥¬
inc edx ; ID = 11
int 0x40 ; ¨á㥬 ­¥¢¨¤¨¬ãî ª­®¯ªã ¯®¤ á« ©¤¥à®¬ alpha
 
; ”ã­ªæ¨ï 8 - ®¯à¥¤¥«¨âì/㤠«¨âì ª­®¯ªã (‘Œ…€ –‚…’€)
mcall , (13 shl 16)+20, (20 shl 16)+20, 0x6000000D
mcall , <13,19>, <20,18>, 0x0D+BT_HIDE
 
call draw_bottom_panel
call draw_left_panel
290,6 → 296,32
mcall SF_REDRAW,SSF_END_DRAW
ret
 
proc DrawRectangle3D, _x:word, _w:word, _y:word, _h:word, color1:dword, color2:dword
mov ebx,[_w]
add ebx,[_x] ;âãâ â®ç­® ª ª ï-â® ¤¨çì... ­ã¦­® ¯¥à¥¯¨á âì :)
shl ebx,16
mov bx,1
mov ecx,[_h]
inc cx
mov edx,[_color2]
mcall SF_DRAW_RECT ; x+w,y,1,h+1,color2
rol ebx,16
sub bx,[_w]
ror ebx,16
dec cx
mov edx,[_color1]
mcall ;SF_DRAW_RECT x,y,1,h,color1
mov bx,[_h]
xchg bx,cx
mcall ;SF_DRAW_RECT x,y,w,1,color1
rol ecx,16
add cx,[_h]
ror ecx,16
mov edx,[_color2]
mcall ;SF_DRAW_RECT x,y+h,w,1,color2
ret
endp
 
;#___________________________________________________________________________________________________
;****************************************************************************************************|
; ‹ŽŠ ‚‘ŽŒŽƒ€’…‹œ›• Ž–…„“ ˆ ”“Š–ˆ‰ ˆ‹Ž†…ˆŸ |
300,14 → 332,27
draw_left_panel: ; Žâà¨á®¢ª  ¡®ª®¢®© ¯ ­¥«¨ SL97:   á ¬®¬ ¤¥«¥ ¯à ¢®©.
;.................................................................................................
; button_next_colorsheme
mcall SF_DEFINE_BUTTON, (266 shl 16)+16, (9 shl 16)+16, 0x6000000C, [sc.work_button]
mcall SF_DEFINE_BUTTON, <ICONX,21>, <DRAWY,21>, 12+BT_HIDE
; circle diagram
add ecx,19 shl 16 ; move rect
mov edx,0x6000000F ; ID = 15
int 0x40 ; call
add edx,3 ; ID = 15
mcall
 
mcall SF_PUT_IMAGE, panel, (16 shl 16)+149, (266 shl 16)+9
mov ebx,[icons18bg]
add ebx,18*18*4*53
mcall SF_PUT_IMAGE_EXT, ebx, <18,18>, <ICONX+2,DRAWY+2>, 32, 0, 0
 
add ebx,18*18*4*(39-53)
mov edx,ICONX*65536+WIN_H-90
mcall
mov ebx,[icons18]
add ebx,18*18*4*(52-39)
sub edx,40
mcall
;stdcall DrawRectangle3D ICONX, DRAWY, 22, 22, [sc.work_light], [sc.work_dark] ;Leency: draw rectangle around the button, buggy now
;mov eax,13 ; draw rect
;mov ebx,266 shl 16+16 ; [x] + [size]
;mov ecx,9 shl 16+16 ; [y] + [size]
788,8 → 833,8
;.................................................................................................
; ®«ìè ï à ¬ª  ¢ë¢®¤  १ã«ìâ â 
;.................................................................................................
mcall SF_DRAW_RECT, 4 shl 16+110, 9 shl 16+219-18, 0x00666666
mcall , 5 shl 16+110-2, 10 shl 16+219-20, 0x00F3F3F3
mcall SF_DRAW_RECT, <4,110>, <9,219-18>, [sc.work_graph]
mcall , <5,110-2>, <10,219-20>, [sc.work_light]
 
;.................................................................................................
; Žâà¨á®¢ª  १ã«ìâ â  æ¢¥â  ¢ hex color2
809,7 → 854,7
 
; ”ã­ªæ¨ï 47 - ¢ë¢®¤ ç¨á«  ¢ ®ª­®
;ebx - ¯ à ¬¥âàë ¯à¥®¡à §®¢ ­¨ï ç¨á«  ¢ ⥪áâ (HEX)
mcall SF_DRAW_NUMBER, 256+8 shl 16, [color], (40 shl 16)+22, 0x10000000, 0
mcall SF_DRAW_NUMBER, 256+8 shl 16, [color], <40,22>, 0x10000000, 0
 
; äã­ªæ¨ï 4: ­ ¯¨á âì ⥪áâ ¢ ®ª­¥
; edx - à¨á㥬 '#'
841,8 → 886,9
; ‚뢮¤¨¬ ¡ãª¢ë r g b a
;.................................................................................................
mov eax,SF_DRAW_TEXT ; 4 - ¢ë¢¥á⨠áâபã ⥪áâ  ¢ ®ª­®
mov ebx,19 shl 16+49 ; [ª®®à¤¨­ â  ¯® ®á¨ x]*65536 + [ª®®à¤¨­ â  ¯® ®á¨ y]
mov ecx, 0x0 ; 0xX0RRGGBB (RR, GG, BB § ¤ îâ 梥â ⥪áâ )
mov ebx,17 shl 16+DRAWY+37 ; [ª®®à¤¨­ â  ¯® ®á¨ x]*65536 + [ª®®à¤¨­ â  ¯® ®á¨ y]
mov ecx, 0x10000000 ; 0xX0RRGGBB (RR, GG, BB § ¤ îâ 梥â ⥪áâ )
add ecx, [sc.work_text]
mov edx,cname ; 㪠§ â¥«ì ­  ­ ç «® áâப¨
mov esi,1 ; ¢ë¢®¤¨âì esi ᨬ¢®«®¢
newline: ; 横«
877,6 → 923,7
add ebx,7 shl 16
draw_value_e:
mov ecx,0x0; 0x10000000 ; 梥â ⥪áâ  RRGGBB
add ecx,[sc.work_text]
mov edx,buff ; 㪠§ â¥«ì ­  ­ ç «® ⥪áâ 
int 0x40
ret ; ‚®§¢à é ¥¬ ã¯à ¢«¥­¨¥
1091,7 → 1138,7
set_background2:
mcall SF_SYS_MISC, SSF_HEAP_INIT
mcall SF_SYS_MISC, SSF_MEM_ALLOC, 256 * 256 * 3
mov [image], eax
mov [bgimg_buf], eax
 
mov edx, eax
mov ecx, 256 * 256
1113,10 → 1160,10
 
mcall SF_BACKGROUND_SET, SSF_SIZE_BG, 256, 256
mcall SF_BACKGROUND_SET, SSF_MODE_BG, 1
mcall SF_BACKGROUND_SET, SSF_IMAGE_BG, [image], 0, 256 * 256 * 3
mcall SF_BACKGROUND_SET, SSF_IMAGE_BG, [bgimg_buf], 0, 256 * 256 * 3
mcall SF_BACKGROUND_SET, SSF_REDRAW_BG
 
mcall SF_SYS_MISC, SSF_MEM_FREE, [image]
mcall SF_SYS_MISC, SSF_MEM_FREE, [bgimg_buf]
stdcall save_eskin_ini, 'B '
ret
 
1189,8 → 1236,8
larrow db 0x1A,0
buff db '000',0
bground db 'BACKGROUND',0 ; ¨¬ï ª­®¯ª¨ - 14
bground1 db 'Gradient',0 ; ¨¬ï ª­®¯ª¨ - 14
bground2 db 'Noisy',0 ; ¨¬ï ª­®¯ª¨ - 14
bground1 db 'Gradient',0 ; ¨¬ï ª­®¯ª¨ - 15
bground2 db 'Noisy',0 ; ¨¬ï ª­®¯ª¨ - 16
runmode dd 1 ; ०¨¬ § ¯ã᪠ (1-normal, 2-hidden, 3-colordialog)
color2 dd 00FFFFFFh ; åà ­¨â §­ ç¥­¨¥ ¢â®à®£® ¢ë¡à ­­®£® 梥â 
 
1199,6 → 1246,10
aprogram db 'bg_program',0
aparam db 'bg_param',0
 
i18_name db 'ICONS18',0
i18bg_name db 'ICONS18W',0
 
 
align 16
@IMPORT:
 
1217,7 → 1268,7
desctop_w rd 1 ; åà ­¨â è¨à¨­ã íªà ­ 
desctop_h rd 1 ; åà ­¨â ¢ëá®âã íªà ­ 
sc system_colors ; åà ­¨â áâàãªâãàã á¨á⥬­ëå 梥⮢ ᪨­ 
cred rb 1 ; åà ­¨¬ ªà á­ë© ᯥªàâ
cred rb 1 ; åà ­¨¬ ªà á­ë© ᯥªâà
cgreen rb 1 ; åà ­¨¬ §¥«¥­ë© ᯥªâà
cblue rb 1 ; åà ­¨¬ ᨭ¨© ᯥªâà
calpha rb 1 ; åà ­¨¬ ¯à®§à ç­®áâì
1225,7 → 1276,9
renmode rd 1 ; ०¨¬ ®âà¨á®¢ª¨ (1-梥⮢ ï á奬 ,2-¯¨¯¥âª ,3-ªà㣮¢ ï)
params rb 20 ; ¯à¨ñ¬ ¯ à ¬¥â஢
params_c rb 9 ; ¯à¨ñ¬­¨ª ¤«ï 梥â 
image rd 1
bgimg_buf rd 1 ; buffer for a generated image
icons18 dd ? ; pointer to a shared memory of icons18.png
icons18bg dd ? ; pointer to a shared memory of icons18.png with filled bg
 
rd 1024
stacktop: