Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-05-30 17:27:22 +02:00
commit 0618ef649e
1 changed files with 2 additions and 1 deletions

View File

@ -13,6 +13,7 @@
#include <string.h> #include <string.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/XKBlib.h>
#include "libi3.h" #include "libi3.h"
@ -139,7 +140,7 @@ bindcode:
* more likely for special characters). */ * more likely for special characters). */
level = 1; level = 1;
} }
KeySym sym = XKeycodeToKeysym(dpy, $4, level); KeySym sym = XkbKeycodeToKeysym(dpy, $4, 0, level);
char *str = XKeysymToString(sym); char *str = XKeysymToString(sym);
char *modifiers = modifier_to_string($<number>3); char *modifiers = modifier_to_string($<number>3);
// TODO: modifier to string // TODO: modifier to string