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

 ;; Copyright (C) KolibriOS team 2010-2015. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 5596 $
+$Revision: 5984 $
 include 'mousepointer.inc'
-;==============================================================================
+;================================
-;///// public functions ///////////////////////////////////////////////////////
+;/////// public functions ///////
-;==============================================================================
+;================================
 mouse.WINDOW_RESIZE_SE_FLAG = \
   mouse.WINDOW_RESIZE_S_FLAG or \
   mouse.WINDOW_RESIZE_E_FLAG
 align 4
-;------------------------------------------------------------------------------
+;-----------------------------------------------------------------
-mouse_check_events: ;//////////////////////////////////////////////////////////
-;------------------------------------------------------------------------------
+mouse_check_events:
-;? Check if mouse buttons state or cursor position has changed and call
-;? appropriate handlers
-;------------------------------------------------------------------------------
+; Check if mouse buttons state or cursor position has changed
-        push    eax ebx
         push    eax ebx
         mov     al, [BTN_DOWN]
         mov     bl, [mouse.state.buttons]
         and     al, mouse.BUTTONS_MASK
         mov     cl, al
         jnz     .check_buttons_released
         ; yes it is, activate window user is pointing at, if needed
         call    mouse._.activate_sys_window_under_cursor
-        ; NOTE: this code wouldn't be necessary if we knew window did
+; NOTE: this code wouldn't be necessary if we knew
-        ;       already redraw itself after call above
+; that window did already redraw itself after call above
         or      eax, eax
         jnz     .exit
   .call_middle_button_handler:
         test    eax, mouse.MIDDLE_BUTTON_FLAG
         jnz     mouse._.middle_button_press_handler
         jmp     mouse._.middle_button_release_handler
-;==============================================================================
+;===============================
-;///// private functions //////////////////////////////////////////////////////
+;////// private functions //////
-;==============================================================================
+;===============================
 uglobal
   mouse.state:
     .pos     POINT
     .buttons db ?
-  ; NOTE: since there's no unique and lifetime-constant button identifiers,
+; NOTE: since there's no unique and lifetime-constant button identifiers,
-  ;       we're using two dwords to identify each of them:
+; we are using two dwords to identify each of them:
-  ;       * pbid - process slot (high 8 bits) and button id (low 24 bits) pack
+;   * pbid - process slot (high 8 bits) and button id (low 24 bits) pack
-  ;       * coord - left (high 16 bits) and top (low 16 bits) coordinates pack
+;   * coord - left (high 16 bits) and top (low 16 bits) coordinates pack
     .delta      POINT
     .last_ticks dd ?
     .action     db ?
 endg
+iglobal
+        fl_moving db 0
+        rb 3
+endg
 align 4
-;------------------------------------------------------------------------------
+;-----------------------------------------------------------------
-mouse._.left_button_press_handler: ;///////////////////////////////////////////
-;------------------------------------------------------------------------------
+mouse._.left_button_press_handler:
+; Called when left mouse button has been pressed down
+        bts     word [BTN_DOWN], 8
+        mov     eax, [timer_ticks]
-;? Called when left mouse button has been pressed down
+        mov     ebx, eax
+        xchg    ebx, [mouse.active_sys_window.last_ticks]
+        sub     eax, ebx
+        movzx   ebx, [mouse_doubleclick_delay]
+        cmp     eax, ebx
+        jg      @f
+        bts     dword [BTN_DOWN], 24
-;------------------------------------------------------------------------------
+@@:
         test    [mouse.state.buttons], not mouse.LEFT_BUTTON_FLAG
         jnz     .exit
         xchg    eax, edx
         test    dl, mouse.WINDOW_MOVE_FLAG
         jz      @f
-        mov     eax, [timer_ticks]
-        mov     ebx, eax
-        xchg    ebx, [mouse.active_sys_window.last_ticks]
-        sub     eax, ebx
-        cmp     eax, 50
+        bt      dword [BTN_DOWN], 24
-        jg      @f
+        jnc     @f
         test    dl, mouse.WINDOW_RESIZE_E_FLAG
         jz      .call_window_handler
         call    .calculate_e_delta
-  .call_window_handler:
-;        mov     eax, mouse.active_sys_window.old_box
-;        call    sys_window_start_moving_handler
   .call_window_handler:
   .exit:
         ret
         sub     eax, [mouse.state.pos.x]
         mov     [mouse.active_sys_window.delta.x], eax
         ret
 align 4
-;------------------------------------------------------------------------------
+;-----------------------------------------------------------------
-mouse._.left_button_release_handler: ;/////////////////////////////////////////
-;------------------------------------------------------------------------------
+mouse._.left_button_release_handler:
-;? Called when left mouse button has been released
+; Called when left mouse button has been released
-;------------------------------------------------------------------------------
+        bts     dword [BTN_DOWN], 16
         xor     esi, esi
         xchg    esi, [mouse.active_sys_window.pslot]
         or      esi, esi
         mov     ebx, mouse.active_sys_window.new_box
         call    sys_window_end_moving_handler
   .exit:
+        and     [mouse.active_sys_window.action], 0
-        and     [mouse.active_sys_window.action], 0
+        mov     [fl_moving], 0
-        ret
-align 4
+        ret
-;------------------------------------------------------------------------------
-mouse._.right_button_press_handler: ;//////////////////////////////////////////
-;------------------------------------------------------------------------------
-;? Called when right mouse button has been pressed down
+mouse._.right_button_press_handler:
-;------------------------------------------------------------------------------
+        bts     word [BTN_DOWN], 9
-        test    [mouse.state.buttons], not mouse.RIGHT_BUTTON_FLAG
-        jnz     .exit
+        test    [mouse.state.buttons], not mouse.RIGHT_BUTTON_FLAG
         jnz     @f
         call    mouse._.find_sys_window_under_cursor
         call    mouse._.check_sys_window_actions
