summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2012-08-10 09:19:01 +0000
committerStefan Schmidt <stefan@datenfreihafen.org>2012-08-10 09:19:01 +0000
commitfc24feaee22a50c60e9fb9eca79c8c12be463de5 (patch)
treeaaaeab852e3e1d6ad98ae5246fff36c15bc8875a
parentad8e7a7e8c815c033d9676bc35c65372d3ad96f9 (diff)
expedite: Switch to newer keycode to keysym handling from XKBlib.h
SVN revision: 75076
-rw-r--r--src/bin/engine_gl_x11.c5
-rw-r--r--src/bin/engine_software_xlib.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/bin/engine_gl_x11.c b/src/bin/engine_gl_x11.c
index fb57e70..4c8fdd1 100644
--- a/src/bin/engine_gl_x11.c
+++ b/src/bin/engine_gl_x11.c
@@ -1,6 +1,7 @@
1#include "main.h" 1#include "main.h"
2 2
3#include <X11/Xlib.h> 3#include <X11/Xlib.h>
4#include <X11/XKBlib.h>
4#include <X11/Xutil.h> 5#include <X11/Xutil.h>
5#include <X11/Xatom.h> 6#include <X11/Xatom.h>
6#include <Evas_Engine_GL_X11.h> 7#include <Evas_Engine_GL_X11.h>
@@ -148,7 +149,7 @@ engine_gl_x11_loop(void)
148 evas_event_feed_mouse_out(evas, 0, NULL); 149 evas_event_feed_mouse_out(evas, 0, NULL);
149 break; 150 break;
150 case KeyPress: 151 case KeyPress:
151 ks = XKeycodeToKeysym(ev.xkey.display, ev.xkey.keycode, 0); 152 ks = XkbKeycodeToKeysym(ev.xkey.display, ev.xkey.keycode, 0, 0);
152 kstr = XKeysymToString(ks); 153 kstr = XKeysymToString(ks);
153 if (kstr) 154 if (kstr)
154 { 155 {
@@ -189,7 +190,7 @@ engine_gl_x11_loop(void)
189 } 190 }
190 break; 191 break;
191 case KeyRelease: 192 case KeyRelease:
192 ks = XKeycodeToKeysym(ev.xkey.display, ev.xkey.keycode, 0); 193 ks = XkbKeycodeToKeysym(ev.xkey.display, ev.xkey.keycode, 0, 0);
193 kstr = XKeysymToString(ks); 194 kstr = XKeysymToString(ks);
194 if (kstr) 195 if (kstr)
195 { 196 {
diff --git a/src/bin/engine_software_xlib.c b/src/bin/engine_software_xlib.c
index e2ba397..0273796 100644
--- a/src/bin/engine_software_xlib.c
+++ b/src/bin/engine_software_xlib.c
@@ -1,6 +1,7 @@
1#include "main.h" 1#include "main.h"
2 2
3#include <X11/Xlib.h> 3#include <X11/Xlib.h>
4#include <X11/XKBlib.h>
4#include <X11/Xutil.h> 5#include <X11/Xutil.h>
5#include <X11/Xatom.h> 6#include <X11/Xatom.h>
6#include <Evas_Engine_Software_X11.h> 7#include <Evas_Engine_Software_X11.h>
@@ -161,7 +162,7 @@ engine_software_xlib_loop(void)
161 evas_event_feed_mouse_out(evas, 0, NULL); 162 evas_event_feed_mouse_out(evas, 0, NULL);
162 break; 163 break;
163 case KeyPress: 164 case KeyPress:
164 ks = XKeycodeToKeysym(ev.xkey.display, ev.xkey.keycode, 0); 165 ks = XkbKeycodeToKeysym(ev.xkey.display, ev.xkey.keycode, 0, 0);
165 kstr = XKeysymToString(ks); 166 kstr = XKeysymToString(ks);
166 if (kstr) 167 if (kstr)
167 { 168 {
@@ -202,7 +203,7 @@ engine_software_xlib_loop(void)
202 } 203 }
203 break; 204 break;
204 case KeyRelease: 205 case KeyRelease:
205 ks = XKeycodeToKeysym(ev.xkey.display, ev.xkey.keycode, 0); 206 ks = XkbKeycodeToKeysym(ev.xkey.display, ev.xkey.keycode, 0, 0);
206 kstr = XKeysymToString(ks); 207 kstr = XKeysymToString(ks);
207 if (kstr) 208 if (kstr)
208 { 209 {