thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up some magic numbers, remove old code.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-07-07 09:27:53 -07:00
parent f6abce2102
commit 55a060332e
1 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Windows/WndMainWindow.cpp
View file

@ -53,8 +53,6 @@ BOOL g_bFullScreen = FALSE;
static RECT g_normalRC = {0}; static RECT g_normalRC = {0};
extern bool g_TakeScreenshot; extern bool g_TakeScreenshot;
extern InputState input_state; extern InputState input_state;
extern const char * getVirtualKeyName(unsigned char key);
extern const char * getXinputButtonName(unsigned int button);
#define TIMER_CURSORUPDATE 1 #define TIMER_CURSORUPDATE 1
#define TIMER_CURSORMOVEUPDATE 2 #define TIMER_CURSORMOVEUPDATE 2
@ -96,14 +94,6 @@ namespace MainWindow
return hwndDisplay; 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) { void Init(HINSTANCE hInstance) {
#ifdef THEMES #ifdef THEMES
WTL::CTheme::IsThemingSupported(); WTL::CTheme::IsThemingSupported();
@ -459,19 +449,15 @@ namespace MainWindow
static int GetTrueVKey(const RAWKEYBOARD &kb) { static int GetTrueVKey(const RAWKEYBOARD &kb) {
switch (kb.VKey) { switch (kb.VKey) {
case VK_SHIFT: case VK_SHIFT:
if (kb.MakeCode == 0x36) // WTF? return MapVirtualKey(kb.MakeCode, MAPVK_VSC_TO_VK_EX);
return VK_RSHIFT;
else
return VK_LSHIFT;
case VK_CONTROL: case VK_CONTROL:
if (kb.Flags == 2) // Seems to contradict some documentation if (kb.Flags & RI_KEY_E0)
return VK_RCONTROL; return VK_RCONTROL;
else else
return VK_LCONTROL; return VK_LCONTROL;
// For some reason, we don't receive KEYDOWN for Alt keys, only KEYUP.
case VK_MENU: case VK_MENU:
if (kb.Flags == 3) if (kb.Flags & RI_KEY_E0)
return VK_RMENU; // Right Alt / AltGr return VK_RMENU; // Right Alt / AltGr
else else
return VK_LMENU; // Left Alt return VK_LMENU; // Left Alt
@ -857,7 +843,7 @@ namespace MainWindow
if (raw->header.dwType == RIM_TYPEKEYBOARD) { if (raw->header.dwType == RIM_TYPEKEYBOARD) {
KeyInput key; KeyInput key;
key.deviceId = DEVICE_ID_KEYBOARD; 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.flags = KEY_DOWN;
key.keyCode = windowsTransTable[GetTrueVKey(raw->data.keyboard)]; key.keyCode = windowsTransTable[GetTrueVKey(raw->data.keyboard)];
if (key.keyCode) if (key.keyCode)