WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/gui/button.inc

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2015. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2016. All rights reserved. ;;
 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 5594 $
-;==============================================================================
-;///// public functions ///////////////////////////////////////////////////////
-;==============================================================================
+$Revision: 6078 $
 button.MAX_BUTTONS = 4095
         height          dw ?
         id_hi           dw ?
                         dw ?
 ends
-align 4
-;------------------------------------------------------------------------------
+;---------------------------------------------------------------
-syscall_button: ;///// system function 8 //////////////////////////////////////
+syscall_button: ;////////////// system function 8 //////////////
-;------------------------------------------------------------------------------
+;---------------------------------------------------------------
 ;? Define/undefine GUI button object
-;------------------------------------------------------------------------------
+;---------------------------------------------------------------
 ;; Define button:
 ;> ebx = pack[16(x), 16(width)]
 ;> ecx = pack[16(y), 16(height)]
 ;> edx = pack[8(flags), 24(button identifier)]
 ;>       flags bits:
 ;>          7 (31) = 0
 ;>          6 (30) = don't draw button
 ;>          5 (29) = don't draw button frame when pressed
 ;> esi = button color
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ;; Undefine button:
 ;> edx = pack[8(flags), 24(button identifier)]
 ;>       flags bits:
 ;>          7 (31) = 1
-;------------------------------------------------------------------------------
+;---------------------------------------------------------------
         ; do we actually need to undefine the button?
         test    edx, 0x80000000
         jnz     .remove_button
         add     cx, word[eax + APPDATA.wnd_clientbox.top]
         rol     ecx, 16
         pop     eax
-        ; basic checks passed, define the button
-        push    ebx ecx edx
+        ; basic checks passed, define the button
         inc     eax
         mov     [edi], ax
         shl     eax, 4
         add     edi, eax
-        ; NOTE: this code doesn't rely on SYS_BUTTON struct, please revise it
+; NOTE: this code doesn't rely on SYS_BUTTON struct,
-        ;       if you change something
+; please revise it, if you change something.
         mov     ax, [CURRENT_TASK]
         stosw
         mov     ax, dx
         stosw               ; button id number: bits 0-15
         rol     eax, 16
         stosd               ; y start | y size
         mov     eax, edx
         shr     eax, 16
         stosw               ; button id number: bits 16-31
-        pop     edx ecx ebx
         ; do we also need to draw the button?
         test    edx, 0x40000000
-        jnz     .exit
-        ; draw button body
-        pushad
+        jnz     .exit
-        ; calculate window-relative coordinates
-        movzx   edi, cx
+        and     esi, 0xFFFFFF
-        shr     ebx, 16
-        shr     ecx, 16
-        mov     eax, [TASK_BASE]
-        add     ebx, [eax - twdw + WDATA.box.left]
-        add     ecx, [eax - twdw + WDATA.box.top]
+        xor     edi, edi
-        mov     eax, ebx
-        inc     eax
-        shl     eax, 16
-        mov     ax, bx
+        push    ebx ecx esi
-        add     ax, word[esp + 16]
-        dec     ax
+        dec     cx
-        mov     ebx, ecx
+        dec     cx
-        shl     ebx, 16
-        mov     bx, cx
+        cmp     [buttontype], 1
-        ; calculate initial color
-        mov     ecx, esi
+        jnz     .draw
-        cmp     [buttontype], 0
-        je      @f
+        cmp     cx, 65
+        jnc     .draw
+        ; calculate gradient data
+        mov     eax, esi
+        shl     eax, 8
+        mov     edx, 3
+.calculate:
+        rol     eax, 8
+        shl     al, 1
+        jnc     @f
+        neg     al
+        jnz     @f
+        mov     al, 64
+@@:
-        call    button._.incecx2
+        cmp     al, 65
+        jc      @f
-        ; set button height counter
+        mov     al, 64
-    @@:
+@@:
-        mov     edx, edi
-        add     ebx, 0x00010001
-        dec     edx
-  .next_line:
+        div     cl
-        call    button._.button_dececx
-        push    edi
-        xor     edi, edi
+        shl     ax, 8
-;        call    [draw_line]
-        call    __sys_draw_line
+        dec     edx
-        pop     edi
+        jnz     .calculate
-        add     ebx, 0x00010001
-        dec     edx
+        mov     dl, cl
-        jnz     .next_line
+        dec     edx
-        popad
+        shr     edx, 1
+        shr     eax, 8
-        ; draw button frame
+        mov     edi, eax
+        mul     edx
+        add     esi, eax
-        push    ebx ecx
+.draw:  ; calculate window-relative coordinates
         movzx   ebp, cx
