WebSVN – Kolibri OS – Diff – /kernel/trunk/hid/mousedrv.inc

 ;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 2288 $
+$Revision: 2430 $
 ;   FB4A  ->   FB4D   FB4A-B x-under - FB4C-D y-under
 ;   FC00  ->   FCFE   com1/ps2 buffer
 ;   FCFF              com1/ps2 buffer count starting from FC00
+uglobal
+;--------------------------------------
-uglobal
+align 4
   mousecount  dd  0x0
+  mousedata   dd  0x0
+Y_UNDER_subtraction_CUR_hot_y:
+        dd 0
+X_UNDER_subtraction_CUR_hot_x:
+        dd 0
+Y_UNDER_sub_CUR_hot_y_add_curh:
+        dd 0
+X_UNDER_sub_CUR_hot_x_add_curh:
-  mousedata   dd  0x0
+        dd 0
 endg
+iglobal
 ;--------------------------------------
-iglobal
+align 4
 mouse_delay        dd 10
 mouse_speed_factor:
                     dd 3
-mouse_timer_ticks  dd 0
-endg
-;include 'm_com.inc'
-;test_mario79:
-;        push   esi
+mouse_timer_ticks  dd 0
-;        push   eax
-;        mov    [write_error_to],process_test_m79+43
-;        movzx  eax,al  ;[DevErrorCode]
-;        call   writehex
-;        mov    esi,process_test_m79
-;        call   sys_msg_board_str
-;        pop    eax
+endg
-;        pop    esi
-;        ret
-;process_test_m79 db 'K : Process - test Mario79 error    00000000',13,10,0
+;-----------------------------------------------------------------------------
 align 4
-draw_mouse_under:
-        ; return old picture
+draw_mouse_under:
         ; return old picture
         cmp     [_display.restore_cursor], 0
         je      @F
         pushad
         movzx   eax, word [X_UNDER]
         movzx   ebx, word [Y_UNDER]
+        stdcall [_display.restore_cursor], eax, ebx
+        popad
-        stdcall [_display.restore_cursor], eax, ebx
+        ret
-        popad
+;--------------------------------------
-        ret
+align 4
 @@:
+        pushad
-        pushad
+        xor     ecx, ecx
-        xor     ecx, ecx
+        xor     edx, edx
-        xor     edx, edx
+;--------------------------------------
-        align  4
+align 4
 mres:
         add     eax, mouseunder
         mov     ecx, [eax]
         pop     ebx
         pop     eax
-        mov     edi, 1;force
+        mov     edi, 1 ; force
+        or      ecx, 0x04000000  ; don't save to mouseunder area
         call    [putpixel]
         pop     edx
         pop     ecx
         inc     ecx
         cmp     ecx, 16
         inc     edx
         cmp     edx, 24
         jnz     mres
         popad
         ret
+;-----------------------------------------------------------------------------
+align 4
 save_draw_mouse:
         cmp     [_display.move_cursor], 0
         je      .no_hw_cursor
         pushad
         je      .draw
         push    esi
         call    [_display.select_cursor]
+        mov     [current_cursor], esi
+;--------------------------------------
-        mov     [current_cursor], esi
+align 4
 .draw:
         stdcall [_display.move_cursor], esi
         popad
+        ret
+;--------------------------------------
-        ret
+;align 4
-.fail:
+;.fail:
-        mov     ecx, [def_cursor]
+;        mov     ecx, [def_cursor]
-        mov     [edx+SLOT_BASE+APPDATA.cursor], ecx
+;        mov     [edx+SLOT_BASE+APPDATA.cursor], ecx
-        stdcall [_display.move_cursor], ecx        ; stdcall: [esp]=ebx,eax
+;        stdcall [_display.move_cursor], ecx        ; stdcall: [esp]=ebx,eax
-        popad
+;        popad
+;        ret
-        ret
+;--------------------------------------
 align 4
 .no_hw_cursor:
         pushad
         ; save & draw
         mov     [X_UNDER], ax
         mov     [Y_UNDER], bx
         push    eax
         push    ebx
         mov     ecx, 0
