WebSVN – Kolibri OS – Diff – /programs/media/palitra/trunk/palitra.asm

 ;;       - ®á¬¥â¨ç¥áª¨¥ ¯à ¢ª¨.                                                                     |
 ;;       - ¥¡®«ìè ï ¤¥®¯â¨¬¨§ æ¨ï.                                                                  |
 ;; 0.6.0 - ®¡ ¢«¥  ¢®§¬®¦®áâì § ¯ãáª  á ¯ à ¬¥âà ¬¨                                               |
 ;;       - ®¡ ¢«¥ à¥¦¨¬ H (hidden) ¯à®¨§¢®¤¨â § ¬¥ã ä®  à ¡®ç¥£® áâ®«  £à ¤¨¥â®© § «¨¢ª®©.     |
 ;;       - ®«ìè ï ¤¥®¯â¨¬¨§ æ¨ï.                                                                    |
+;; 0.7.0 - ®¡ ¢«¥  ¯¨¯¥âª  - ¢ë¡®à   áà¥¤îî ª®¯ªã ¬ëè¨                                          |
 ;.....................................................................................................
 ;; All rights reserved.                                                                              |
 ;;                                                                                                   |
 ;; Redistribution and use in source and binary forms, with or without modification, are permitted    |
 ;; provided that the following conditions are met:                                                   |
 ;****************************************************************************************************|
 ;                                                    |
 ;----------------------------------------------------------------------------------------------------/
   use32
   org	 0x0
   db	 'MENUET01'
   dd	 0x01
   dd	 START
   dd	 I_END
-  dd	 0x100000
+  dd	 I_END+4096
-  dd	 0x1000
+  dd	 I_END+4096
   dd	 params
   dd	 0x0
   include '..\..\..\macros.inc'
   WIN_W  equ 295            ; è¨à¨  ®ª
   WIN_H  equ 195            ; ¢ëá®â  ®ª
+  WIN_X  equ 250            ; ª®®à¤¨ â  å ®ª
+  WIN_Y  equ 190            ; ª®®à¤¨ â  ã ®ª
-  WIN_X  equ 250            ; ª®®à¤¨ â  å ®ª
+panel:
-  WIN_Y  equ 190            ; ª®®à¤¨ â  ã ®ª
-START:
+  file "panel.raw"
-; ®¡à ¡®âª  ¯ à ¬¥âà®¢ ª®¬ ¤®© áâà®ª¨
-    mov  edi,params         ; ãª § â¥«ì   áâà®ªã
+START:
-    call str_len            ; ¯®«ãç ¥¬ ¤«¨ã áâà®ª¨
-    cmp  eax,0              ; áâà ¢¨¢ ¥¬ ¤«¨ã á ã«ñ¬
-    je   red                ; ¥á«¨ ¯ à ¬¥âà®¢ ¥â â® ãå®¤¨¬
-    call    _read_params    ; ¨ ç¥ ç¨â ¥¬ ¯ à ¬¥âàë æ¢¥â  (®ç¥ì ªà¨¢®)
-    xor  eax,eax            ; § ã«ï¥¬ à¥£¨áâà
-    mov  al,byte [params]   ; ç¨â ¥¬ ¯ à ¬¥âà ¬®¤
-    cmp  al,'N'             ; áà ¢¨¢ ¥¬ á normal mode
-    jne _no_normalmode      ; ¥á«¨ ¥â â® ãå®¤¨¬   ¯à®¢¥àªã ¤ «ìè¥
-    mov  [runmode],1        ; ¥á«¨ ¤  â® ãáâ  ¢«¨¢ ¥¬ ¥£®
-    jmp  red                ; ¨¤ñ¬   ®âà¨á®¢ªã
-  _no_normalmode:           ; ¥á«¨ ¥ normal mode â®
-    cmp  al,'H'             ; ¢®§¬®¦® hidden mode
-    jne _no_hiddenmode      ; ¥á«¨ ¥ ® â® ãå®¤¨¬ ¤ «ìè¥
-    mov  [runmode],2        ; ¥á«¨ ® â® ãáâ  ¢«¨¢ ¥¬ çâ® íâ® ® ( å?)
-    call set_background     ; ¬¥ï¥¬ ä®
-    jmp  bexit              ; ¨ § ªàë¢ ¥¬ ¯à®£ã
-  _no_hiddenmode:           ; ¥á«¨ ¥ hidden mode
-    cmp  al,'D'             ; ¢®§¬®¦® íâ® color dialog mode
-    jne _no_dialogmode      ; ¥á«¨ ¢áñ â ª¨ ¥ ® â® ãå®¤¨¬
-    mov  [runmode],3        ; ¨ ç¥ ãª §ë¢ ¥¬ çâ® íâ® â ª¨ ®
-    jmp  red                ; ¨ ãå®¤¨¬   ¢ë¯®«¥¨¥
-  _no_dialogmode:           ; ¥á«¨ íâ® ¨ ®¤¨ ¨§ § ï¢«¥ëå ¬®¤®¢
+    mcall   68,11                         ; ¨¨æ¨ «¨§ æ¨ï ªãç¨
-    mov  [runmode],1        ; â® á¡à áë¢ ¥¬   ¤¥ä®«â
+    mcall   40,0x27                       ; ãáâ  ¢«¨¢ ¥¬ ¬ áªã á®¡ëâ¨©
-    jmp  red                ; ¨ à¨áã¥¬
+    include 'params_init.inc'             ; ®¡à ¡®âª  ¯ à ¬¥âà®¢ ª®¬ ¤®© áâà®ª¨
     je      red                           ; ¥á«¨ ¤  -   ¬¥âªã red
     cmp     eax,2                         ;  ¦ â  ª« ¢¨è  ?
     je      key                           ; ¥á«¨ ¤  -   key
     cmp     eax,3                         ;  ¦ â  ª®¯ª  ?
     je      button                        ; ¥á«¨ ¤  -   button
