1) Small fix for the code regulating speed COM mouses.

2) In the application SETUP the regulation delay for the mouse is added.

git-svn-id: svn://kolibrios.org@127 a494cfbc-eb01-0410-851d-a64ba20cac60

kernel/trunk/docs/sysfuncs.txt

@@ -966,6 +966,7 @@ Remarks:
     is not handled COM by mice. At the very large values the movement of
     the mouse on 1 pixel is impossible and the cursor will jump
     on the value of the installed speed (subfunction 1).
+    Delay of mouse can be regulated through the application SETUP.
     The installed value is not inspected by the code of a kernel.
   * In subfunction 4 the installed value is not inspected by
     the code of a kernel. Before usage it is necessary to find out current

kernel/trunk/hid/m_com1.inc

@@ -125,6 +125,6 @@ mouse_acceleration_com1:
         cmp   eax,[mouse_delay]
         pop    eax
         ja     @f
-        shl    ax,1
+        imul  ax,[mouse_speed_factor]
 @@:
         ret

kernel/trunk/hid/m_com2.inc

@@ -125,6 +125,6 @@ mouse_acceleration_com2:
         cmp   eax,[mouse_delay]
         pop    eax
         ja     @f
-        shl   ax,1
+        imul  ax,[mouse_speed_factor]
 @@:
         ret

programs/system/setup/trunk/setup.asm

@@ -8,6 +8,7 @@
 ;          A. Ivushkin - autostart (w launcher)
 ;          M. Lisovin  - added many feauters (apply all, save all, set time...)
 ;          I. Poddubny - fixed russian keymap
+;14/08/06  Mario79 - added regulation of mouse features
 
 ;******************************************************************************
   use32
@@ -36,7 +37,8 @@ apply_all:
     call _wssp        ;6
     call _syslang    ;5
     call _keyboard    ;2
-    call _mouse
+    call _mouse_speed
+    call _mouse_delay
     call get_disk_info
     cmp  [cd],0
     jne  no_cd
@@ -246,6 +248,8 @@ get_other:
     mov [pci_acc],eax
     mcall 18,19,0
     mov [mouse_speed],eax
+    mcall 18,19,2
+    mov [mouse_delay],eax
     ret
 
 ;******************************************************************************
@@ -713,8 +717,37 @@ close:
   .noplus:
     cmp  ah,131
     jnz  .noapply
-    call _mouse
+    call _mouse_speed
   .noapply:
+ mousedelay:
+    cmp  ah,142        ; SET MOUSE DELAY
+    jnz  .nominus
+    mov  eax,[mouse_delay]
+    sub  eax,2
+    cmp  eax,0xfff
+    jb        @f
+    mov  eax,0xffe
+@@:
+    inc  eax
+    mov  [mouse_delay],eax
+    call draw_infotext
+  .nominus:
+    cmp  ah,143
+    jnz  .noplus
+    mov  eax,[mouse_delay]
+    cmp  eax,0xfff
+    jb        @f
+    mov  eax,0
+@@:
+    inc  eax
+    mov  [mouse_delay],eax
+    call draw_infotext
+  .noplus:
+    cmp  ah,141
+    jnz  .noapply
+    call _mouse_delay
+  .noapply:
+
     cmp  ah,3         ; SET KEYMAP
     jne  still
     call _keyboard
@@ -859,7 +892,7 @@ draw_window:
 
     xor  eax,eax       ; DRAW WINDOW
     mov  ebx,40*65536+355+BBB
-    mov  ecx,40*65536+310
+    mov  ecx,40*65536+320
     mov  edx,0x83111199
 ;    mov  esi,0x805588dd
 ;    mov  edi,0x005588dd
@@ -885,7 +918,7 @@ draw_window:
 
     mov  eax,8             ; APPLY ALL
     mov  ebx,(350-79)*65536+100
-    mov  ecx,266*65536+12
+    mov  ecx,282*65536+12
     mov  edx,100
     mov  esi,0x005588dd
     int  0x40
@@ -951,6 +984,10 @@ draw_window:
     mov  ecx,43+26*8 ; 26
     call draw_buttons
 
