diff options
| author | fgfemperor <fgfemperor@gmail.com> | 2009-12-27 14:46:10 +0000 |
|---|---|---|
| committer | fgfemperor <fgfemperor@gmail.com> | 2009-12-27 14:46:10 +0000 |
| commit | 4483f2c7b5f9f312995c4764235a667b5f13e618 (patch) | |
| tree | cd2c45bb2066ad7b2efe1d2de3c378f36a5722a1 /Source/Core/InputCommon/Src/Configuration.cpp | |
| parent | 78facb0dc57d48225abe1b1282b33a5c197acc2c (diff) | |
Some more key binding fixes. I know I should have made it in just one commit, I'm sorry, but I forgot to test some keys...
This fixes on WiiMote Button Mapping:
Num /
Num *
Num Decimal
Num Separator
Num Lock
Right Alt -> But on keyboards that have "Alt Gr" keys it still gonnal report it as Left Ctrl, because when you press it, the OS sends a Left Ctrl then a Alt key...
Also fixes on SimplePad Button Mapping:
Num Decimal
Num Separator
Num Enter
Num Lock
Right Shift
Right Ctrl
Right Alt
Also it now differs Left (Ctrl|Shift|Alt) from the Right ones...
All keys should be working now... I left "Print Scrn" and "Pause" out because I don't think those can (or should) be bound...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4735 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/Configuration.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/Configuration.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/Src/Configuration.cpp b/Source/Core/InputCommon/Src/Configuration.cpp index c680decd48..5394877a64 100644 --- a/Source/Core/InputCommon/Src/Configuration.cpp +++ b/Source/Core/InputCommon/Src/Configuration.cpp @@ -260,10 +260,20 @@ std::string VKToString(int keycode) case VK_LEFT: return "LEFT"; case VK_RIGHT: return "RIGHT"; - case VK_LSHIFT: return "LEFT SHIFT"; - case VK_LCONTROL: return "LEFT CTRL"; - case VK_RCONTROL: return "RIGHT CTRL"; - case VK_LMENU: return "LEFT ALT"; + case VK_LSHIFT: return "Left Shift"; + case VK_RSHIFT: return "Right Shift"; + case VK_LCONTROL: return "Left Ctrl"; + case VK_RCONTROL: return "Right Ctrl"; + case VK_LMENU: return "Left Alt"; + case VK_RMENU: return "Right Alt"; + + case VK_NUMLOCK: return "Num Lock"; + case VK_MULTIPLY: return "Num *"; + case VK_ADD: return "Num +"; + case VK_SEPARATOR: return "Num Separator"; + case VK_SUBTRACT: return "Num -"; + case VK_DECIMAL: return "Num Decimal"; + case VK_DIVIDE: return "Num /"; default: return KeyString = KeyStr; } |