+    cmp     eax,6                         ; á®¡ëâ¨¥ ®â ¬ëè¨ ¢¥ ®ª
+    je      mouse                         ; ¥á«¨ ¤  -   button
     jmp     still                         ; ¥á«¨ ¤àã£®¥ á®¡ëâ¨¥ - ¢  ç «® æ¨ª«
 ;end_still
 key:                                      ;  ¦ â  ª« ¢¨è    ª« ¢¨ âãà¥
     mcall   2                             ; äãªæ¨ï 2 - áç¨â âì ª®¤ á¨¬¢®«  (¢ ah) (âãâ ¢ ¯à¨æ¨¯¥ ¥ ã¦ )
     jmp     still                         ; ¢¥àãâìáï ª  ç «ã æ¨ª«
+;end_key
+mouse:
+    mov     eax,[renmode]
+    cmp     eax,2
+    jnz     still
+    call    cyrcle_draw
+    mcall   37,2
+    cmp     al,100b
+    jne     still
+    mov     [color],edx
+    call    draw_result
+    jmp     still                         ; ¢¥àãâìáï ª  ç «ã æ¨ª«
-;end_key
+;end_mouse
 button:
     mcall   17                            ; 17 - ¯®«ãç¨âì ¨¤¥â¨ä¨ª â®à  ¦ â®© ª®¯ª¨
     cmp     ah, 1                         ; ¥á«¨  ¦ â  ª®¯ª  á ®¬¥à®¬ 1,
     call    set_background                ; ¨ ç¥ ãáâ  ¢«¨¢ ¥¬ ä®
     jmp     still                         ; ¨   ®¦¨¤ ¨¥ á®¡ëâ¨ï
   circle_bg:
     cmp     ah, 15                        ; ®¯ª  àã£®¢ ï ¯ «¨âà
     jne     next_end                      ; ¥á«¨ ¥  ¦ â  â® ¢ëå®¤¨¬