+    mov  edx,141
+    mov  ecx,43+28*8 ; 26
+    call draw_buttons
+
     call draw_infotext
 
     mov  eax,12
@@ -1125,13 +1162,17 @@ draw_infotext:
     call onoff          ; PCI ACCESS
     mov  [text00+LLL*20+28],ebx
 
-    mov  eax,[mouse_speed]        ; MOUSE ACSELERATION
+    mov  eax,[mouse_speed]      ; MOUSE SPEED
     add  al,48
     mov  [text00+LLL*26+28],al
 
+    mov  eax,[mouse_delay]
+    mov  esi,text00+LLL*28+32
+    call hexconvert           ; MOUSE DELAY
+
     mov  eax,13
     mov  ebx,175*65536+85
-    mov  ecx,40*65536+225
+    mov  ecx,40*65536+245
     mov  edx,0x80111199-19
     int  0x40
 
@@ -1175,7 +1216,7 @@ draw_infotext:
 
     mov  eax,13
     mov  ebx,175*65536+85
-    mov  ecx,40*65536+225
+    mov  ecx,40*65536+245
     mov  edx,0x80111199-19
     int  0x40
 
@@ -1323,7 +1364,7 @@ _syslang:
     int  0x40
  ret
 
-_mouse:
+_mouse_speed:
     mov  eax,18
     mov  ebx,19
     mov  ecx,1
@@ -1331,10 +1372,18 @@ _mouse:
     int  0x40
  ret
 
+_mouse_delay:
+    mov  eax,18
+    mov  ebx,19
+    mov  ecx,3
+    mov  edx,[mouse_delay]
+    int  0x40
+ ret
+
 loadtxt:
     cld
     mov  edi,text00
-    mov  ecx,458 ;28
+    mov  ecx,488 ;28
     cmp  [syslang],4
     jne  norus
     mov  esi,textrus
@@ -1436,6 +1485,8 @@ textrus:
     db '                                                           '
     db '‘ª®à®áâì ªãàá®à  ¬ëè¨     : 1               - +   <20>ਬ¥­¨âì'
     db '                                                           '
+    db '‡ ¤¥à¦ª  ã᪮७¨ï ¬ëè¨   : 0x00a           - +   <20>ਬ¥­¨âì'
+    db '                                                           '
     db '‚<>ˆŒ€<C592>ˆ…:                                    <20>ਬ¥­¨âì ¢á¥ '
     db 'ˆ‘<CB86>Ž‹œ‡“‰’… „Ž‘’“<E28099> Š FAT ‘ Ž‘’Ž<E28099>Ž†<C5BD>Ž‘’œž!                  '
     db '<27>… ‡€<E280A1>“„œ’… ‘Ž•<C5BD>€<EFBFBD>ˆ’œ <20>€‘’<E28098>Ž‰Šˆ              ‘®åà ­¨âì ¢á¥ '
@@ -1471,6 +1522,8 @@ texteng:
     db '                                                           '
     db 'Mouse pointer speed       : 1               - +     APPLY  '
     db '                                                           '
+    db 'Mouse pointer delay       : 0x00a           - +     APPLY  '
+    db '                                                           '
     db 'NOTE:                                           APPLY ALL  '
     db 'TEST FAT FUNCTIONS WITH EXTREME CARE                       '
     db 'SAVE YOUR SETTINGS BEFORE QUIT MENUET           SAVE ALL   '
@@ -1662,7 +1715,7 @@ read_fileinfo:
        dd 0
        dd 0
        dd 0
-       dd 52
+       dd 56
        dd keyboard
        db 0
        dd file_name
@@ -1671,7 +1724,7 @@ save_fileinfo:
        dd 2
        dd 0
        dd 0
-       dd 52
+       dd 56
        dd keyboard
 file_name:   db '/rd/1/setup.dat',0
 
@@ -1690,6 +1743,7 @@ sound_dma    dd 0x1
 lba_read     dd 0x1
 pci_acc      dd 0x1
 mouse_speed  dd 0x3
+mouse_delay  dd 0x10
 text00:
 
 I_END: