mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle modifiers in Win32 keyboard.

Browse Source
This commit is contained in:
Themaister 2013-12-09 14:33:50 +01:00
parent df85b754b8
commit 40861aa17d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/context/win32_common.c
View File

@ -19,13 +19,21 @@
LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)
{ {
uint16_t mod = 0;
mod |= (GetKeyState(VK_SHIFT) & 0x80) ? RETROKMOD_SHIFT : 0;
mod |= (GetKeyState(VK_CONTROL) & 0x80) ? RETROKMOD_CTRL : 0;
mod |= (GetKeyState(VK_MENU) & 0x80) ? RETROKMOD_ALT : 0;
mod |= (GetKeyState(VK_CAPITAL) & 0x81) ? RETROKMOD_CAPSLOCK : 0;
mod |= (GetKeyState(VK_SCROLL) & 0x81) ? RETROKMOD_SCROLLOCK : 0;
mod |= ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x80) ? RETROKMOD_META : 0;
switch (message) switch (message)
{ {
// Seems to be hard to synchronize WM_CHAR and WM_KEYDOWN properly. // Seems to be hard to synchronize WM_CHAR and WM_KEYDOWN properly.
case WM_CHAR: case WM_CHAR:
{ {
if (g_extern.system.key_event) if (g_extern.system.key_event)
g_extern.system.key_event(true, RETROK_UNKNOWN, wparam, 0); // TODO: Mod state g_extern.system.key_event(true, RETROK_UNKNOWN, wparam, mod);
return TRUE; return TRUE;
} }
@ -35,7 +43,7 @@ LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, WPARAM wparam, LPAR
unsigned scancode = (lparam >> 16) & 0xff; unsigned scancode = (lparam >> 16) & 0xff;
unsigned keycode = input_translate_keysym_to_rk(scancode); unsigned keycode = input_translate_keysym_to_rk(scancode);
if (g_extern.system.key_event) if (g_extern.system.key_event)
g_extern.system.key_event(true, keycode, 0, 0); // TODO: Mod state g_extern.system.key_event(true, keycode, 0, mod);
return 0; return 0;
} }
@ -45,7 +53,7 @@ LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, WPARAM wparam, LPAR
unsigned scancode = (lparam >> 16) & 0xff; unsigned scancode = (lparam >> 16) & 0xff;
unsigned keycode = input_translate_keysym_to_rk(scancode); unsigned keycode = input_translate_keysym_to_rk(scancode);
if (g_extern.system.key_event) if (g_extern.system.key_event)
g_extern.system.key_event(false, keycode, 0, 0); // TODO: Mod state g_extern.system.key_event(false, keycode, 0, mod);
return 0; return 0;
} }
@ -54,7 +62,7 @@ LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, WPARAM wparam, LPAR
unsigned scancode = (lparam >> 16) & 0xff; unsigned scancode = (lparam >> 16) & 0xff;
unsigned keycode = input_translate_keysym_to_rk(scancode); unsigned keycode = input_translate_keysym_to_rk(scancode);
if (g_extern.system.key_event) if (g_extern.system.key_event)
g_extern.system.key_event(false, keycode, 0, 0); // TODO: Mod state g_extern.system.key_event(false, keycode, 0, mod);
return 0; return 0;
} }
@ -63,7 +71,7 @@ LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, WPARAM wparam, LPAR
unsigned scancode = (lparam >> 16) & 0xff; unsigned scancode = (lparam >> 16) & 0xff;
unsigned keycode = input_translate_keysym_to_rk(scancode); unsigned keycode = input_translate_keysym_to_rk(scancode);
if (g_extern.system.key_event) if (g_extern.system.key_event)
g_extern.system.key_event(true, keycode, 0, 0); // TODO: Mod state g_extern.system.key_event(true, keycode, 0, mod);
switch (wparam) switch (wparam)
{ {