-        ; calculate window-relative coordinates
+        dec     ebp
         shr     ebx, 16
         shr     ecx, 16
-        mov     eax, [TASK_BASE]
-        add     ebx, [eax - twdw + WDATA.box.left]
-        add     ecx, [eax - twdw + WDATA.box.top]
+        mov     eax, [TASK_BASE]
+        add     ebx, [eax - twdw + WDATA.box.left]
-        ; top border
+        add     ecx, [eax - twdw + WDATA.box.top]
         mov     eax, ebx
+        inc     eax
-        shl     eax, 16
+        mov     edx, ebx
-        mov     ax, bx
-        add     ax, [esp + 4]
-        mov     ebx, ecx
-        shl     ebx, 16
-        mov     bx, cx
-        push    ebx
-        xor     edi, edi
-        mov     ecx, esi
-        call    button._.incecx
-;        call    [draw_line]
-        call    __sys_draw_line
-        ; bottom border
-        movzx   edx, word[esp + 4 + 0]
-        add     ebx, edx
+        add     dx, [esp+8]
+        dec     edx
+        mov     ebx, ecx
+        mov     ecx, esi
+        shr     ecx, 1
+        and     cx, 7F7Fh
+        push    esi
+        mov     esi, edi
+        xor     edi, edi
+        call    hline   ; top border
+        inc     ebx
+        or      ecx, 808080h
+        call    hline   ; top light line
-        shl     edx, 16
+        pop     ecx
+        inc     ebx
+.next_line:
+        call    hline   ; button body
-        add     ebx, edx
+        inc     ebx
+        sub     ecx, esi
+        dec     ebp
+        jnz     .next_line
+        shr     ecx, 2
+        and     cx, 3F3Fh
-        mov     ecx, esi
+        mov     ebp, ecx
-        call    button._.dececx
-;        call    [draw_line]
+        shl     ecx, 1
+        add     ecx, ebp
+        call    hline   ; bottom dark line
-        call    __sys_draw_line
+        inc     ebx
+        sub     ecx, ebp
+        call    hline   ; bottom border
         pop     ecx
-        ; left border
-        pop     ebx
-        push    edx
-        mov     edx, eax
+        shr     ecx, 1
+        inc     edx
-        shr     edx, 16
+        push    edx
-        mov     ax, dx
+        mov     edx, ebx
-        mov     edx, ebx
+        sub     bx, [esp+4]
+        dec     edx
-        shr     edx, 16
+        inc     ebx
-        mov     bx, dx
+        cmp     [buttontype], 0
+        jnz     @f
-        add     bx, [esp + 4 + 0]
+        dec     edx
+        or      ecx, 808080h
-        pop     edx
+        call    vline   ; left light line
-        mov     ecx, esi
+        inc     edx
-        call    button._.incecx
+@@:
-;        call    [draw_line]
+        and     ecx, 7F7F7Fh
-        dec     ebx
+        dec     eax
-        call    __sys_draw_line
+        call    vline   ; left border
+        pop     eax
-        ; right border
+        call    vline   ; right border
-        mov     dx, [esp + 4]
+        cmp     [buttontype], 0
-        add     ax, dx
+        jnz     @f
-        shl     edx, 16
+        mov     ebp, ecx
-        add     eax, edx
+        shr     ecx, 1
-        add     ebx, 0x00010000
+        and     cx, 7F7Fh
-        mov     ecx, esi
+        add     ecx, ebp
-        call    button._.dececx
+        dec     eax
-;        call    [draw_line]
+        inc     ebx
-        call    __sys_draw_line
         call    vline   ; right dark line
-        pop     ecx ebx
+@@:
         pop     ecx ebx
-  .exit:
+.exit:
         ret
 ; FIXME: mutex needed
-syscall_button.remove_button:
+.remove_button:
         and     edx, 0x00ffffff
         dec     dword[edi]
         add     ecx, -sizeof.SYS_BUTTON
         pop     ebx
         jmp     .next_button