-    ;mov     [renmode],2                   ; ¢ª«îç ¥¬ ®âà¨á®¢ªã ªàã£®¢®© ¯ «¨âàë
+    mov     [renmode],2                   ; ¢ª«îç ¥¬ ®âà¨á®¢ªã ªàã£®¢®© ¯ «¨âàë
     call    draw_palitra                  ;
     jmp     still                         ; ¨   ®¦¨¤ ¨¥ á®¡ëâ¨ï
   next_end:
     cmp     ah,13                         ; COLOR SWAP
     jne     color_swap_end
     mov     ebx,266 shl 16+16             ; [x] + [size]
     mov     ecx,9 shl 16+16               ; [y] + [size]
     mov     edx,0x6000000C                ; ID = 12
     mov     esi,[sc.work_button]          ; RGB
     int     0x40                          ; call
-    mov     eax,13                        ; draw rect
-    mov     ebx,266 shl 16+16             ; [x] + [size]
-    mov     ecx,9 shl 16+16               ; [y] + [size]
-    mov     edx,0x666666                  ; RGB
-    push    esi                           ; backup esi
-    mov     esi,8                         ; counter=8
-    draw_lpanel:                          ; loop label
-      int     0x40                        ; call draw black rect
-      add     ecx,19 shl 16               ; move rect
-      dec     esi                         ; decrement counter
-      cmp     esi,0                       ; if counter!=zero
-      jne     draw_lpanel                 ; then goto label
-      mov     esi,8                       ; else counter=8
-      mov     ebx,267 shl 16+14           ; [x] + [size]
-      mov     ecx,10 shl 16+14            ; [y] + [size]
-      mov     edx,0xF3F3F3                ; RGB
+    ; circle diagram
-    draw_lpanel2:                         ; 2 loop label
-      int     0x40                        ; call draw white rect
-      add     ecx,19 shl 16               ; move rect
+    add     ecx,19 shl 16                 ; move rect
-      dec     esi                         ; decrement counter
-      cmp     esi,0                       ; if counter!=0
-      jne     draw_lpanel2                ; then goto label2
-    pop     esi                           ; restore esi
-    ; draw_left_arrow for button_next_colorsheme
-    mov     eax,4                         ; Write string
-    mov     ebx,272 shl 16+13             ; [x] + [y]
-    mov     ecx,0x0                       ; RGB
-    mov     edx,larrow                    ; string pointer
-    mov     esi,1                         ; count symbol
-    int     0x40                          ; call
-    mov     eax,38                        ; draw line
-    mov     ebx,270 shl 16+272            ; [start x] + [end x]
-    mov     ecx,16 shl 16+16              ; [start y] + [end y]
-    mov     edx,0x0                       ; RGB
+    mov     edx,0x6000000F                ; ID = 15
     int     0x40                          ; call
