forked from KolibriOS/kolibrios
Fix for Win-key, and I hope it is final.
git-svn-id: svn://kolibrios.org@3357 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
f6c49894db
commit
e886378587
@ -69,11 +69,6 @@ ext db ?
|
||||
chr dd ?
|
||||
shi dd ?
|
||||
|
||||
win_key_flag db ?
|
||||
|
||||
align 4
|
||||
active_process dd ?
|
||||
|
||||
align 4
|
||||
cl_3d_normal dd ?
|
||||
cl_3d_pushed dd ?
|
||||
|
@ -64,12 +64,6 @@ INI_SEC_PREFIX equ ''
|
||||
;-----------------------------------------------------------------------------
|
||||
section @CODE ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
;-----------------------------------------------------------------------------
|
||||
|
||||
mcall 9,p_info2,-1
|
||||
mov ecx,[ebx+30] ; PID
|
||||
mcall 18,21
|
||||
mov [active_process],eax ; WINDOW SLOT
|
||||
|
||||
cld
|
||||
mov edi,@UDATA
|
||||
mov ecx,@PARAMS-@UDATA
|
||||
@ -220,8 +214,6 @@ still:
|
||||
je .open_dialog
|
||||
mcall 10 ; wait here until event
|
||||
|
||||
call check_active_process_for_clear_all_flags
|
||||
|
||||
cmp [main_closed],0
|
||||
jne key.alt_x
|
||||
dec eax ; redraw ?
|
||||
@ -281,19 +273,6 @@ draw_window_for_OD:
|
||||
call draw_statusbar
|
||||
ret
|
||||
;-----------------------------------------------------------------------------
|
||||
check_active_process_for_clear_all_flags:
|
||||
push eax
|
||||
mcall 18,7
|
||||
cmp [active_process],eax
|
||||
je .exit
|
||||
|
||||
xor eax,eax
|
||||
mov [win_key_flag],al
|
||||
;--------------------------------------
|
||||
.exit:
|
||||
pop eax
|
||||
ret
|
||||
;-----------------------------------------------------------------------------
|
||||
copy_str_2:
|
||||
cld
|
||||
push esi ecx
|
||||
|
@ -24,24 +24,12 @@ key:
|
||||
jne still.skip_write
|
||||
shr eax,8
|
||||
;--------------------------------------
|
||||
cmp al,91 ; RWin DOWN
|
||||
je .set_win_key_flag
|
||||
cmp al,92 ; LWin DOWN
|
||||
jne @f
|
||||
.set_win_key_flag:
|
||||
mov [win_key_flag],1
|
||||
jmp still.skip_write
|
||||
@@:
|
||||
cmp al,219 ; RWin UP
|
||||
je .cut_win_key_flag
|
||||
cmp al,220 ; LWin UP
|
||||
jne @f
|
||||
.cut_win_key_flag:
|
||||
mov [win_key_flag],0
|
||||
jmp still.skip_write
|
||||
@@:
|
||||
cmp [win_key_flag],1
|
||||
je still.skip_write
|
||||
; this code for Win-keys, works with
|
||||
; kernel SVN r.3356 or later
|
||||
test [shi],0x200 ; LWin
|
||||
jnz still.skip_write
|
||||
test [shi],0x400 ; RWin
|
||||
jnz still.skip_write
|
||||
;--------------------------------------
|
||||
cmp al,224
|
||||
jne @f
|
||||
|
Loading…
Reference in New Issue
Block a user