+        mov     edx, 0
-        mov     edx, 0
+;--------------------------------------
-        align  4
+align 4
 drm:
         push    eax
         push    ebx
         ; helloworld
         push    ecx
         add     eax, ecx; save picture under mouse
         add     ebx, edx
         push    ecx
+        or      ecx, 0x04000000  ; don't load to mouseunder area
         call    getpixel
         mov     [COLOR_TEMP], ecx
         pop     ecx
         mov     eax, edx
         shl     eax, 6
         shl     ecx, 2
         add     eax, ecx
         add     eax, mouseunder
         mov     ebx, [COLOR_TEMP]
+        and     ebx, 0xffffff
         mov     [eax], ebx
         pop     ecx
         mov     edi, edx     ; y cycle
         shl     edi, 4     ; *16 bytes per row
         add     edi, ecx     ; x cycle
         mov     esi, edi
         add     esi, 16*24*3
         push    ecx
         mov     ecx, [COLOR_TEMP]
         call    combine_colors
+        and     ecx, 0xffffff
         mov     [MOUSE_COLOR_MEM], ecx
         pop     ecx
         pop     edx
         pop     ecx
         pop     ebx
         pop     eax
         add     eax, ecx     ; we have x coord+cycle
         add     ebx, edx     ; and y coord+cycle
         push    ecx
         mov     ecx, [MOUSE_COLOR_MEM]
-        mov     edi, 1
+        mov     edi, 1 ; force
+        or      ecx, 0x04000000  ; don't save to mouseunder area
         call    [putpixel]
         pop     ecx
         mov     ebx, [esp+0]    ; pure y coord again
         mov     eax, [esp+4]    ; and x
         inc     ecx         ; +1 cycle
         cmp     edx, 24
         jnz     drm
         add     esp, 8
         popad
         ret
+;-----------------------------------------------------------------------------
+align 4
 combine_colors:
       ; in
       ; ecx - color ( 00 RR GG BB )
       ; edi - ref to new color byte
       ; esi - ref to alpha byte
         pop     eax
         pop     edx
         pop     ebx
         pop     eax
         ret
+;-----------------------------------------------------------------------------
+align 4
+check_mouse_area_for_getpixel:
+; in:
+; eax = x
+; ebx = y
+; out:
+; ecx = new color
+        push    eax ebx
+; check for Y
+        xor     ecx, ecx
+        mov     cx, [Y_UNDER]  ; [MOUSE_Y]
-__sys_disable_mouse:
-        cmp     dword [MOUSE_VISIBLE], dword 0
-        je      @f
-        ret
-@@:
-        pushad
-        cmp     [CURRENT_TASK], dword 1
-        je      disable_m
-        mov     edx, [CURRENT_TASK]
-        shl     edx, 5
-        add     edx, window_data
-        movzx   eax, word [MOUSE_X]
-        movzx   ebx, word [MOUSE_Y]
-        mov     ecx, [Screen_Max_X]
-        inc     ecx
-        imul    ecx, ebx
-        add     ecx, eax
-        add     ecx, [_WinMapAddress]
-        mov     eax, [CURRENT_TASK]
-        cmp     al, [ecx]
-        je      yes_mouse_disable
-        cmp     al, [ecx+16]
-        je      yes_mouse_disable
-        add     ebx, 10
-        cmp     ebx, [Screen_Max_Y]
-        jae     no_mouse_disable
-        mov     ebx, [Screen_Max_X]
-        inc     ebx
-        imul    ebx, 10
-        add     ecx, ebx
-        cmp     al, [ecx]
-        je      yes_mouse_disable
-        cmp     al, [ecx+16]
-        je      yes_mouse_disable
-        jmp     no_mouse_disable
-yes_mouse_disable:
-        mov     edx, [CURRENT_TASK]
-        shl     edx, 5
-        add     edx, window_data
-        movzx   eax, word [MOUSE_X]
-        movzx   ebx, word [MOUSE_Y]
-        mov     ecx, [edx+0]; mouse inside the area ?
-        add     eax, 10
-        cmp     eax, ecx
-        jb      no_mouse_disable
-        sub     eax, 10
-        add     ecx, [edx+8]
-        cmp     eax, ecx
-        jg      no_mouse_disable
-        mov     ecx, [edx+4]
         add     ebx, 14
         cmp     ebx, ecx