+    mov     eax,7                         ; 7 - ®¬¥à äãªæ¨¨
+    mov     ebx,panel                     ; ãª § â¥«ì   ¨§®¡à ¦¥¨¥ ¢ ä®à¬ â¥ BBGGRRBBGGRR...
+    mov     ecx, 16 shl 16 + 149          ; [à §¬¥à ¯® ®á¨ x]*65536 + [à §¬¥à ¯® ®á¨ y]
+    mov     edx,266 shl 16 +   9            ; [ª®®à¤¨ â  ¯® ®á¨ x]*65536 + [ª®®à¤¨ â  ¯® ®á¨ y]
+    int     0x40
+    ;mov     eax,13                        ; draw rect
+    ;mov     ebx,266 shl 16+16             ; [x] + [size]
+    ;mov     ecx,9 shl 16+16               ; [y] + [size]
+    ;mov     edx,0x666666                  ; RGB
+    ;push    esi                           ; backup esi
+    ;mov     esi,8                         ; counter=8
+    ;draw_lpanel:                          ; loop label
+    ;  int     0x40                        ; call draw black rect
+    ;  add     ecx,19 shl 16               ; move rect
+    ;  dec     esi                         ; decrement counter
+    ;  cmp     esi,0                       ; if counter!=zero
+    ;  jne     draw_lpanel                 ; then goto label
+    ;  mov     esi,8                       ; else counter=8
+    ;  mov     ebx,267 shl 16+14           ; [x] + [size]
+    ;  mov     ecx,10 shl 16+14            ; [y] + [size]
+    ;  mov     edx,0xF3F3F3                ; RGB
+    ;draw_lpanel2:                         ; 2 loop label
+    ;  int     0x40                        ; call draw white rect
+    ;  add     ecx,19 shl 16               ; move rect
+    ;  dec     esi                         ; decrement counter
+    ;  cmp     esi,0                       ; if counter!=0
+    ;  jne     draw_lpanel2                ; then goto label2
+    ;pop     esi                           ; restore esi
+    ; draw_left_arrow for button_next_colorsheme
+    ;mov     eax,4                         ; Write string
+    ;mov     ebx,272 shl 16+13             ; [x] + [y]
+    ;mov     ecx,0x0                       ; RGB
+    ;mov     edx,larrow                    ; string pointer
+    ;mov     esi,1                         ; count symbol
+    ;int     0x40                          ; call
+    ;mov     eax,38                        ; draw line
+    ;mov     ebx,270 shl 16+272            ; [start x] + [end x]
+    ;mov     ecx,16 shl 16+16              ; [start y] + [end y]
+    ;mov     edx,0x0                       ; RGB
+    ;int     0x40                          ; call
     ret                                   ; return
     ;.................................................................................................
     ;.................................................................................................
     mov     eax,14                        ; ¯à¥¤¥«ï¥¬ è¨à¨ã íªà   (eax = [xsize]*65536 + [ysize])
     int     0x40                          ; xsize = à §¬¥à ¯® £®à¨§®â «¨ - 1
     mov     ebx,eax                       ;
     shr     ebx,16                        ; ebx = xsize-1
-    ;movzx   edx,ax                       ;; edx = ysize-1 («¨è¨© ª®¤)
+    movzx   edx,ax                        ; edx = ysize-1 («¨è¨© ª®¤)
     inc     ebx                           ; ebx = xsize
-    ;inc     edx                          ;; edx = ysize («¨è¨© ª®¤)
+    inc     edx                           ; edx = ysize («¨è¨© ª®¤)
     mov     [desctop_w],ebx
+    mov     [desctop_h],edx
     ret
 ;end_desktop_get
 mouse_get:
     mov     ebx,110 shl 16+148            ;  ç «ìë¥ ª®®à¤¨ âë ¯® x [ª-â  x]*65536 + [à §¬¥à]
     mov     ecx,9 shl 16+148              ;  ç «ìë¥ ª®®à¤¨ âë ¯® y [ª-â  y]*65536 + [à §¬¥à]
     mov     edx,[sc.work]                 ; æ¢¥â
     int     0x40
-    ;cmp     [renmode],2
+    cmp     [renmode],2
-    ;je      cyrcle_draw
+    je      cyrcle_draw
     ;cmp     [renmode],1
     ;je      picker_draw
     cmp     [renmode],0
     je      sheme_draw
     ret
     ;.................................................................................................
     ; âà¨á®¢ª  ªàã£®¢®© ¤¨ £à ¬¬ë
