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

 ;; Copyright (C) KolibriOS team 2010. All rights reserved.      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 2015 $
+$Revision: 2434 $
 include 'mousepointer.inc'
         and     [mouse.state.buttons], 0
         jmp     .exit
+        ; is there any system button under cursor?
-        ; is there any system button under cursor?
+    @@:
-    @@: call    mouse._.find_sys_button_under_cursor
+        call    mouse._.find_sys_button_under_cursor
         or      eax, eax
         jz      .check_buttons_released
         test    byte[esp], mouse.LEFT_BUTTON_FLAG
         jz      @f
         mov     eax, [esp + 4]
         call    .call_left_button_handler
+    @@:
-    @@: test    byte[esp], mouse.RIGHT_BUTTON_FLAG
+        test    byte[esp], mouse.RIGHT_BUTTON_FLAG
         jz      @f
         mov     eax, [esp + 4]
+        call    .call_right_button_handler
-        call    .call_right_button_handler
     @@:
-    @@: test    byte[esp], mouse.MIDDLE_BUTTON_FLAG
+        test    byte[esp], mouse.MIDDLE_BUTTON_FLAG
         jz      .check_position
         mov     eax, [esp + 4]
         mov     [mouse.active_sys_window.last_ticks], 0
         call    sys_window_maximize_handler
+        jmp     .exit
-        jmp     .exit
     @@:
-    @@: test    [edi + WDATA.fl_wstate], WSTATE_MAXIMIZED
+        test    [edi + WDATA.fl_wstate], WSTATE_MAXIMIZED
         jnz     .exit
         mov     [mouse.active_sys_window.pslot], esi
         lea     eax, [edi + WDATA.box]
         mov     ebx, mouse.active_sys_window.old_box
-        mov     ecx, BOX.sizeof
+        mov     ecx, sizeof.BOX
         call    memmove
         mov     ebx, mouse.active_sys_window.new_box
         call    memmove
         test    edx, mouse.WINDOW_MOVE_FLAG
         jz      @f
+        call    .calculate_n_delta
-        call    .calculate_n_delta
+        call    .calculate_w_delta
-        call    .calculate_w_delta
+        jmp     .call_window_handler
         jmp     .call_window_handler
+    @@:
+        test    dl, mouse.WINDOW_RESIZE_W_FLAG
-    @@: test    dl, mouse.WINDOW_RESIZE_W_FLAG
+        jz      @f
-        jz      @f
+        call    .calculate_w_delta
-        call    .calculate_w_delta
+    @@:
         test    dl, mouse.WINDOW_RESIZE_S_FLAG
-    @@: test    dl, mouse.WINDOW_RESIZE_S_FLAG
+        jz      @f
-        jz      @f
+        call    .calculate_s_delta
         call    .calculate_s_delta
         mov     eax, esi
         shl     eax, 5
         add     eax, window_data + WDATA.box
         mov     ebx, mouse.active_sys_window.old_box
-        mov     ecx, BOX.sizeof
+        mov     ecx, sizeof.BOX
         call    memmove
         mov     eax, mouse.active_sys_window.old_box
         or      esi, esi
         jz      .exit
         mov     eax, mouse.active_sys_window.new_box
         mov     ebx, mouse.active_sys_window.old_box
-        mov     ecx, BOX.sizeof
+        mov     ecx, sizeof.BOX
         call    memmove
         mov     dl, [mouse.active_sys_window.action]
         mov     eax, [mouse.active_sys_window.new_box.left]
         or      eax, eax
         jge     @f
         xor     eax, eax
         mov     [mouse.active_sys_window.new_box.left], eax
+    @@:
-    @@: add     eax, [mouse.active_sys_window.new_box.width]
+        add     eax, [mouse.active_sys_window.new_box.width]
         cmp     eax, [Screen_Max_X]
         jl      @f
         sub     eax, [Screen_Max_X]
         sub     [mouse.active_sys_window.new_box.left], eax
+    @@:
-    @@: mov     eax, [mouse.active_sys_window.new_box.top]
+        mov     eax, [mouse.active_sys_window.new_box.top]
         or      eax, eax
         jge     @f
         xor     eax, eax
         mov     [mouse.active_sys_window.new_box.top], eax
+    @@:
-    @@: add     eax, [mouse.active_sys_window.new_box.height]
+        add     eax, [mouse.active_sys_window.new_box.height]
         cmp     eax, [Screen_Max_Y]
         jle     .call_window_handler
         sub     eax, [Screen_Max_Y]
         sub     [mouse.active_sys_window.new_box.top], eax
         jmp     .call_window_handler
         mov     eax, [mouse.active_sys_window.new_box.width]
         sub     eax, 127
         jge     @f
         add     [mouse.active_sys_window.new_box.left], eax
         mov     [mouse.active_sys_window.new_box.width], 127
+    @@:
-    @@: mov     eax, [mouse.active_sys_window.new_box.left]
+        mov     eax, [mouse.active_sys_window.new_box.left]
         or      eax, eax
         jge     .check_resize_s
         add     [mouse.active_sys_window.new_box.width], eax
         xor     eax, eax
         mov     [mouse.active_sys_window.new_box.left], eax
         mov     eax, [mouse.active_sys_window.new_box.height]
         cmp     eax, ecx
         jge     @f
         mov     eax, ecx
         mov     [mouse.active_sys_window.new_box.height], eax
+    @@:
-    @@: add     eax, [mouse.active_sys_window.new_box.top]
+        add     eax, [mouse.active_sys_window.new_box.top]
         cmp     eax, [Screen_Max_Y]
         jle     .check_resize_e
         sub     eax, [Screen_Max_Y]
         neg     eax
         add     [mouse.active_sys_window.new_box.height], eax
         mov     eax, [mouse.active_sys_window.new_box.width]
         cmp     eax, 127
         jge     @f
         mov     eax, 127
         mov     [mouse.active_sys_window.new_box.width], eax
+    @@:
-    @@: add     eax, [mouse.active_sys_window.new_box.left]
+        add     eax, [mouse.active_sys_window.new_box.left]
         cmp     eax, [Screen_Max_X]
         jle     .call_window_handler
         sub     eax, [Screen_Max_X]
         neg     eax
         add     [mouse.active_sys_window.new_box.width], eax
         mov     ebx, mouse.active_sys_window.new_box
         push    esi
         mov     esi, mouse.active_sys_window.old_box
         mov     edi, mouse.active_sys_window.new_box
-        mov     ecx, BOX.sizeof / 4
+        mov     ecx, sizeof.BOX / 4
         repe
         cmpsd
         pop     esi
         mov     edx, esi
         ; check if any process button contains cursor
         mov     eax, [BTN_ADDR]
         mov     ecx, [eax]
-        imul    esi, ecx, SYS_BUTTON.sizeof
+        imul    esi, ecx, sizeof.SYS_BUTTON
         add     esi, eax
         inc     ecx
-        add     esi, SYS_BUTTON.sizeof
+        add     esi, sizeof.SYS_BUTTON
   .next_button:
         dec     ecx
         jz      .not_found
-        add     esi, -SYS_BUTTON.sizeof
+        add     esi, -sizeof.SYS_BUTTON

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/gui/mouse.inc – Rev 2015 → 2434