-        jb      no_mouse_disable
-        sub     ebx, 14
+        jb      .no_mouse_area
-        add     ecx, [edx+12]
+        add     ecx, 23  ; mouse cursor Y size
         cmp     ebx, ecx
-        jg      no_mouse_disable
+        ja      .no_mouse_area
+; offset Y
+        sub     bx, [Y_UNDER]  ;[MOUSE_Y]
+;--------------------------------------
+; check for X
-disable_m:
+        xor     ecx, ecx
+        mov     cx, [X_UNDER]  ;[MOUSE_X]
-        cmp     dword [MOUSE_VISIBLE], dword 0
+        cmp     eax, ecx
+        jb      .no_mouse_area
-        jne     no_mouse_disable
+        add     ecx, 15  ; mouse cursor X size
+        cmp     eax, ecx
-        pushf
+        ja      .no_mouse_area
+; offset X
+        sub     ax, [X_UNDER]  ;[MOUSE_X]
+;--------------------------------------
+; eax = offset x
+; ebx = offset y
+        shl     ebx, 6  ;y
+        shl     eax, 2  ;x
-        cli
+        add     eax, ebx
-        call    draw_mouse_under
+        add     eax, mouseunder
-        popf
+        mov     ecx, [eax]
-        mov     [MOUSE_VISIBLE], dword 1
+        and     ecx, 0xffffff
-no_mouse_disable:
+        or      ecx, 0xff000000
-        popad
+        pop     ebx eax
+        ret
-        ret
+;--------------------------------------
+align 4
-__sys_draw_pointer:
+.no_mouse_area:
-        cmp     [mouse_pause], 0
+        xor     ecx, ecx
-        je      @f
+        pop     ebx eax
+        ret
+;-----------------------------------------------------------------------------
+align 4
-        ret
+check_mouse_area_for_putpixel:
+; in:
+; ecx = x shl 16 + y
+; eax = color
+; out:
-@@:
+; eax = new color
+        push    eax
+; check for Y
+        mov     ax, [Y_UNDER]  ; [MOUSE_Y]
+        cmp     cx, ax
+        jb      .no_mouse_area
+        add     ax, 23  ; mouse cursor Y size
+        cmp     cx, ax
+        ja      .no_mouse_area
+; offset Y
-        push    eax
+        sub     cx, [Y_UNDER]  ;[MOUSE_Y]
+        mov     ax, cx
+        shl     eax, 16
+;--------------------------------------
+; check for X
+        mov     ax, [X_UNDER]  ;[MOUSE_X]
+        shr     ecx, 16
+        cmp     cx, ax
-        mov     eax, [timer_ticks]
+        jb      .no_mouse_area
-        sub     eax, [MouseTickCounter]
+        add     ax, 15  ; mouse cursor X size
+        cmp     cx, ax
+        ja      .no_mouse_area
+; offset X
-        cmp     eax, 1
+        sub     cx, [X_UNDER]  ;[MOUSE_X]
+        mov     ax, cx
+;--------------------------------------
+; eax = (offset y) shl 16 + (offset x)
-        ja      @f
+        pop     ecx
+        push    eax ebx
+        mov     ebx, eax
+        shr     ebx, 16        ;y
+        and     eax, 0xffff    ;x
+        shl     ebx, 6
+        shl     eax, 2
+        add     eax, ebx
+        add     eax, mouseunder
+        and     ecx, 0xFFFFFF
+        mov     [eax], ecx
+        pop     ebx eax
+        push    esi edi
+        rol     eax, 16
+        movzx   edi, ax     ; y cycle
+        shl     edi, 4     ; *16 bytes per row
+        shr     eax, 16
+        add     edi, eax     ; x cycle
+        lea     edi, [edi*3]
+        add     edi, [MOUSE_PICTURE]    ; we have our str address
+        mov     esi, edi
+        add     esi, 16*24*3
+        call    combine_colors
+        pop     edi esi
+;--------------------------------------
+align 4
+.end:
-        pop     eax
+        mov     eax, ecx
+        ret
-        ret
+;--------------------------------------
-@@:
-        mov     eax, [timer_ticks]
+align 4
-        mov     [MouseTickCounter], eax
+.no_mouse_area:
-        pop     eax
-        pushad
-        cmp     dword [MOUSE_VISIBLE], dword 0; mouse visible ?
-        je      chms00
-        mov     [MOUSE_VISIBLE], dword 0
-        movzx   ebx, word [MOUSE_Y]
-        movzx   eax, word [MOUSE_X]
-        pushfd
-        cli
-        call    save_draw_mouse
-        popfd
-nodmu2:
-        popad
+        pop     eax
+        ret
-        ret
+;-----------------------------------------------------------------------------
+align 4
+__sys_draw_pointer:
-chms00:
+        pushad
         movzx   ecx, word [X_UNDER]
         movzx   edx, word [Y_UNDER]
         movzx   ebx, word [MOUSE_Y]
         movzx   eax, word [MOUSE_X]
         cmp     eax, ecx
         jne     redrawmouse
         cmp     ebx, edx
