Fixed compile warning in SkOSWindow_unix.cpp
Committed on behalf of kondapallykalyan@gmail.com
Review URL: http://codereview.appspot.com/6302092/
git-svn-id: http://skia.googlecode.com/svn/trunk@4278 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/views/unix/SkOSWindow_Unix.cpp b/src/views/unix/SkOSWindow_Unix.cpp
index f2e3541..e761bde 100644
--- a/src/views/unix/SkOSWindow_Unix.cpp
+++ b/src/views/unix/SkOSWindow_Unix.cpp
@@ -7,7 +7,7 @@
*/
#include <X11/Xlib.h>
#include <X11/Xatom.h>
-#include <X11/keysym.h>
+#include <X11/XKBlib.h>
#include <GL/glx.h>
#include <GL/gl.h>
#include <GL/glu.h>
@@ -181,7 +181,7 @@
this->handleClick(evt.xmotion.x, evt.xmotion.y, SkView::Click::kMoved_State);
break;
case KeyPress: {
- KeySym keysym = XKeycodeToKeysym(dsp, evt.xkey.keycode, 0);
+ KeySym keysym = XkbKeycodeToKeysym(dsp, evt.xkey.keycode, 0, 0);
//SkDebugf("pressed key %i!\n\tKeySym:%i\n", evt.xkey.keycode, XKeycodeToKeysym(dsp, evt.xkey.keycode, 0));
if (keysym == XK_Escape) {
loop = false;
@@ -196,7 +196,7 @@
}
case KeyRelease:
//SkDebugf("released key %i\n", evt.xkey.keycode);
- this->handleKeyUp(XKeyToSkKey(XKeycodeToKeysym(dsp, evt.xkey.keycode, 0)));
+ this->handleKeyUp(XKeyToSkKey(XkbKeycodeToKeysym(dsp, evt.xkey.keycode, 0, 0)));
break;
case ClientMessage:
if (SkEvent::ProcessEvent()) {