preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-04 03:35:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add keymap support for alt/shift/ctrl on Windows.

Browse Source 
WM_KEYDOWN only gets VK_SHIFT, not L or R.  We could detect which on
press, but not on release.  It's simpler to just resend both.
This commit is contained in:
Unknown W. Brackets
2013-07-06 23:06:33 -07:00
parent cb249c469b
commit 39fc7931bb
2 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Windows/WndMainWindow.cpp
+51 -13
View File
@@ -85,18 +85,23 @@ namespace MainWindow
LRESULT CALLBACK DisplayProc(HWND, UINT, WPARAM, LPARAM);
LRESULT CALLBACK About(HWND, UINT, WPARAM, LPARAM);
HWND GetHWND()
{
HWND GetHWND() {
return hwndMain;
}
HWND GetDisplayHWND()
{
HWND GetDisplayHWND() {
return hwndDisplay;
}
void Init(HINSTANCE hInstance)
{
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();
#endif
@@ -785,7 +790,7 @@ namespace MainWindow
ShellExecute(NULL, "open", "http://forums.ppsspp.org/", NULL, NULL, SW_SHOWNORMAL);
break;
case ID_HELP_ABOUT:
case ID_HELP_ABOUT:
DialogManager::EnableAll(FALSE);
DialogBox(hInst, (LPCTSTR)IDD_ABOUTBOX, hWnd, (DLGPROC)About);
DialogManager::EnableAll(TRUE);
@@ -806,9 +811,25 @@ namespace MainWindow
KeyInput key;
key.deviceId = DEVICE_ID_KEYBOARD;
key.flags = KEY_DOWN;
key.keyCode = windowsTransTable[(int)wParam];
if (key.keyCode)
NativeKey(key);
switch ((int)wParam) {
case VK_SHIFT:
SendCheckedNativeKey(key, VK_LSHIFT);
SendCheckedNativeKey(key, VK_RSHIFT);
break;
case VK_CONTROL:
SendCheckedNativeKey(key, VK_LCONTROL);
SendCheckedNativeKey(key, VK_RCONTROL);
break;
case VK_MENU:
SendCheckedNativeKey(key, VK_LMENU);
SendCheckedNativeKey(key, VK_RMENU);
break;
default:
key.keyCode = windowsTransTable[(int)wParam];
if (key.keyCode)
NativeKey(key);
break;
}
}
return 0;
@@ -817,9 +838,26 @@ namespace MainWindow
KeyInput key;
key.deviceId = DEVICE_ID_KEYBOARD;
key.flags = KEY_UP;
key.keyCode = windowsTransTable[(int)wParam];
if (key.keyCode)
NativeKey(key);
switch ((int)wParam) {
case VK_SHIFT:
// We have no idea which was released, so just resend both.
SendCheckedNativeKey(key, VK_LSHIFT);
SendCheckedNativeKey(key, VK_RSHIFT);
break;
case VK_CONTROL:
SendCheckedNativeKey(key, VK_LCONTROL);
SendCheckedNativeKey(key, VK_RCONTROL);
break;
case VK_MENU:
SendCheckedNativeKey(key, VK_LMENU);
SendCheckedNativeKey(key, VK_RMENU);
break;
default:
key.keyCode = windowsTransTable[(int)wParam];
if (key.keyCode)
NativeKey(key);
break;
}
}
return 0;