diff options
| author | Matthew Parlane <parlane@gmail.com> | 2012-12-24 12:58:15 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2012-12-24 12:58:15 +1300 |
| commit | f6418bd09357a528bc495f6854512586d76f28c6 (patch) | |
| tree | ce7748e276363190022f766f4e2d3664712f7c58 /Source/Core/InputCommon/Src/ControllerInterface | |
| parent | d9dd94ac8b696ceb0e6b32eaafcc302b41f43bd1 (diff) | |
| parent | eedca572702c7416805375bd652c56af8665d167 (diff) | |
Merge branch 'master' into wii-usb
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp index 450080bfd2..c2030a059d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp @@ -1,5 +1,7 @@ #include "Xlib.h" +#include <X11/XKBlib.h> + namespace ciface { namespace Xlib @@ -93,7 +95,7 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key KeySym keysym = 0; do { - keysym = XKeycodeToKeysym(m_display, keycode, i); + keysym = XkbKeycodeToKeysym(m_display, keycode, i, 0); i++; } while (keysym == NoSymbol && i < 8); |