diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-01-09 20:26:11 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-01-09 20:26:11 -0600 |
| commit | 0de8fbecfa389ad03232440bcd91c10a2a7af7f2 (patch) | |
| tree | 24e0abbe3b51159de373a1b0c28f39eaca331bd1 /Source/Core/InputCommon/Src/ControllerInterface/Xlib | |
| parent | 6598462aba1e614e1ffb279c8e12976e2dab5b45 (diff) | |
Don't hardcode left-shift to disabe keyboard input on linux.
Left-shift can be used for gamepad input now.
Fixes issue 4968.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/Xlib')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp index c2030a059d..fa30ba5c62 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp @@ -116,8 +116,7 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key ControlState KeyboardMouse::Key::GetState() const { const KeyCode shift = XKeysymToKeycode(m_display, XK_Shift_L); - return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0 - && (m_keyboard[shift / 8] & (1 << (shift % 8))) == 0; + return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0; } ControlState KeyboardMouse::Button::GetState() const |