From ef8ce2d05cb1704bed8cbca9d90b5ded266c1e0e Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 7 Jul 2013 09:26:30 -0700 Subject: [PATCH 1/3] Add some missing key names. --- Common/KeyMap.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp index c2a6b1b4b6..0ad3bdcd12 100644 --- a/Common/KeyMap.cpp +++ b/Common/KeyMap.cpp @@ -231,7 +231,9 @@ const KeyMap_IntStrPair key_names[] = { {KEYCODE_APOSTROPHE, "'"}, {KEYCODE_MINUS, "-"}, {KEYCODE_PLUS, "+"}, + {KEYCODE_SYSRQ, "Print"}, {KEYCODE_SCROLL_LOCK, "ScrLock"}, + {KEYCODE_BREAK, "Pause"}, {KEYCODE_BACK, "Back"}, {KEYCODE_TAB, "Tab"}, @@ -256,6 +258,7 @@ const KeyMap_IntStrPair key_names[] = { {KEYCODE_INSERT, "Ins"}, {KEYCODE_PAGE_UP, "PgUp"}, {KEYCODE_PAGE_DOWN, "PgDn"}, + {KEYCODE_CLEAR, "Clear"}, // 5 when numlock off {KEYCODE_CALL, "Call"}, {KEYCODE_ENDCALL, "End Call"}, From f6abce2102730221cfd0547d22c0a98cf6fe4415 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 7 Jul 2013 09:26:54 -0700 Subject: [PATCH 2/3] 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) { From 55a060332e9fbe16a52d56c032f15b74336b9780 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 7 Jul 2013 09:27:53 -0700 Subject: [PATCH 3/3] Clean up some magic numbers, remove old code. --- Windows/WndMainWindow.cpp | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index 88a70f565e..44fa52e560 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -53,8 +53,6 @@ BOOL g_bFullScreen = FALSE; static RECT g_normalRC = {0}; extern bool g_TakeScreenshot; extern InputState input_state; -extern const char * getVirtualKeyName(unsigned char key); -extern const char * getXinputButtonName(unsigned int button); #define TIMER_CURSORUPDATE 1 #define TIMER_CURSORMOVEUPDATE 2 @@ -96,14 +94,6 @@ namespace MainWindow return hwndDisplay; } - void SendCheckedNativeKey(KeyInput &key, int vKey) { - key.keyCode = windowsTransTable[(int)vKey]; - if (key.keyCode) { - key.flags = GetAsyncKeyState(vKey) ? KEY_DOWN : KEY_UP; - NativeKey(key); - } - } - void Init(HINSTANCE hInstance) { #ifdef THEMES WTL::CTheme::IsThemingSupported(); @@ -459,19 +449,15 @@ namespace MainWindow static int GetTrueVKey(const RAWKEYBOARD &kb) { switch (kb.VKey) { case VK_SHIFT: - if (kb.MakeCode == 0x36) // WTF? - return VK_RSHIFT; - else - return VK_LSHIFT; + return MapVirtualKey(kb.MakeCode, MAPVK_VSC_TO_VK_EX); case VK_CONTROL: - if (kb.Flags == 2) // Seems to contradict some documentation + if (kb.Flags & RI_KEY_E0) return VK_RCONTROL; else return VK_LCONTROL; - // For some reason, we don't receive KEYDOWN for Alt keys, only KEYUP. case VK_MENU: - if (kb.Flags == 3) + if (kb.Flags & RI_KEY_E0) return VK_RMENU; // Right Alt / AltGr else return VK_LMENU; // Left Alt @@ -854,10 +840,10 @@ namespace MainWindow GetRawInputData((HRAWINPUT)lParam, RID_INPUT, rawInputBuffer, &dwSize, sizeof(RAWINPUTHEADER)); RAWINPUT* raw = (RAWINPUT*)rawInputBuffer; - if (raw->header.dwType == RIM_TYPEKEYBOARD) { + if (raw->header.dwType == RIM_TYPEKEYBOARD) { KeyInput key; key.deviceId = DEVICE_ID_KEYBOARD; - if (raw->data.keyboard.Message == WM_KEYDOWN) { + if (raw->data.keyboard.Message == WM_KEYDOWN || raw->data.keyboard.Message == WM_SYSKEYDOWN) { key.flags = KEY_DOWN; key.keyCode = windowsTransTable[GetTrueVKey(raw->data.keyboard)]; if (key.keyCode)