-  .exit:
-        ret
-align 4
-;------------------------------------------------------------------------------
+;---------------------------------------------------------------
-sys_button_activate_handler: ;/////////////////////////////////////////////////
-;------------------------------------------------------------------------------
+sys_button_activate_handler:
-;?
+sys_button_deactivate_handler:
-;------------------------------------------------------------------------------
+;---------------------------------------------------------------
 ;> eax = pack[8(process slot), 24(button id)]
 ;> ebx = pack[16(button x coord), 16(button y coord)]
-;> cl = mouse button mask this system button was pressed with
-;------------------------------------------------------------------------------
-        call    button._.find_button
-        or      eax, eax
-        jz      .exit
-        mov     ebx, dword[eax + SYS_BUTTON.id_hi - 2]
-        call    button._.negative_button
-  .exit:
-        ret
-align 4
-;------------------------------------------------------------------------------
-sys_button_deactivate_handler: ;///////////////////////////////////////////////
-;------------------------------------------------------------------------------
-;?
-;------------------------------------------------------------------------------
-;> eax = pack[8(process slot), 24(button id)]
-;> ebx = pack[16(button x coord), 16(button y coord)]
-;> cl = mouse button mask this system button was pressed with
-;------------------------------------------------------------------------------
-        call    button._.find_button
-        or      eax, eax
-        jz      .exit
-        mov     ebx, dword[eax + SYS_BUTTON.id_hi - 2]
-        call    button._.negative_button
-  .exit:
-        ret
-align 4
-;------------------------------------------------------------------------------
-sys_button_perform_handler: ;//////////////////////////////////////////////////
-;------------------------------------------------------------------------------
-;?
-;------------------------------------------------------------------------------
-;> eax = pack[8(process slot), 24(button id)]
-;> ebx = pack[16(button x coord), 16(button y coord)]
-;> cl = mouse button mask this system button was pressed with
-;------------------------------------------------------------------------------
-        shl     eax, 8
-        mov     al, cl
-        movzx   ebx, byte[BTN_COUNT]
-        mov     [BTN_BUFF + ebx * 4], eax
-        inc     bl
-        mov     [BTN_COUNT], bl
-        ret
-;==============================================================================
-;///// private functions //////////////////////////////////////////////////////
-;==============================================================================
-;------------------------------------------------------------------------------
-button._.find_button: ;////////////////////////////////////////////////////////
+;> cl = mouse button mask this system button was pressed with
-;------------------------------------------------------------------------------
+;---------------------------------------------------------------
-;? Find system button by specified process slot, id and coordinates
-;------------------------------------------------------------------------------
-;> eax = pack[8(process slot), 24(button id)] or 0
-;> ebx = pack[16(button x coord), 16(button y coord)]
-;------------------------------------------------------------------------------
-;< eax = pointer to SYS_BUTTON struct or 0
-;------------------------------------------------------------------------------
+; find system button by specified process slot, id and coordinates
-        push    ecx edx esi edi
         push    ecx edx esi edi
         mov     edx, eax
         shr     edx, 24
-        and     eax, 0x0ffffff
         and     eax, 0x0ffffff
         mov     edi, [BTN_ADDR]
         mov     ecx, [edi]
         imul    esi, ecx, sizeof.SYS_BUTTON
         add     esi, edi
         inc     ecx
-        add     esi, sizeof.SYS_BUTTON
         add     esi, sizeof.SYS_BUTTON
-  .next_button:
+.next_button:
         dec     ecx
-        jz      .not_found
         jz      .popexit
         add     esi, -sizeof.SYS_BUTTON
         ; does it belong to our process?
         mov     edi, dword[esi + SYS_BUTTON.left - 2]
         mov     di, [esi + SYS_BUTTON.top]
         cmp     ebx, edi
         jne     .next_button
         ; okay, return it
