mirror of
https://github.com/KolibriOS/kolibrios.git
synced 2024-12-28 17:29:41 +03:00
/sys/setup: remove mouse options cos' they moved to mouse_cfg, add mouse_cfg to distro
git-svn-id: svn://kolibrios.org@5632 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency)
parent
cdfc1d7c00
commit
774b015389
@ -466,8 +466,9 @@ tup.append_table(img_files, {
|
||||
{"GAMES/FindNumbers", PROGS .. "/games/FindNumbers/trunk/FindNumbers"},
|
||||
{"GAMES/flood-it", PROGS .. "/games/flood-it/trunk/flood-it.com"},
|
||||
{"GAMES/MINE", PROGS .. "/games/mine/trunk/mine"},
|
||||
{"NETWORK/WebView", PROGS .. "/cmm/browser/WebView.com"},
|
||||
{"MEDIA/PIXIE/PIXIE", PROGS .. "/cmm/pixie/pixie.com"},
|
||||
{"MOUSE_CFG", PROGS .. "/cmm/mouse_cfg/mouse_cfg.com"},
|
||||
{"NETWORK/WEBVIEW", PROGS .. "/cmm/browser/WebView.com"},
|
||||
{"PANELS_CFG", PROGS .. "/cmm/panels_cfg/panels_cfg.com"},
|
||||
{"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"},
|
||||
{"GAME_CENTER", PROGS .. "/cmm/software_widget/software_widget.com"},
|
||||
|
||||
@ -16,10 +16,10 @@ Background=/sys/media/palitra,61
|
||||
WinColors=desktop,59
|
||||
Volume=@VOLUME,64
|
||||
Panels=panels_cfg,63
|
||||
Mouse=/sys/mouse_cfg,54
|
||||
|
||||
[Monitoring]
|
||||
Debug Board=/sys/develop/board,19
|
||||
Mouse=/sys/develop/mstate,54
|
||||
NetStat=/sys/network/netstat,33
|
||||
SysMonitor=gmon,57
|
||||
Processes=cpu,60
|
||||
|
||||
@ -3,6 +3,11 @@
|
||||
;; DEVICE SETUP ;;
|
||||
;; ;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
; version: 1.17
|
||||
; last update: 30/07/2015
|
||||
; changed by: Kiril Lipatov, aka Leency
|
||||
; changes: Mouse speed and mouse delay options moved to mouse_cfg
|
||||
;---------------------------------------------------------------------
|
||||
; version: 1.16
|
||||
; last update: 12/04/2014
|
||||
; changed by: Yurii Shevtsov, aka gtament
|
||||
@ -48,8 +53,6 @@ apply_all:
|
||||
call _pci_acc ;12
|
||||
call _syslang ;5
|
||||
call _keyboard ;2
|
||||
call _mouse_speed
|
||||
call _mouse_delay
|
||||
call _speaker_mute
|
||||
ret
|
||||
;-------------------------------------------------------------------------------
|
||||
@ -100,12 +103,6 @@ get_setup_values:
|
||||
mcall 26,12
|
||||
mov [pci_acc],eax
|
||||
|
||||
mcall 18,19,0
|
||||
mov [mouse_speed],eax
|
||||
|
||||
mcall 18,19,2
|
||||
mov [mouse_delay],eax
|
||||
|
||||
mcall 18,8,1
|
||||
mov [speaker_mute],eax
|
||||
ret
|
||||
@ -267,69 +264,6 @@ nosysp:
|
||||
call draw_window
|
||||
;--------------------------------------
|
||||
nosyss:
|
||||
cmp ah,132 ; SET MOUSE SPEED
|
||||
jnz .nominus
|
||||
mov eax,[mouse_speed]
|
||||
sub eax,2
|
||||
cmp eax,9
|
||||
jb @f
|
||||
mov eax,8
|
||||
;--------------------------------------
|
||||
@@:
|
||||
inc eax
|
||||
mov [mouse_speed],eax
|
||||
call draw_infotext
|
||||
;--------------------------------------
|
||||
.nominus:
|
||||
cmp ah,133
|
||||
jnz .noplus
|
||||
mov eax,[mouse_speed]
|
||||
cmp eax,9
|
||||
jb @f
|
||||
mov eax,0
|
||||
;--------------------------------------
|
||||
@@:
|
||||
inc eax
|
||||
mov [mouse_speed],eax
|
||||
call draw_infotext
|
||||
;--------------------------------------
|
||||
.noplus:
|
||||
cmp ah,131
|
||||
jnz .noapply
|
||||
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 speakermute
|
||||
call _mouse_delay
|
||||
;--------------------------------------
|
||||
speakermute:
|
||||
cmp ah,152 ; SET SPEAKER
|
||||
@ -489,9 +423,7 @@ draw_window:
|
||||
pusha
|
||||
mcall 12,1
|
||||
|
||||
xor eax,eax ; DRAW WINDOW
|
||||
xor esi,esi
|
||||
mcall ,<40,(355+BBB)>,<40,(12*16)>,0xB4111199,,title
|
||||
mcall 0,<40,(355+BBB)>,<40,(10*16)>,0xB4111199,0,title ; DRAW WINDOW
|
||||
|
||||
mcall 9,procinfo,-1
|
||||
|
||||
@ -499,7 +431,7 @@ draw_window:
|
||||
test eax,100b
|
||||
jne .end
|
||||
|
||||
mcall 8,<(350-85),100>,<(5+16*8),12>,100,0x005588dd ; APPLY ALL
|
||||
mcall 8,<(350-85),100>,<(5+16*6),12>,100,0x005588dd ; APPLY ALL
|
||||
|
||||
add ecx,16*65536 ; SAVE ALL
|
||||
dec edx
|
||||
@ -523,16 +455,8 @@ draw_window:
|
||||
mov ecx,5+6*8
|
||||
call draw_buttons
|
||||
|
||||
mov edx,131
|
||||
mov ecx,5+8*8
|
||||
call draw_buttons
|
||||
|
||||
mov edx,141
|
||||
mov ecx,5+10*8
|
||||
call draw_buttons
|
||||
|
||||
mov edx,151
|
||||
mov ecx,5+12*8
|
||||
mov ecx,5+8*8
|
||||
call draw_buttons
|
||||
|
||||
call draw_infotext
|
||||
@ -640,17 +564,10 @@ noet5:
|
||||
|
||||
mov eax,[speaker_mute]
|
||||
call onoff ; SPEAKER
|
||||
mov [text00+LLL*6+28],ebx
|
||||
mov [text00+LLL*4+28],ebx
|
||||
|
||||
mov eax,[mouse_speed] ; MOUSE SPEED
|
||||
add al,48
|
||||
mov [text00+LLL*4+28],al
|
||||
|
||||
mov eax,[mouse_delay]
|
||||
mov esi,text00+LLL*5+32
|
||||
call hexconvert ; MOUSE DELAY
|
||||
call text_out
|
||||
|
||||
|
||||
popa
|
||||
ret
|
||||
;-------------------------------------------------------------------------------
|
||||
@ -682,31 +599,6 @@ newline:
|
||||
jnz @b
|
||||
ret
|
||||
;-------------------------------------------------------------------------------
|
||||
hexconvert: ;converting dec to hex in ascii
|
||||
xor ebx,ebx
|
||||
mov bl,al
|
||||
and bl,15
|
||||
add ebx,hex
|
||||
mov cl,[ebx]
|
||||
mov [esi],cl
|
||||
shr eax,4
|
||||
xor ebx,ebx
|
||||
mov bl,al
|
||||
and bl,15
|
||||
add ebx,hex
|
||||
mov cl,[ebx]
|
||||
dec esi
|
||||
mov [esi],cl
|
||||
shr eax,4
|
||||
xor ebx,ebx
|
||||
mov bl,al
|
||||
and bl,15
|
||||
add ebx,hex
|
||||
mov cl,[ebx]
|
||||
dec esi
|
||||
mov [esi],cl
|
||||
ret
|
||||
;-------------------------------------------------------------------------------
|
||||
onoff:
|
||||
cmp [syslang],4
|
||||
jne norus1
|
||||
@ -745,14 +637,6 @@ _syslang:
|
||||
mcall 21,5,[syslang]
|
||||
ret
|
||||
;-------------------------------------------------------------------------------
|
||||
_mouse_speed:
|
||||
mcall 18,19,1,[mouse_speed]
|
||||
ret
|
||||
;-------------------------------------------------------------------------------
|
||||
_mouse_delay:
|
||||
mcall 18,19,3,[mouse_delay]
|
||||
ret
|
||||
;-------------------------------------------------------------------------------
|
||||
_speaker_mute:
|
||||
mcall 18,8,1
|
||||
cmp [speaker_mute],eax
|
||||
@ -806,8 +690,6 @@ textrus:
|
||||
db '<27> ᪫ ¤ª ª« ¢¨ âãàë : ENGLISH - + <20>ਬ¥¨âì'
|
||||
db '‚ª«îç¨âì LBA : OFF - + <20>ਬ¥¨âì'
|
||||
db '„®áâ㯠ª 訥 PCI : OFF - + <20>ਬ¥¨âì'
|
||||
db '<27><>牀痰<E78980> <20>珀<EFBFBD><E78F80> <20>荐 : 1 - + 踸<>⑧碎'
|
||||
db '<27><>ぅ爨<E38185><E788A8> 竅<>爛⑧<E7889B> <20>荐 : 0x00a - + 踸<>⑧碎'
|
||||
db '‚몫îç¨âì SPEAKER : OFF - + <20>ਬ¥¨âì'
|
||||
|
||||
db '‚<>ˆŒ€<C592>ˆ…: <20>ਬ¥¨âì ¢á¥ '
|
||||
@ -818,10 +700,8 @@ texteng:
|
||||
db 'Keyboard layout : ENGLISH - + Apply '
|
||||
db 'LBA read enabled : OFF - + Apply '
|
||||
db 'PCI access for appl. : OFF - + Apply '
|
||||
db 'Mouse pointer speed : 1 - + Apply '
|
||||
db 'Mouse pointer delay : 0x00a - + Apply '
|
||||
db 'SPEAKER disabled : OFF - + Apply '
|
||||
text1_strings = 7
|
||||
text1_strings = 5
|
||||
|
||||
db 'NOTE: Apply all '
|
||||
db 'SAVE YOUR SETTINGS BEFORE QUITING KOLIBRI Save all '
|
||||
@ -830,8 +710,6 @@ textet:
|
||||
db 'Klaviatuuri paigutus : ENGLISH - + Kinnita '
|
||||
db 'LBA lugemine lubatud : VÄL. - + Kinnita '
|
||||
db 'PCI juurdepääs programm. : VÄL. - + Kinnita '
|
||||
db 'Hiire kursori kiirus : 1 - + Kinnita '
|
||||
db 'Hiire kursori viide : 0x00a - + Kinnita '
|
||||
db 'SPEAKER disabled : VÄL. - + Kinnita '
|
||||
db 'MÄRKUS: Kinnita kõik'
|
||||
db 'SALVESTA SEADED ENNE KOLIBRIST VÄLJUMIST Salvesta kõik'
|
||||
@ -864,8 +742,6 @@ keyboard dd 0x0
|
||||
syslang dd 0x4 ; 4 - rus
|
||||
lba_read dd 0x1
|
||||
pci_acc dd 0x1
|
||||
mouse_speed dd 0x2
|
||||
mouse_delay dd 0xa
|
||||
speaker_mute dd 0 ; 0 - enable, 1 - disable
|
||||
;-----------------------------------------------------------------------------
|
||||
IM_END:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user