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

       no_mode_0x12:
 ; MEMORY MODEL
            call mem_test
            call mem_test
            mov [MEM_AMOUNT], eax
 ;           btr [cpu_caps], CAPS_FXSR   ;test: disable sse support
                                         ;all sse commands rise #UD exption
 ;           btr [cpu_caps], CAPS_PSE    ;test: don't use large pages
 ;           btr [cpu_caps], CAPS_PGE    ;test: don't use global pages
 ;           btr [cpu_caps], CAPS_MTRR   ;test: don't use MTRR
-;           bts [cpu_caps], CAPS_TSC    ;test: don't use TSC
+           bts [cpu_caps], CAPS_TSC     ;force use rdtsc
            call init_memEx
            call init_page_map
         mov   esi,boot_setmouse
         call  boot_log
+        call  setmouse
-        call  setmouse
+        call init_cursors
-        mov  [pci_access_enabled],1
+;        mov  [pci_access_enabled],1
-        stdcall get_service, szHMouse
+;        stdcall get_service, szCURSOR
         mov  dword [0x80000+APPDATA.sse_handler], 0
         ; name for OS/IDLE process
         mov  dword [0x80000+256+APPDATA.app_name],   dword 'OS/I'
+        mov  dword [0x80000+256+APPDATA.app_name+4], dword 'DLE '
+        mov ebx, [def_cursor]
+        mov dword [0x80000+256+APPDATA.cursor], ebx
         mov  dword [0x80000+256+APPDATA.app_name+4], dword 'DLE '
         mov  dword [0x80000+256+APPDATA.fpu_handler], 0
         mov  dword [0x80000+256+APPDATA.sse_handler], 0
 ;set fpu save area
         mov esi, eax
-        bt [cpu_caps], CAPS_FXSR
+        bt [cpu_caps], CAPS_SSE
         jnc .no_sse
         lea edi, [eax+512]
-        mov  dword [0x80000+256+APPDATA.fpu_state], edi
+        mov  dword [PROC_BASE+256+APPDATA.fpu_state], edi
         mov ecx, 512/4
         jmp @F
 .no_sse:
         lea edi, [eax+112]
-        mov  dword [0x80000+256+APPDATA.fpu_state], edi
+        mov  dword [PROC_BASE+256+APPDATA.fpu_state], edi
         mov ecx, 112/4
      mov  [esp+36],dword 1
      ret
+align 4
+mousefn dd msscreen, mswin, msbutton, msset
+        dd app_load_cursor
         dd app_set_cursor
-align 4
+        dd msset    ;app_delete_cursor
 readmousepos:
+; eax=0 screen relative
+; eax=1 window relative
+; eax=2 buttons pressed
+; eax=3 set mouse pos   ; reserved
-; eax=0 screen relative
+; eax=4 load cursor
+; eax=5 set cursor
+; eax=6 delete cursor   ; reserved
 ; eax=1 window relative
-; eax=2 buttons pressed
+           cmp eax, 6
            ja msset
-    test eax,eax
+           jmp [mousefn+eax*4]
-    jnz  nosr
+msscreen:
-    mov  eax,[0xfb0a]
+           mov  eax,[0xfb0a]
-    shl  eax,16
-    mov  ax,[0xfb0c]
-    mov  [esp+36],eax
-    ret
+           shl  eax,16
-  nosr:
+           mov  ax,[0xfb0c]
            mov  [esp+36],eax
-    cmp  eax,1
+           ret
-    jnz  nowr
+mswin:
-    mov  eax,[0xfb0a]
+           mov  eax,[0xfb0a]
-    shl  eax,16
+           shl  eax,16
-    mov  ax,[0xfb0c]
+           mov  ax,[0xfb0c]
-    mov  esi,[0x3010]
+           mov  esi,[0x3010]
-    mov  bx, word [esi-twdw+WDATA.box.left]
+           mov  bx, word [esi-twdw+WDATA.box.left]
-    shl  ebx,16
+           shl  ebx,16
-    mov  bx, word [esi-twdw+WDATA.box.top]
+           mov  bx, word [esi-twdw+WDATA.box.top]
-    sub  eax,ebx
+           sub  eax,ebx
-        mov     edi,[0x3000]
-        shl     edi,8
+           mov  edi,[CURRENT_TASK]
-        sub     ax,word[edi+0x80000+APPDATA.wnd_clientbox.top]
+           shl  edi,8
-        rol     eax,16
+           sub  ax,word[edi+PROC_BASE+APPDATA.wnd_clientbox.top]
-        sub     ax,word[edi+0x80000+APPDATA.wnd_clientbox.left]
-        rol     eax,16
-    mov  [esp+36],eax
+           rol  eax,16
-    ret
-  nowr:
+           sub  ax,word[edi+PROC_BASE+APPDATA.wnd_clientbox.left]
+           rol  eax,16
+           mov  [esp+36],eax
+           ret
+msbutton:
+           movzx eax,byte [0xfb40]
+           mov  [esp+36],eax
+           ret
+msset:
+           ret
+app_load_cursor:
+           add ebx, new_app_base
+           cmp ebx, new_app_base
+           jb msset
            stdcall load_cursor, ebx, ecx
+           mov [esp+36], eax
-    cmp   eax,2
+           ret
     jnz   nomb
-    movzx eax,byte [0xfb40]
+app_set_cursor:
-  nomb:
+           stdcall set_cursor, ebx
         mov   ebx, [edi + WDATA.box.top]
         mov   ecx, [edi + WDATA.box.width]
         mov   edx, [edi + WDATA.box.height]
         add   ecx,eax
         add   edx,ebx
         call  calculatescreen
         popad
         pop   edx                   ; calculcate screen at old position
         inc  edx
         imul edx, ebx
         mov  dl, [eax+edx+display_data] ; lea eax, [...]
         xor  ecx, ecx
-        mov  eax, [0x3000]
+        mov  eax, [CURRENT_TASK]
         cmp  al, dl
         setne cl
 ;      pop   edi
-;      ret
 ;      ret
 keymap:

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 214 → 221