-        mov     eax, esi
-        jmp     .exit
-  .not_found:
-        xor     eax, eax
-  .exit:
+        mov     eax, esi
-        pop     edi esi edx ecx
-        ret
-;------------------------------------------------------------------------------
-button._.dececx: ;/////////////////////////////////////////////////////////////
-;------------------------------------------------------------------------------
-;?
-;------------------------------------------------------------------------------
-        sub     cl, 0x20
-        jnc     @f
-        xor     cl, cl
-    @@:
-        sub     ch, 0x20
-        jnc     @f
-        xor     ch, ch
-    @@:
-        rol     ecx, 16
-        sub     cl, 0x20
-        jnc     @f
-        xor     cl, cl
-    @@:
-        rol     ecx, 16
-        ret
-;------------------------------------------------------------------------------
-button._.incecx: ;/////////////////////////////////////////////////////////////
-;------------------------------------------------------------------------------
-;?
-;------------------------------------------------------------------------------
-        add     cl, 0x20
-        jnc     @f
-        or      cl, -1
-    @@:
-        add     ch, 0x20
-        jnc     @f
-        or      ch, -1
-    @@:
-        rol     ecx, 16
-        add     cl, 0x20
-        jnc     @f
-        or      cl, -1
-    @@:
-        rol     ecx, 16
-        ret
-;------------------------------------------------------------------------------
-button._.incecx2: ;////////////////////////////////////////////////////////////
-;------------------------------------------------------------------------------
-;?
-;------------------------------------------------------------------------------
-        add     cl, 0x14
-        jnc     @f
-        or      cl, -1
-    @@:
-        add     ch, 0x14
-        jnc     @f
-        or      ch, -1
-    @@:
-        rol     ecx, 16
-        add     cl, 0x14
-        jnc     @f
-        or      cl, -1
-    @@:
-        rol     ecx, 16
-        ret
-;------------------------------------------------------------------------------
-button._.button_dececx: ;//////////////////////////////////////////////////////
-;------------------------------------------------------------------------------
-;?
-;------------------------------------------------------------------------------
+        pop     edi esi edx ecx
-        cmp     [buttontype], 1
-        jne     .finish
-        push    eax
-        mov     al, 1
-        cmp     edi, 20
-        jg      @f
-        mov     al, 2
-    @@:
-        sub     cl, al
-        jnc     @f
-        xor     cl, cl
-    @@:
-        sub     ch, al
-        jnc     @f
-        xor     ch, ch
-    @@:
-        rol     ecx, 16
-        sub     cl, al
-        jnc     @f
-        xor     cl, cl
-    @@:
-        rol     ecx, 16
-        pop     eax
-  .finish:
-        ret
-;------------------------------------------------------------------------------
-button._.negative_button: ;////////////////////////////////////////////////////
-;------------------------------------------------------------------------------
-;? Invert system button border
+        mov     ebx, dword[eax + SYS_BUTTON.id_hi - 2]
-;------------------------------------------------------------------------------
-        ; if requested, do not display button border on press.
+        ; display button border on press?
+        bt      ebx, 29
-        test    ebx, 0x20000000
+        jc      .exit
-        jnz     .exit
-        pushad
+        ; invert system button border
         pushad
-        xchg    esi, eax
+        mov     esi, eax
         mov     edi, ebx
-        movzx   ecx, [esi + SYS_BUTTON.pslot]
-        shl     ecx, 5
+        movzx   ecx, [esi + SYS_BUTTON.pslot]
-        add     ecx, window_data
+        shl     ecx, 5
         add     ecx, window_data
         mov     eax, dword[esi + SYS_BUTTON.left]
         mov     ebx, dword[esi + SYS_BUTTON.top]
         add     eax, [ecx + WDATA.box.left]
+        add     ebx, [ecx + WDATA.box.top]
+        mov     ecx, eax
+        mov     edx, ebx
+        bt      edi, 30
+        jc      @f
+        inc     ax
+        inc     bx
-        add     ebx, [ecx + WDATA.box.top]
+        dec     cx
-        push    eax ebx
+        dec     dx
-        pop     edx ecx
+@@:
         rol     eax, 16
-        rol     ebx, 16
-        add     ax, cx
+        rol     ebx, 16
-        add     bx, dx
+        add     ax, cx
-        mov     esi, 0x01000000
+        add     bx, dx
-        call    draw_rectangle.forced
         mov     esi, 1000000h
-        popad
+        call    draw_rectangle.forced
+        popad
+.exit:
+        ret
+.popexit:
+        pop     edi esi edx ecx
+        ret
+;---------------------------------------------------------------
+sys_button_perform_handler:
+;---------------------------------------------------------------
+;> eax = pack[8(process slot), 24(button id)]
+;> ebx = pack[16(button x coord), 16(button y coord)]
+;> cl = mouse button mask this system button was pressed with
+;---------------------------------------------------------------
+        shl     eax, 8
+        mov     al, cl
+        movzx   ebx, byte[BTN_COUNT]
+        mov     [BTN_BUFF + ebx * 4], eax

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/gui/button.inc – Rev 5594 → 6078