mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 03:14:34 +01:00
Merge pull request #2686 from unknownbrackets/keymap-win
Clean up keymap for Windows
This commit is contained in:
commit
e2b5bfcd13
3 files changed
+23
-27
No files matched your search
@@ -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"},
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ std::map<int, int> windowsTransTable = InitConstMap<int, int>
|
||||
(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<int, int> windowsTransTable = InitConstMap<int, int>
|
||||
(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) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user