From 75a3e391a096991f2c902457513612149f5412ed Mon Sep 17 00:00:00 2001 From: fgfemperor Date: Wed, 30 Dec 2009 16:20:41 +0000 Subject: * Hides cursor on D3D Fullscreen mode. Fixes Issue 1411 - It's worth noticing that both in OGL and D3D the Config options for Always and Auto Hide Cursor have no effect. I can't get (read) those values in D3DBase.cpp ... * Some more key bindings * Removes duplicate ifdef _Win32 from VKToString * Made VKToString a little faster (smarter) (but don't expect any speedups though...) * Corrects Pal60 name in Config (it was Pal6) I'm still trying to figure out why the Toggle Fullscreen Button doesn't work... Also I really thought about commiting my changes to Wiimote_real, which are tested and working for 1 real wiimote, but I need someone to test them with more than one real wiimote (I only have one)... See Issue 1876 ... git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4757 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputCommon/Src/Configuration.cpp | 28 ++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'Source/Core/InputCommon/Src/Configuration.cpp') diff --git a/Source/Core/InputCommon/Src/Configuration.cpp b/Source/Core/InputCommon/Src/Configuration.cpp index 5394877a64..0dc3e0b1d4 100644 --- a/Source/Core/InputCommon/Src/Configuration.cpp +++ b/Source/Core/InputCommon/Src/Configuration.cpp @@ -234,17 +234,10 @@ void Square2Circle(int &_x, int &_y, int _pad, std::string SDiagonal, bool Circl #ifdef _WIN32 std::string VKToString(int keycode) { -#ifdef _WIN32 // Default value char KeyStr[64] = {0}; std::string KeyString; - // TODO: Switch to unicode GetKeyNameText? - if (keycode < 256) // Keyboard - GetKeyNameTextA(MapVirtualKey(keycode, MAPVK_VK_TO_VSC) << 16, KeyStr, 64); - else // Pad - sprintf(KeyStr, "PAD: %d", keycode - 0x1000); - switch(keycode) { // Give it some help with a few keys @@ -270,17 +263,26 @@ std::string VKToString(int keycode) case VK_NUMLOCK: return "Num Lock"; case VK_MULTIPLY: return "Num *"; case VK_ADD: return "Num +"; - case VK_SEPARATOR: return "Num Separator"; + case VK_SEPARATOR: case 0xC2: return "Num Separator"; case VK_SUBTRACT: return "Num -"; case VK_DECIMAL: return "Num Decimal"; case VK_DIVIDE: return "Num /"; - default: return KeyString = KeyStr; + case VK_OEM_PLUS: return "="; + case VK_OEM_MINUS: return "-"; + case VK_OEM_COMMA: return ","; + case VK_OEM_PERIOD: return "."; + + //default: return KeyString = KeyStr; } -#else - // An equivalent name translation can probably be used on other systems to? - return ""; -#endif + + // TODO: Switch to unicode GetKeyNameText? + if (keycode < 256) // Keyboard + GetKeyNameTextA(MapVirtualKey(keycode, MAPVK_VK_TO_VSC) << 16, KeyStr, 64); + else // Pad + sprintf(KeyStr, "PAD: %d", keycode - 0x1000); + + return KeyString = KeyStr; } #endif -- cgit v1.2.3