Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5871 → Rev 5872

/programs/system/taskbar/trunk/TASKBAR.ASM
122,29 → 122,9
 
mov [key_r],al
sub [key_r],2
cmp al, 2
jz alter
cmp [key_r],9
jc alter
 
cmp al, 3
jz alter
 
cmp al, 4
jz alter
 
cmp al, 5
jz alter
 
cmp al, 6
jz alter
 
cmp al, 7
jz alter
 
cmp al, 8
jz alter
;--------------------------------------
;align 4
;prod:
if caps_lock_check
cmp al,58 ;CAPS LOCK DOWN
jne @f
153,7 → 133,6
mcall 26,2,9
mov ebx,eax
mov eax,2
; call draw_window ;;;???
mov [draw_flag_certainly],1
call draw_flag ; language
popa
160,6 → 139,7
ret
@@:
end if
 
cmp al, 15 ; Alt+Tab DOWN
jz alt_tab_pressed
 
166,8 → 146,6
cmp al, 88 ; Ctrl+Alt+F12
jz start_end_application
 
 
 
cmp al, 91 ; RWin DOWN
jz set_win_key_flag
 
174,7 → 152,6
cmp al, 92 ; LWin DOWN
jz set_win_key_flag
 
 
cmp al, 219 ; RWin UP
jz cut_win_key_flag ;start_menu_application
 
181,7 → 158,6
cmp al, 220 ; LWin UP
jz cut_win_key_flag ;start_menu_application
 
 
cmp al, 62 ; Alt+F4
jz kill_active_application
 
205,12 → 181,6
;--------------------------------------
align 4
prod:
; cmp eax,0x20000
; je start_menu_application
 
; cmp eax,0x40000
; je start_menu_application
 
cmp [current_alt_tab_app], -1
jz @f
 
221,9 → 191,6
@@:
; this is hotkey Ctrl+Shift ;or LShift+RShift
jmp karu
; mov ebx, setup_exec
; test ah, 001100b
; jz change_sys_lang
;------------------------------------------------------------------------------
align 4
set_win_key_flag:
254,12 → 221,6
.ret:
ret
;------------------------------------------------------------------------------
;align 4
;change_sys_lang:
; mov dword [ebx+8], syslang
; mcall 70
; jmp begin_1
;------------------------------------------------------------------------------
align 4
start_end_application:
mov esi,end_name
387,15 → 348,6
cmp edi,eax
jg .apply_changes
 
; mov eax,[ebx+10]
; and eax,not 20202020h
; cmp eax,'SCRS'
; jz @f
 
; mov eax,[ebx+14]
; and eax,not 20202020h
; cmp eax,'HOOT'
; jne @r
mov esi,edx
mov ecx,11
add ebx,9
638,33 → 590,14
mcall 66,4,0,2 ; LShift+RShift
mcall 66,,,11h ; Ctrl+Shift
mcall 66,,88,110h ; Alt+Ctrl+F12
; mcall 66,,75 ; Alt+Ctrl+ArrowLeft DOWN
; mcall 66,,203 ; Alt+Ctrl+ArrowLeft UP
; mcall 66,,77 ; Alt+Ctrl+ArrowRight DOWN
; mcall 66,,205 ; Alt+Ctrl+ArrowRight UP
 
mcall 66,,91,0h ; RWin DOWN
mcall 66,,92 ; LWin DOWN
mcall 66,,219 ; RWin UP
mcall 66,,220 ; LWin UP
 
; mcall 66,,147,0h ; Win+R UP
mcall 66,,19,0h ; Win+R DOWN
 
; mcall 66,,23,0h ; Win+I DOWN
 
mcall 66,,32,0h ; Win+D DOWN
; mcall 66,,160,0h ; Win+D UP
 
mcall 66,,55,10h ; Ctrl+PrintScreen DOWN
; mcall 66,,183,10h ; Ctrl+PrintScreen UP
 
 
; mcall 66,,91,100h ; Alt+LWin
; mcall 66,,92 ; Alt+RWin
mcall 66,,62,300h ; Alt+F4
; mcall 66,,71 ; Alt+Home
; mcall 66,,72 ; Alt+Up
mcall 66,,2 ; Alt+1
mcall 66,,3 ; Alt+2
mcall 66,,4 ; Alt+3
672,6 → 605,8
mcall 66,,6 ; Alt+5
mcall 66,,7 ; Alt+6
mcall 66,,8 ; Alt+7
mcall 66,,9 ; Alt+8
mcall 66,,10 ; Alt+9
mcall 66,,15 ; Alt+Tab DOWN
mcall 66,,15,301h ; Alt+Shift+Tab DOWN
mcall 66,,69 ; Alt+Shift+NumLock
694,16 → 629,13
align 4
start_after_minimize:
call draw_window
; call draw_tray
call draw_running_applications
 
mcall 23,30
call load_ini
call fir_lng
;------------------------------------------------------------------------------
align 4
still:
; call draw_tray
call draw_time
call draw_cpu_usage
call draw_running_applications
770,8 → 702,6
@@:
cmp eax,3 ; button ?
jz button
 
; call handle_key
;--------------------------------------
align 4
.key:
838,7 → 768,6
align 4
.lp1:
call draw_window
; call draw_tray
jmp still
;------------------------------------------------------------------------------
align 4
926,12 → 855,6
cmp ah, 103
je clean_desktop_1 ; minimize all windows
 
; cmp ah, 104
; je restore_desktop ; restore minimized windows
 
; cmp ah, 105
; je swap_minimized_desktop ; minimize normal windows, and restore minimized windows
 
cmp ah,byte 1 ; start/terminate menu
jnz noselect
 
970,9 → 893,6
cmp ah,16
jne noid16
 
; mov ebx, setup_exec
; mov dword [ebx+8], chlang
; mcall 70
call karu
call draw_flag ; language
jmp still
979,16 → 899,6
;--------------------------------------
align 4
noid16:
; cmp ah,17
; jne noid17
;
; mov ebx, setup_exec
; mov dword [ebx+8], syslang
; mcall 70
; jmp still
;--------------------------------------
;align 4
; noid17:
cmp ah,18
jne noid18
 
1009,25 → 919,6
;--------------------------------------
align 4
noid18:
; cmp ah,19 ; speaker
; jne noid19
 
; mcall 18,8,2
; mcall 15,3
; jmp red
;--------------------------------------
;align 4
;noid19:
; cmp ah,20 ; start system setup
; jnz noid20
;
; mov ebx, setup_exec
; and dword [ebx+8], 0
; mcall 70
; jmp still
;--------------------------------------
;align 4
;noid20:
cmp ah,21
jnz noid21
 
1154,8 → 1045,6
mov bx,[height]
shr bx,1
sub bx,3
; mov ecx,[wcolor]
; add ecx,0x303030
mov edx,[wcolor]
mov eax,COLOR_CHANGE_MAGNITUDE_2
call add_color_change_magnitude
1186,8 → 1075,6
mov bx,[height]
shr bx,1
sub bx,3
; mov ecx,[wcolor]
; add ecx,0x303030
mov edx,[wcolor]
mov eax,COLOR_CHANGE_MAGNITUDE_2
call add_color_change_magnitude