WebSVN – Kolibri OS – Diff – /kernel/trunk/kernel.asm

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 5836 $
+$Revision: 5851 $
         mov     eax, [timer_ticks]
         ret
 ;-----------------------------------------------------------------------------
 iglobal
 align 4
-mousefn dd msscreen, mswin, msbutton, msset
+mousefn dd msscreen
+        dd mswin
+        dd msbutton
+        dd msbuttonExt
         dd app_load_cursor
         dd app_set_cursor
         dd app_delete_cursor
         dd msz
 endg
 readmousepos:
 ; eax=0 screen relative
 ; eax=1 window relative
 ; eax=2 buttons pressed
-; eax=3 set mouse pos   ; reserved
+; eax=3 buttons pressed ext
 ; eax=4 load cursor
 ; eax=5 set cursor
-; eax=6 delete cursor   ; reserved
+; eax=6 delete cursor
 ; eax=7 get mouse_z
         cmp     ebx, 7
+        ja      @f
-        ja      msset
+        jmp     [mousefn+ebx*4]
         jmp     [mousefn+ebx*4]
 msscreen:
         mov     eax, [MOUSE_X]
         shl     eax, 16
+        mov     ax, [MOUSE_Y]
-        mov     ax, [MOUSE_Y]
+        mov     [esp+36-4], eax
+@@:
-        mov     [esp+36-4], eax
+        ret
         ret
 mswin:
         mov     eax, [MOUSE_X]
         shl     eax, 16
         mov     ax, [MOUSE_Y]
         mov     esi, [TASK_BASE]
         mov     bx, word [esi-twdw+WDATA.box.left]
         shl     ebx, 16
-        mov     bx, word [esi-twdw+WDATA.box.top]
-        sub     eax, ebx
+        mov     bx, word [esi-twdw+WDATA.box.top]
         sub     eax, ebx
         mov     edi, [CURRENT_TASK]
         shl     edi, 8
         sub     ax, word[edi+SLOT_BASE+APPDATA.wnd_clientbox.top]
         rol     eax, 16
         sub     ax, word[edi+SLOT_BASE+APPDATA.wnd_clientbox.left]
         rol     eax, 16
+        mov     [esp+36-4], eax
-        mov     [esp+36-4], eax
+        ret
         ret
 msbutton:
         movzx   eax, byte [BTN_DOWN]
         mov     [esp+36-4], eax
-        ret
-msz:
-        mov     edi, [TASK_COUNT]
-        movzx   edi, word [WIN_POS + edi*2]
+        ret
-        cmp     edi, [CURRENT_TASK]
-        jne     @f
-        mov     ax, [MOUSE_SCROLL_H]
-        shl     eax, 16
+msbuttonExt:
-        mov     ax, [MOUSE_SCROLL_V]
-        mov     [esp+36-4], eax
-        and     [MOUSE_SCROLL_H], word 0
-        and     [MOUSE_SCROLL_V], word 0
-        ret
-       @@:
-        and     [esp+36-4], dword 0
-;           ret
+        mov     eax, [BTN_DOWN]
-msset:
+        mov     [esp+36-4], eax
         ret
 app_load_cursor:
         cmp     ecx, OS_BASE
+        jae     @f
-        jae     msset
+        stdcall load_cursor, ecx, edx
-        stdcall load_cursor, ecx, edx
+        mov     [esp+36-4], eax
-        mov     [esp+36-4], eax
+@@:
         ret
 app_delete_cursor:
         stdcall delete_cursor, ecx
         mov     [esp+36-4], eax
         ret