+    ;.................................................................................................
+    cyrcle_draw:
+    ;mov     eax,13
+    ;mov     edx,0x666666
+    ;mov     ebx,108*65536+152
+    ;mov     ecx,125*65536+33
+    ;mcall
+    ;mov     edx,0xF3F3F3
+    ;mov     ebx,109*65536+150
+    ;mov     ecx,126*65536+31
-    ;.................................................................................................
+    ;mcall
+    ;mov     eax,4                         ; 4 - ¢ë¢¥áâ¨ áâà®ªã â¥ªáâ  ¢ ®ª®
-    ;cyrcle_draw:
+    ;mov     ebx,115 shl 16+131            ; [ª®®à¤¨ â  ¯® ®á¨ x]*65536 + [ª®®à¤¨ â  ¯® ®á¨ y]
-    ;mov     eax,7                         ; 7 - ®¬¥à äãªæ¨¨
+    ;mov     ecx,0x666666                  ; 0xX0RRGGBB (RR, GG, BB § ¤ îâ æ¢¥â â¥ªáâ )
+    ;mov     edx,hint                      ; ãª § â¥«ì    ç «® áâà®ª¨
-    ;mov     ebx,circle                    ; ãª § â¥«ì   ¨§®¡à ¦¥¨¥ ¢ ä®à¬ â¥ BBGGRRBBGGRR...
+    ;mov     esi,24                        ; ¢ë¢®¤¨âì esi á¨¬¢®«®¢
+    ;mcall
+    ;mov     ebx,125 shl 16+144            ; [ª®®à¤¨ â  ¯® ®á¨ x]*65536 + [ª®®à¤¨ â  ¯® ®á¨ y]
+    ;mov     edx,hint2                     ; ãª § â¥«ì    ç «® áâà®ª¨
+    ;mov     esi,21                        ; ¢ë¢®¤¨âì esi á¨¬¢®«®¢
+    ;mcall
+    mov     eax,13
+    mov     edx,0x666666
+    mov     ebx,111*65536+145
+    mov     ecx,  9*65536+145
+    mcall
+    ;mov     edx,[color]
+    ;mov     ebx,109*65536+150
+    ;mov     ecx, 10*65536+150
+    ;mcall
+    call    mouse_local                   ; ¯®«ãç ¥¬ ª®®à¤¨ âë ¬ëè¨ ®â®á¨â¥«ì® ®ª
+    mov     ecx, [mouse_x]                ; § ®á¨¬ ¢ à¥£¨áâà
+    mov     edx, [mouse_y]                ; § ®á¨¬ ¢ à¥£¨áâà
+    cmp     ecx, WIN_W-10
+    jg      cyrcle_draw_2
+    cmp     edx, WIN_H
+    jle     end_cyrcle_draw
+    cyrcle_draw_2:
+    call    desktop_get
+    call    mouse_global
+    mov     ebx,112*65536+11
+    mov     esi,0                         ; counter=8
+    circle_loop:
+      mov     ecx, 10*65536+11
+      mov     edi,0
+      circle_loop2:
+        mov     eax,13
+        call    circle_pixel_read
+        mcall
+        add     ecx,11 shl 16
+        inc     edi
+        cmp     edi,13
+        jne     circle_loop2
+      add     ebx,11 shl 16
+      inc     esi
+      cmp     esi,13
+      jne     circle_loop
+    mov     eax,13
+    mov     edx,0x0
+    mov     ebx,177*65536+13
+    mov     ecx, 76*65536+13
+    mcall
+    mov     ecx, [mouse_x]
-    ;mov     ecx,148 shl 16 + 148          ; [à §¬¥à ¯® ®á¨ x]*65536 + [à §¬¥à ¯® ®á¨ y]
+    mov     edx, [mouse_y]
+    inc     ecx
+    inc     edx
+    mov     ebx, edx
+    imul    ebx, [desctop_w]
+    add     ebx, ecx
+    mov     eax, 35
+    mcall
+    mov     edx,eax
+    mov     eax,13
+    mov     ebx,178*65536+11
+    mov     ecx, 77*65536+11
-    ;mov     edx,110 shl 16 + 9            ; [ª®®à¤¨ â  ¯® ®á¨ x]*65536 + [ª®®à¤¨ â  ¯® ®á¨ y]
+    mcall
+    end_cyrcle_draw:
+    ret
+    circle_pixel_read:
+    push    ecx
+    push    ebx
+    push    eax
+    mov     ecx, [mouse_x]
+    mov     edx, [mouse_y]
+    inc     ecx
+    add     ecx, esi
+    cmp     ecx, 6
+    jl      _cpr_exit
+    sub     ecx, 6
+    inc     edx
+    add     edx, edi
+    cmp     edx, 6
+    jl      _cpr_exit
+    sub     edx, 6
+    mov     ebx, edx
+    imul    ebx, [desctop_w]
+    add     ebx, ecx
+    mov     eax, 35
+    mcall
+    mov     edx,eax
+    pop     eax
+    pop     ebx
+    pop     ecx
+    ret
+    _cpr_exit:
+    mov     edx,0x00000000
+    pop     eax
+    pop     ebx
-    ;int     0x40
+    pop     ecx
-    ;ret
+    ret
 	pop ecx
 	ret
