From f6abce2102730221cfd0547d22c0a98cf6fe4415 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 7 Jul 2013 09:26:54 -0700 Subject: [PATCH] Add some missing keyboard VK constants. VK_PRINT is confusingly not print screen. Also remove some dups. --- Windows/KeyboardDevice.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Windows/KeyboardDevice.cpp b/Windows/KeyboardDevice.cpp index d4d53c89eb..fd24d166a0 100644 --- a/Windows/KeyboardDevice.cpp +++ b/Windows/KeyboardDevice.cpp @@ -92,7 +92,7 @@ std::map windowsTransTable = InitConstMap (VK_RIGHT, KEYCODE_DPAD_RIGHT) (VK_CAPITAL, KEYCODE_CAPS_LOCK) (VK_CLEAR, KEYCODE_CLEAR) - (VK_PRINT, KEYCODE_SYSRQ) + (VK_SNAPSHOT, KEYCODE_SYSRQ) (VK_SCROLL, KEYCODE_SCROLL_LOCK) (VK_OEM_1, KEYCODE_SEMICOLON) (VK_OEM_2, KEYCODE_SLASH) @@ -101,14 +101,21 @@ std::map windowsTransTable = InitConstMap (VK_OEM_5, KEYCODE_BACKSLASH) (VK_OEM_6, KEYCODE_RIGHT_BRACKET) (VK_OEM_7, KEYCODE_APOSTROPHE) - (VK_MENU, KEYCODE_MENU) - (VK_LSHIFT, KEYCODE_SHIFT_LEFT) - (VK_RSHIFT, KEYCODE_SHIFT_RIGHT) - (VK_LCONTROL, KEYCODE_CTRL_LEFT) - (VK_RCONTROL, KEYCODE_CTRL_RIGHT) - (VK_LMENU, KEYCODE_ALT_LEFT) - (VK_RMENU, KEYCODE_ALT_RIGHT) (VK_RETURN, KEYCODE_ENTER) + (VK_APPS, KEYCODE_MENU) // Context menu key, let's call this "menu". + (VK_PAUSE, KEYCODE_BREAK) + (VK_F1, KEYCODE_F1) + (VK_F2, KEYCODE_F2) + (VK_F3, KEYCODE_F3) + (VK_F4, KEYCODE_F4) + (VK_F5, KEYCODE_F5) + (VK_F6, KEYCODE_F6) + (VK_F7, KEYCODE_F7) + (VK_F8, KEYCODE_F8) + (VK_F9, KEYCODE_F9) + (VK_F10, KEYCODE_F10) + (VK_F11, KEYCODE_F11) + (VK_F12, KEYCODE_F12) (VK_OEM_102, KEYCODE_EXT_PIPE); int KeyboardDevice::UpdateState(InputState &input_state) {