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

        ; call  kb_read
         mov   al, 0xF3       ; set repeat rate & delay
         call  kb_write
         call  kb_read
-        mov   al, 00100010b ; 24 500  ;00100100b  ; 20 500
+        mov   al, 0 ; 30 250 ;00100010b ; 24 500  ;00100100b  ; 20 500
         call  kb_write
         call  kb_read
      ;// mike.dld [
         call  set_lights
 align 32
 osloop:
         call   [draw_pointer]
-        call   checkbuttons
-        call   main_loop_sys_getkey
+        call   checkbuttons
         call   checkwindows
 ;       call   check_window_move_request
         call   checkmisc
         call   checkEgaCga
      mov ecx,16384
      cld
      rep movsd
      ret
-sysfn_lastkey:          ; 18.12 = get all key pressed with ALT
-     mov   eax,[last_key_press]
-     mov   al,[keyboard_mode_sys]
+sysfn_lastkey:          ; 18.12 = return 0 (backward compatibility)
-     mov   [esp+36],eax
-     mov   [last_key_press],0
+        and     dword [esp+36], 0
-     ret
+        ret
 sysfn_getversion:       ; 18.13 = get kernel ID and version
 ;// mike.dld, 2006-29-01 [
 screen_workarea RECT
 ;// mike.dld, 2006-29-01 ]
 window_minimize db 0
 sound_flag      db 0
-last_key_press  dd 0
-keyboard_mode_sys db 0
 endg
 iglobal
 version_inf:
 UID_NONE=0
 UID_MENUETOS=1   ;official
-UID_KOLIBRI=2    ;russian
-main_loop_sys_getkey:
-    cmp   [0xf400],byte 0
-    je    .finish
-    movzx eax,byte [0xf401]
-    shl   eax,8
-    mov   [last_key_press],eax
- .finish:
-    ret
+UID_KOLIBRI=2    ;russian
 sys_cachetodiskette:
 ;    pushad
 ;    cmp  eax,1
 align 4
+sys_getkey:
-sys_getkey:
+    mov   [esp+36],dword 1
-    mov   [esp+36],dword 1
+; test main buffer
     mov   ebx, [0x3000]                          ; TOP OF WINDOW STACK
     movzx ecx,word [0xC000 + ebx * 2]
     mov   edx,[0x3004]
  ;  rep   movsb
     mov   eax, 0xF402
     mov   ebx, 0xF401
     call  memmove
     pop   eax
-    mov   [last_key_press],eax
-    mov   eax,[kb_state]
-    and   al,110000b
-    cmp   al,100000b
-    je    .yes_win_key
-    cmp   al,10000b
-    je    .yes_win_key
-    mov   eax,[last_key_press]
-    jmp   .no_win_key
-;    cmp   ah,232
-;    je    .yes_win_key
-;    cmp   ah,233
-;    jne   .no_win_key
- .yes_win_key:
+.ret_eax:
-    mov   eax,1
- .no_win_key:
     mov   [esp+36],eax
+    ret
  .finish:
+; test hotkeys buffer
+        mov     ecx, hotkey_buffer
+@@:
+        cmp     [ecx], ebx
+        jz      .found
+        add     ecx, 8
+        cmp     ecx, hotkey_buffer+120*8
+        jb      @b
-    ret
+        ret
+.found:
+        mov     ax, [ecx+6]
+        shl     eax, 16
+        mov     ah, [ecx+4]
+        mov     al, 2
+        and     dword [ecx+4], 0
+        and     dword [ecx], 0
+        jmp     .ret_eax
 align 4
      ret
 sys_process_def:
-sys_process_def:
         mov     edi, [0x3000]
-     cmp   eax,1                   ; set keyboard mode
-     jne   no_set_keyboard_setup
         dec     eax             ; 1 = set keyboard mode
-     mov   edi,[0x3000]
+     jne   no_set_keyboard_setup
-     shl   edi,8
-     add   edi,0x80000+0xB4
+     shl   edi,8
-     mov   [edi],bl
      mov   [edi+0x800B4],bl
-     ret
-   no_set_keyboard_setup:
+     ret
-     cmp   eax,2                   ; get keyboard mode
+   no_set_keyboard_setup:
-     jne   no_get_keyboard_setup
         dec     eax             ; 2 = get keyboard mode
-     mov   edi,[0x3000]
+     jne   no_get_keyboard_setup
      shl   edi,8
-     add   edi,0x80000+0xB4
+     shl   edi,8
      ret
+   no_get_keyboard_cas:
+        dec     eax
+        jnz     no_add_keyboard_hotkey
+        mov     eax, hotkey_list
+@@:
+        cmp     dword [eax+8], 0
+        jz      .found_free
+        add     eax, 16
+        cmp     eax, hotkey_list+16*256
+        jb      @b
+        mov     dword [esp+36], 1
+        ret
+.found_free:
+        mov     [eax+8], edi
+        mov     [eax+4], ecx
+        movzx   ebx, bl
+        lea     ebx, [hotkey_scancodes+ebx*4]
+        mov     ecx, [ebx]
+        mov     [eax], ecx
+        mov     [ebx], eax
+        mov     [eax+12], ebx
+        jecxz   @f
+        mov     [ecx+12], eax
+@@:
+        and     dword [esp+36], 0
+        ret
+no_add_keyboard_hotkey:
+        dec     eax
+        jnz     no_del_keyboard_hotkey
+        movzx   ebx, bl
+        lea     ebx, [hotkey_scancodes+ebx*4]
+        mov     eax, [ebx]
+.scan:
+        test    eax, eax
+        jz      .notfound
+        cmp     [eax+8], edi
+        jnz     .next
+        cmp     [eax+4], ecx
+        jz      .found
+.next:
+        mov     eax, [eax]
+        jmp     .scan
+.notfound:
+        mov     dword [esp+36], 1
+        ret
+.found:
+        mov     ecx, [eax]
+        jecxz   @f
+        mov     edx, [eax+12]
+        mov     [ecx+12], edx
+@@:
+        mov     ecx, [eax+12]
+        mov     edx, [eax]
+        mov     [ecx], edx
+        xor     edx, edx
+        mov     [eax+4], edx
+        mov     [eax+8], edx
+        mov     [eax+12], edx
+        mov     [eax], edx
         mov     [esp+36], edx
-   no_get_keyboard_cas:
+        ret

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm @ 97 – Rev 90 → 92