-        jne     redrawmouse
+        je      nodmp
+;--------------------------------------
-        jmp     nodmp
+align 4
 redrawmouse:
         pushfd
         cli
         call    draw_mouse_under
+        call    save_draw_mouse
+        mov     eax, [_display.select_cursor]
+        test    eax, eax
+        jz      @f
+        xor     eax, eax
+        mov     esi, [current_cursor]
+        mov     ax, [Y_UNDER]
+        sub     eax, [esi+CURSOR.hot_y]
+        mov     [Y_UNDER_subtraction_CUR_hot_y], eax
+        add     eax, [cur.h]
+        mov     [Y_UNDER_sub_CUR_hot_y_add_curh], eax
+        mov     ax, [X_UNDER]
+        sub     eax, [esi+CURSOR.hot_x]
+        mov     [X_UNDER_subtraction_CUR_hot_x], eax
+        add     eax, [cur.w]
+        mov     [X_UNDER_sub_CUR_hot_x_add_curh], eax
+;--------------------------------------
+align 4
-        call    save_draw_mouse
+@@:
+        popfd
+;--------------------------------------
-        popfd
+align 4
 nodmp:
         popad
+        ret
-        ret
+;-----------------------------------------------------------------------------
 align 4
 proc set_mouse_data stdcall, BtnState:dword, XMoving:dword, YMoving:dword, VScroll:dword, HScroll:dword
         add     ax, [MOUSE_X];[XCoordinate]
         cmp     ax, 0
         jge     @@M1
         mov     eax, 0
         jmp     @@M2
+;--------------------------------------
+align 4
 @@M1:
         cmp     ax, [Screen_Max_X];ScreenLength
         jl      @@M2
         mov     ax, [Screen_Max_X];ScreenLength-1
+;--------------------------------------
+align 4
 @@M2:
         mov     [MOUSE_X], ax;[XCoordinate]
         mov     eax, [YMoving]
         add     ax, [MOUSE_Y];[YCoordinate]
         cmp     ax, 0
         jge     @@M3
         mov     ax, 0
         jmp     @@M4
+;--------------------------------------
+align 4
 @@M3:
         cmp     ax, [Screen_Max_Y];ScreenHeigth
         jl      @@M4
         mov     ax, [Screen_Max_Y];ScreenHeigth-1
+;--------------------------------------
+align 4
 @@M4:
         mov     [MOUSE_Y], ax;[YCoordinate]
         mov     eax, [VScroll]
         mov     [mouse_active], 1
         mov     eax, [timer_ticks]
         mov     [mouse_timer_ticks], eax
         ret
 endp
+;-----------------------------------------------------------------------------
+align 4
 mouse_acceleration:
         push    eax
         mov     eax, [timer_ticks]
         sub     eax, [mouse_timer_ticks]
         cmp     eax, [mouse_delay]
         pop     eax
         ja      @f
         ;push  edx
         imul    eax, [mouse_speed_factor]
         ;pop   edx
+;--------------------------------------
+align 4
 @@:
         ret
+;-----------------------------------------------------------------------------

Subversion Repositories Kolibri OS

(root)/kernel/trunk/hid/mousedrv.inc – Rev 2288 → 2430