-;end_str_len
-    ;.................................................................................................
-    ; ¢®§¢à é ¥â ãª § â¥«ì   ¯¥à¢®¥ ¢å®¦¤¥¨¥ Chr L (¢å®¤->EDI string ; ¢ëå®¤->EAX offset)
-    ;.................................................................................................
-;strscan:
-;    push ecx ; ¤«¨  áâà®ª¨
-;    push ebx ; ãª § â¥«ì   á¨¬¢®« (bl)
-;    push esi ; ¯à¨£®¤¨âáï
-;    push edi ; ãª § â¥«ì   áâà®ªã
-;    mov esi, edi
-;    mov al,bl
-;    repne scasb
-;    sub edi, esi
-;    mov eax, edi
-;    dec eax
-;    pop edi
-;    pop esi
-;    pop ebx
-;    pop ecx
-;    ret
-;end;
 ;end_str_len
 ;#___________________________________________________________________________________________________
 ;****************************************************************************************************|
 ;                                                                             |
 ;----------------------------------------------------------------------------------------------------/
 circle:
     cm          db 12 dup(0)
     color       dd 00000000h              ; åà ¨â § ç¥¨¥ ¢ë¡à ®£® æ¢¥â
     color2      dd 00FFFFFFh              ; åà ¨â § ç¥¨¥ ¢â®à®£® ¢ë¡à ®£® æ¢¥â
+    mouse_x     dd 0                      ; åà ¨â £«®¡ «ìãî å ª®®à¤¨ âã ¬ëè¨
-    mouse_x     dd 0                      ; åà ¨â £«®¡ «ìãî å ª®®à¤¨ âã ¬ëè¨
+    mouse_y     dd 0                      ; åà ¨â £«®¡ «ìãî ã ª®®à¤¨ âã ¬ëè¨
-    mouse_y     dd 0                      ; åà ¨â £«®¡ «ìãî ã ª®®à¤¨ âã ¬ëè¨
+    mouse_f     dd 0                      ; åà ¨â ¤ ë¥ ® â®¬ ª ª ï ª®¯ª  ¬ëè¨ ¡ë«   ¦ â
-    mouse_f     dd 0                      ; åà ¨â ¤ ë¥ ® â®¬ ª ª ï ª®¯ª  ¬ëè¨ ¡ë«   ¦ â
+    desctop_w   dd 0                      ; åà ¨â è¨à¨ã íªà
-    desctop_w   dd 0                      ; åà ¨â è¨à¨ã íªà
+    desctop_h   dd 0                      ; åà ¨â ¢ëá®âã íªà
     sc          system_colors             ; åà ¨â áâàãªâãàã á¨áâ¥¬ëå æ¢¥â®¢ áª¨
-    title       db 'Palitra v0.6',0       ; åà ¨â ¨¬ï ¯à®£à ¬¬ë
+    title       db 'Palitra v0.7',0       ; åà ¨â ¨¬ï ¯à®£à ¬¬ë
     hidden      db 'Hidden',0
     pnext       dd 0                      ; áç¥âç¨ª ¯¥à¥ª«îç¥¨ï ¯ «¨âàë
     renmode     dd 0                      ; à¥¦¨¬ ®âà¨á®¢ª¨ (1-æ¢¥â®¢ ï áå¥¬ ,2-¯¨¯¥âª ,3-ªàã£®¢ ï)
     runmode     dd 1                      ; à¥¦¨¬ § ¯ãáª  (1-normal, 2-hidden, 3-colordialog)
     params      db 20 dup(0)              ; ¯à¨ñ¬ ¯ à ¬¥âà®¢
     params_c    db 9  dup(0)              ; ¯à¨ñ¬¨ª ¤«ï æ¢¥â
 I_END:

Subversion Repositories Kolibri OS

(root)/programs/media/palitra/trunk/palitra.asm – Rev 3099 → 3453