+msz:
+        mov     edi, [TASK_COUNT]
+        movzx   edi, word [WIN_POS + edi*2]
+        cmp     edi, [CURRENT_TASK]
+        jne     @f
+        mov     ax, [MOUSE_SCROLL_H]
+        shl     eax, 16
+        mov     ax, [MOUSE_SCROLL_V]
+        mov     [esp+36-4], eax
+        and     [MOUSE_SCROLL_H], word 0
+        and     [MOUSE_SCROLL_V], word 0
+        ret
+@@:
+        and     [esp+36-4], dword 0
+        ret
 is_input:
         push    edx
         and     [esp+32], dword 0
         ret
 ;------------------------------------------------------------------------------
 align 4
 sysfn_centermouse:      ; 18.15 = mouse centered
-; removed here by
-;     call  mouse_centered
-;* mouse centered - start code- Mario79
-;mouse_centered:
-;        push  eax
         mov     eax, [_display.width]
         shr     eax, 1
         mov     [MOUSE_X], ax
         mov     eax, [_display.height]
         shr     eax, 1
         mov     [MOUSE_Y], ax
         call    wakeup_osloop
-;        ret
-;* mouse centered - end code- Mario79
         xor     eax, eax
         and     [esp+32], eax
-;        pop   eax
         ret
 ;------------------------------------------------------------------------------
-align 4
-sysfn_mouse_acceleration: ; 18.19 = set/get mouse features
+sysfn_mouse_acceleration:       ; 18.19 = set/get mouse features
+        cmp     ecx, 8
+        jnc     @f
-        test    ecx, ecx; get mouse speed factor
+        jmp     dword [.table+ecx*4]
-        jnz     .set_mouse_acceleration
+.get_mouse_acceleration:
         xor     eax, eax
         mov     ax, [mouse_speed_factor]
         mov     [esp+32], eax
         ret
- .set_mouse_acceleration:
+.set_mouse_acceleration:
-;     cmp  ecx,1  ; set mouse speed factor
-        dec     ecx
-        jnz     .get_mouse_delay
         mov     [mouse_speed_factor], dx
         ret
- .get_mouse_delay:
+.get_mouse_delay:
-;     cmp  ecx,2  ; get mouse delay
-        dec     ecx
-        jnz     .set_mouse_delay
         mov     eax, [mouse_delay]
         mov     [esp+32], eax
         ret
- .set_mouse_delay:
+.set_mouse_delay:
-;     cmp  ecx,3  ; set mouse delay
-        dec     ecx
-        jnz     .set_pointer_position
         mov     [mouse_delay], edx
+@@:
         ret
- .set_pointer_position:
+.set_pointer_position:
-;     cmp  ecx,4  ; set mouse pointer position
-        dec     ecx
-        jnz     .set_mouse_button
         cmp     dx, word[_display.height]
-        jae     .end
+        jae     @b
         rol     edx, 16
         cmp     dx, word[_display.width]
-        jae     .end
+        jae     @b
         mov     [MOUSE_X], edx
         mov     [mouse_active], 1
-        call    wakeup_osloop
+        jmp     wakeup_osloop
-        ret
- .set_mouse_button:
+.set_mouse_button:
-;     cmp   ecx,5  ; set mouse button features
-        dec     ecx
-        jnz     .end
-        mov     [BTN_DOWN], dl
+        mov     [BTN_DOWN], edx
         mov     [mouse_active], 1
-        call    wakeup_osloop
+        jmp     wakeup_osloop
+.get_doubleclick_delay:
+        xor     eax, eax
+        mov     al, [mouse_doubleclick_delay]
+        mov     [esp+32], eax
- .end:
+        ret
+.set_doubleclick_delay:
+        mov     [mouse_doubleclick_delay], dl
         ret
+align 4
+.table:
+dd      .get_mouse_acceleration
+dd      .set_mouse_acceleration
+dd      .get_mouse_delay
+dd      .set_mouse_delay
+dd      .set_pointer_position
+dd      .set_mouse_button
+dd      .get_doubleclick_delay
+dd      .set_doubleclick_delay
 ;------------------------------------------------------------------------------
 sysfn_getfreemem:
         mov     eax, [pg_data.pages_free]
         shl     eax, 2
         mov     [esp+32], eax

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 5836 → 5851