-        test    al, mouse.WINDOW_MOVE_FLAG
-        jz      .exit
+        test    al, mouse.WINDOW_MOVE_FLAG
+        jz      @f
+        jmp     sys_window_rollup_handler
-        call    sys_window_rollup_handler
+mouse._.right_button_release_handler:
-  .exit:
-        ret
+        bts     dword [BTN_DOWN], 17
-align 4
+@@:
-;------------------------------------------------------------------------------
-mouse._.right_button_release_handler: ;////////////////////////////////////////
+        ret
-;------------------------------------------------------------------------------
-;? Called when right mouse button has been released
-;------------------------------------------------------------------------------
-        ret
+mouse._.middle_button_press_handler:
-align 4
-;------------------------------------------------------------------------------
+        bts     word [BTN_DOWN], 10
-mouse._.middle_button_press_handler: ;/////////////////////////////////////////
+        ret
-;------------------------------------------------------------------------------
-;? Called when middle mouse button has been pressed down
-;------------------------------------------------------------------------------
-        ret
+mouse._.middle_button_release_handler:
-align 4
-;------------------------------------------------------------------------------
-mouse._.middle_button_release_handler: ;///////////////////////////////////////
-;------------------------------------------------------------------------------
-;? Called when middle mouse button has been released
-;------------------------------------------------------------------------------
-        ret
+        bts     dword [BTN_DOWN], 18
-align 4
+        ret
 ;------------------------------------------------------------------------------
-mouse._.move_handler: ;////////////////////////////////////////////////////////
-;------------------------------------------------------------------------------
+align 4
-;? Called when cursor has been moved
+;-----------------------------------------------------------------
-;------------------------------------------------------------------------------
+mouse._.move_handler:
-;> eax = old x coord
+; Called when cursor has been moved
         repe
         cmpsd
         pop     esi
         je      .exit
+        test    [fl_moving], 1
+        jnz     @f
+        mov     [fl_moving], 1
+        push    edi
+        mov     edi, esi
+        shl     edi, 5
+        add     edi, WDATA.box + window_data
+        call    window._.draw_negative_box
+        pop     edi
+     @@:
         mov     [mouse.active_sys_window.last_ticks], 0
         call    sys_window_moving_handler
   .exit:
         ret
-align 4
-;------------------------------------------------------------------------------
+align 4
-mouse._.find_sys_window_under_cursor: ;////////////////////////////////////////
+;-----------------------------------------------------------------
-;------------------------------------------------------------------------------
-;? Find system window object which is currently visible on screen and has
+mouse._.find_sys_window_under_cursor:
-;? mouse cursor within its bounds
+; Find system window object which is currently visible on screen
-;------------------------------------------------------------------------------
-;< esi = process slot
+; and has mouse cursor within its bounds
-;< edi = pointer to WDATA struct
+;< esi = process slot
-;------------------------------------------------------------------------------
+;< edi = pointer to WDATA struct
         mov     esi, [mouse.state.pos.y]
         shl     edi, 5
         add     edi, window_data
         ret
 align 4
-;------------------------------------------------------------------------------
+;-----------------------------------------------------------------
-mouse._.activate_sys_window_under_cursor: ;////////////////////////////////////
-;------------------------------------------------------------------------------
-;?
-;------------------------------------------------------------------------------
+mouse._.activate_sys_window_under_cursor:
-        ; activate and redraw window under cursor (if necessary)
+; activate and redraw window under cursor (if necessary)
         call    mouse._.find_sys_window_under_cursor
         movzx   esi, word[WIN_STACK + esi * 2]
         lea     esi, [WIN_POS + esi * 2]
         jmp     waredraw
 align 4
-;------------------------------------------------------------------------------
-mouse._.find_sys_button_under_cursor: ;////////////////////////////////////////
+;-----------------------------------------------------------------
-;------------------------------------------------------------------------------
+mouse._.find_sys_button_under_cursor:
-;? Find system button object which is currently visible on screen and has
-;? mouse cursor within its bounds
+; Find system button object which is currently visible on screen
-;------------------------------------------------------------------------------
+; and has mouse cursor within its bounds
-;< eax = pack[8(process slot), 24(button id)] or 0
-;< ebx = pack[16(button x coord), 16(button y coord)]
+;< eax = pack[8(process slot), 24(button id)] or 0
-;------------------------------------------------------------------------------
+;< ebx = pack[16(button x coord), 16(button y coord)]
         push    ecx edx esi edi
   .exit:
         pop     edi esi edx ecx
         ret
 align 4
-;------------------------------------------------------------------------------
+;-----------------------------------------------------------------
-mouse._.check_sys_window_actions: ;////////////////////////////////////////////
-;------------------------------------------------------------------------------
-;?
-;------------------------------------------------------------------------------
+mouse._.check_sys_window_actions:
-;< eax = action flags or 0
-;------------------------------------------------------------------------------
+;< eax = action flags or 0
         ; is window movable?
         test    byte[edi + WDATA.cl_titlebar + 3], 0x01
         jnz     .no_action
         jl      .move_action
         ; no there isn't, can it be resized then?
         mov     dl, [edi + WDATA.fl_wstyle]
         and     dl, 0x0f
-        ; NOTE: dangerous optimization, revise if window types changed;
+; NOTE: dangerous optimization, revise if window types changed
-        ;       this currently implies only types 2 and 3 could be resized
+; this currently implies only types 2 and 3 could be resized
         test    dl, 2
         jz      .no_action

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/gui/mouse.inc @ 4288 – Rev 5596 → 5984