Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Shift now cancels Numlock, as it does on real windows.

Browse source 
svn path=/trunk/; revision=6793
This commit is contained in:
Art Yerkes 2003-11-25 01:09:06 +00:00
parent 5e30da094e
commit 500ec5fe43
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
reactos/subsys/win32k/ntuser/keyboard.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: keyboard.c,v 1.16 2003/11/24 16:15:00 gvg Exp $ /* $Id: keyboard.c,v 1.17 2003/11/25 01:09:06 arty Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -925,6 +925,20 @@ NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ) {
return ret; return ret;
} }
/* Search the keyboard layout modifiers table for the shift bit. I don't
* want to count on the shift bit not moving, because it can be specified
* in the layout */
static DWORD FASTCALL GetShiftBit( PKBDTABLES pkKT ) {
int i;
for( i = 0; pkKT->pCharModifiers->pVkToBit[i].Vk; i++ )
if( pkKT->pCharModifiers->pVkToBit[i].Vk == VK_SHIFT )
return pkKT->pCharModifiers->pVkToBit[i].ModBits;
return 0;
}
/* /*
* Filter this message according to the current key layout, setting wParam * Filter this message according to the current key layout, setting wParam
* appropriately. * appropriately.
@ -934,6 +948,7 @@ VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) {
KIRQL OldIrql; KIRQL OldIrql;
DWORD ScanCode = 0, ModifierBits = 0; DWORD ScanCode = 0, ModifierBits = 0;
DWORD i = 0; DWORD i = 0;
DWORD BaseMapping = 0;
DWORD RawVk = 0; DWORD RawVk = 0;
static WORD NumpadConversion[][2] = static WORD NumpadConversion[][2] =
{ { VK_DELETE, VK_DECIMAL }, { { VK_DELETE, VK_DECIMAL },
@ -965,10 +980,13 @@ VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) {
/* Get the raw scan code, so we can look up whether the key is a numpad /* Get the raw scan code, so we can look up whether the key is a numpad
* key */ * key */
ScanCode = (Msg->lParam >> 16) & 0xff; ScanCode = (Msg->lParam >> 16) & 0xff;
Msg->wParam = IntMapVirtualKeyEx( ScanCode, 1, KeyboardLayout ); BaseMapping = Msg->wParam =
IntMapVirtualKeyEx( ScanCode, 1, KeyboardLayout );
RawVk = KeyboardLayout->pusVSCtoVK[ScanCode]; RawVk = KeyboardLayout->pusVSCtoVK[ScanCode];
if ((ModifierBits & NUMLOCK_BIT) && (RawVk & KNUMP)) if ((ModifierBits & NUMLOCK_BIT) &&
!(ModifierBits & GetShiftBit(KeyboardLayout)) &&
(RawVk & KNUMP))
{ {
/* The key in question is a numpad key. Search for a translation. */ /* The key in question is a numpad key. Search for a translation. */
for (i = 0; NumpadConversion[i][0]; i++) for (i = 0; NumpadConversion[i][0]; i++)
@ -981,6 +999,8 @@ VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) {
} }
} }
DbgPrint("Key: [%04x -> %04x]\n", BaseMapping, Msg->wParam);
/* Now that we have the VK, we can set the keymap appropriately /* Now that we have the VK, we can set the keymap appropriately
* This is a better place for this code, as it's guaranteed to be * This is a better place for this code, as it's guaranteed to be
* run, unlike translate message. */ * run, unlike translate message. */