badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Fix for Win-key, and I hope it is final.

Browse Source 
git-svn-id: svn://kolibrios.org@3357 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2013-03-08 17:26:40 +00:00
parent f6c49894db
commit e886378587
3 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/develop/tinypad/trunk/data/tp-udata.inc
View File

@ -69,11 +69,6 @@ ext db ?
chr dd ? chr dd ?
shi dd ? shi dd ?
win_key_flag db ?
align 4
active_process dd ?
align 4 align 4
cl_3d_normal dd ? cl_3d_normal dd ?
cl_3d_pushed dd ? cl_3d_pushed dd ?

21
programs/develop/tinypad/trunk/tinypad.asm
View File

@ -64,12 +64,6 @@ INI_SEC_PREFIX equ ''
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
section @CODE ;::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: section @CODE ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
mcall 9,p_info2,-1
mov ecx,[ebx+30] ; PID
mcall 18,21
mov [active_process],eax ; WINDOW SLOT
cld cld
mov edi,@UDATA mov edi,@UDATA
mov ecx,@PARAMS-@UDATA mov ecx,@PARAMS-@UDATA
@ -220,8 +214,6 @@ still:
je .open_dialog je .open_dialog
mcall 10 ; wait here until event mcall 10 ; wait here until event
call check_active_process_for_clear_all_flags
cmp [main_closed],0 cmp [main_closed],0
jne key.alt_x jne key.alt_x
dec eax ; redraw ? dec eax ; redraw ?
@ -281,19 +273,6 @@ draw_window_for_OD:
call draw_statusbar call draw_statusbar
ret 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: copy_str_2:
cld cld
push esi ecx push esi ecx

24
programs/develop/tinypad/trunk/tp-key.asm
View File

@ -24,24 +24,12 @@ key:
jne still.skip_write jne still.skip_write
shr eax,8 shr eax,8
;-------------------------------------- ;--------------------------------------
cmp al,91 ; RWin DOWN ; this code for Win-keys, works with
je .set_win_key_flag ; kernel SVN r.3356 or later
cmp al,92 ; LWin DOWN test [shi],0x200 ; LWin
jne @f jnz still.skip_write
.set_win_key_flag: test [shi],0x400 ; RWin
mov [win_key_flag],1 jnz still.skip_write
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
;-------------------------------------- ;--------------------------------------
cmp al,224 cmp al,224
jne @f jne @f