Windows also remaps the numeric keypad... grrr
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402729
This commit is contained in:
parent
f520bc7066
commit
1af0c41561
3 changed files with 25 additions and 5 deletions
|
@ -33,8 +33,8 @@
|
|||
#endif
|
||||
|
||||
/* Masks for processing the windows KEYDOWN and KEYUP messages */
|
||||
#define REPEATED_KEYMASK (1<<30)
|
||||
#define EXTENDED_KEYMASK (1<<24)
|
||||
#define REPEATED_KEYMASK (1<<30)
|
||||
#define EXTENDED_KEYMASK (1<<24)
|
||||
|
||||
#define VK_ENTER 10 /* Keypad Enter ... no VKEY defined? */
|
||||
|
||||
|
@ -52,13 +52,13 @@
|
|||
static WPARAM
|
||||
RemapVKEY(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
int i;
|
||||
BYTE scancode = (BYTE)((lParam >> 16) & 0xFF);
|
||||
|
||||
/* Windows remaps alphabetic keys based on current layout.
|
||||
We try to provide USB scancodes, so undo this mapping.
|
||||
*/
|
||||
if (wParam >= 'A' && wParam <= 'Z') {
|
||||
BYTE scancode = (BYTE)((lParam >> 16) & 0xFF);
|
||||
int i;
|
||||
|
||||
if (scancode != alpha_scancodes[wParam - 'A']) {
|
||||
for (i = 0; i < SDL_arraysize(alpha_scancodes); ++i) {
|
||||
if (scancode == alpha_scancodes[i]) {
|
||||
|
@ -68,6 +68,15 @@ RemapVKEY(WPARAM wParam, LPARAM lParam)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Keypad keys are a little trickier, we always scan for them. */
|
||||
for (i = 0; i < SDL_arraysize(keypad_scancodes); ++i) {
|
||||
if (scancode == keypad_scancodes[i]) {
|
||||
wParam = VK_NUMPAD0+i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return wParam;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue