Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Palitra (Palette) 0.75: RMB set additional color, reduced redraw when picker used

Browse Source 
git-svn-id: svn://kolibrios.org@3904 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2013-09-12 21:55:46 +00:00
parent 86442bc3e0
commit 7caeeae8e9
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
programs/media/palitra/trunk/palitra.asm
View File

@ -32,6 +32,8 @@
;; - „®¡ ¢«¥­ ०¨¬ H (hidden) ¯à®¨§¢®¤¨â § ¬¥­ã ä®­  à ¡®ç¥£® á⮫  £à ¤¨¥­â­®© § «¨¢ª®©. | ;; - „®¡ ¢«¥­ ०¨¬ H (hidden) ¯à®¨§¢®¤¨â § ¬¥­ã ä®­  à ¡®ç¥£® á⮫  £à ¤¨¥­â­®© § «¨¢ª®©. |
;; - <20>®«ìè ï ¤¥®¯â¨¬¨§ æ¨ï. | ;; - <20>®«ìè ï ¤¥®¯â¨¬¨§ æ¨ï. |
;; 0.7.0 - „®¡ ¢«¥­  ¯¨¯¥âª  - ¢ë¡®à ­  á।­îî ª­®¯ªã ¬ëè¨ | ;; 0.7.0 - „®¡ ¢«¥­  ¯¨¯¥âª  - ¢ë¡®à ­  á।­îî ª­®¯ªã ¬ëè¨ |
;; 0.7.5 - <20> ¦ â¨¥ ¯à ¢®© ª« ¢¨è¥© ¬ëè¨ ­  ï祩ªã á 梥⮬ ãáâ ­ ¢«¨¢ ¥â ­¥ ®á­®¢®©,   ¤®¯®«­. 梥â |
;; - “¬¥­ì襭® ¬¥àæ ­¨¥ ¯à¨ à ¡®â¥ ¯¨¯¥âª¨ |
;..................................................................................................... ;.....................................................................................................
;; All rights reserved. | ;; All rights reserved. |
;; | ;; |
@ -112,13 +114,26 @@ key: ;
;end_key ;end_key
mouse: mouse:
mov eax,[renmode] cmp [renmode],2
cmp eax,2 jne left
jnz still
call cyrcle_draw call cyrcle_draw
jmp center
left:
mcall 37,2
cmp al,1b
jne right
mov [mouse_f],1
jmp still
right:
cmp al,10b
jne still
mov [mouse_f],2
jmp still
center:
mcall 37,2 mcall 37,2
cmp al,100b cmp al,100b
jne still jne still
mov [mouse_f],3
mov [color],edx mov [color],edx
call draw_result call draw_result
jmp still ; ¢¥à­ãâìáï ª ­ ç «ã 横«  jmp still ; ¢¥à­ãâìáï ª ­ ç «ã 横« 
@ -497,8 +512,16 @@ mouse_get:
cmp esi,0 ; ŠŽ‘’›‹œ: ‘à ¢­¨¢ ¥¬ á ­ã«¥¬ cmp esi,0 ; ŠŽ‘’›‹œ: ‘à ¢­¨¢ ¥¬ á ­ã«¥¬
jz mouse_exit ; ŠŽ‘’›‹œ: …᫨ ­®«ì ⮠ᤥ« «¨ ¢áñ çâ® ¬®£«¨ jz mouse_exit ; ŠŽ‘’›‹œ: …᫨ ­®«ì ⮠ᤥ« «¨ ¢áñ çâ® ¬®£«¨
jmp re_mouse_loop ; ŠŽ‘’›‹œ: …᫨ ­¥ ­®«ì â® ¯®¯à®¡ã¥¬ ¢§ïâì á®á¥«­¨© ¯¨ªá¥«ì jmp re_mouse_loop ; ŠŽ‘’›‹œ: …᫨ ­¥ ­®«ì â® ¯®¯à®¡ã¥¬ ¢§ïâì á®á¥«­¨© ¯¨ªá¥«ì
mouse_set: mouse_set: ; ˆ­ ç¥ § ¯®¬¨­ ¥¬ ­®¢ë© 梥â
mov [color],eax ; ˆ­ ç¥ § ¯®¬¨­ ¥¬ ­®¢ë© 梥â cmp [mouse_f],1
jne was_right
mov [color],eax
call draw_result
jmp mouse_exit
was_right:
cmp [mouse_f],2
jne mouse_exit
mov [color2],eax
call draw_result ; ‚뢮¤¨¬ १ã«ìâ â call draw_result ; ‚뢮¤¨¬ १ã«ìâ â
mouse_exit: mouse_exit:
ret ; ‚®§¢à é ¥¬ ã¯à ¢«¥­¨¥ ret ; ‚®§¢à é ¥¬ ã¯à ¢«¥­¨¥
@ -544,11 +567,6 @@ draw_palitra:
;mov esi,21 ; ¢ë¢®¤¨âì esi ᨬ¢®«®¢ ;mov esi,21 ; ¢ë¢®¤¨âì esi ᨬ¢®«®¢
;mcall ;mcall
mov eax,13
mov edx,0x666666
mov ebx,111*65536+145
mov ecx, 9*65536+145
mcall
;mov edx,[color] ;mov edx,[color]
;mov ebx,109*65536+150 ;mov ebx,109*65536+150
;mov ecx, 10*65536+150 ;mov ecx, 10*65536+150
@ -562,6 +580,7 @@ draw_palitra:
jle end_cyrcle_draw jle end_cyrcle_draw
cyrcle_draw_2: cyrcle_draw_2:
mcall 5,10
call desktop_get call desktop_get
call mouse_global call mouse_global
@ -604,7 +623,13 @@ draw_palitra:
mov ebx,178*65536+11 mov ebx,178*65536+11
mov ecx, 77*65536+11 mov ecx, 77*65536+11
mcall mcall
ret
end_cyrcle_draw: end_cyrcle_draw:
mov eax,13
mov edx,0x666666
mov ebx,111*65536+145
mov ecx, 9*65536+145
mcall
ret ret
circle_pixel_read: circle_pixel_read:
@ -1214,7 +1239,7 @@ circle:
desctop_w dd 0 ; åà ­¨â è¨à¨­ã íªà ­  desctop_w dd 0 ; åà ­¨â è¨à¨­ã íªà ­ 
desctop_h dd 0 ; åà ­¨â ¢ëá®âã íªà ­  desctop_h dd 0 ; åà ­¨â ¢ëá®âã íªà ­ 
sc system_colors ; åà ­¨â áâàãªâãàã á¨á⥬­ëå 梥⮢ ᪨­  sc system_colors ; åà ­¨â áâàãªâãàã á¨á⥬­ëå 梥⮢ ᪨­ 
title db 'Palitra v0.7',0 ; åà ­¨â ¨¬ï ¯à®£à ¬¬ë title db 'Palitra v0.75',0 ; åà ­¨â ¨¬ï ¯à®£à ¬¬ë
hidden db 'Hidden',0 hidden db 'Hidden',0
hex db '#',0 ; ¤«ï ¢ë¢®¤  à¥èñ⪨ ª ª ⥪áâ  hex db '#',0 ; ¤«ï ¢ë¢®¤  à¥èñ⪨ ª ª ⥪áâ 
cname db 'RGBAx' ; åà ­¨â à §àï¤ë 梥⮢ (red,green,blue) x-¬¥âª  ª®­æ  cname db 'RGBAx' ; åà ­¨â à §àï¤ë 梥⮢ (red,green,blue) x-¬¥âª  ª®­æ