summaryrefslogtreecommitdiff
path: root/src/core/keybindings.c
diff options
context:
space:
mode:
authorSteve Zesch <[email protected]>2012-11-20 20:57:16 -0800
committerSteve Zesch <[email protected]>2012-11-20 20:57:16 -0800
commit3ba516419041962944da9f9bdf0cb55810a2ad02 (patch)
tree620d5fa2f8be7c9a65313c6a238cc349e6faaad4 /src/core/keybindings.c
parentd72b5f2a0bbd035a98979c3519de90a194f67e05 (diff)
parent3c82397d3fdbbaa8d1614a6f5eeeaad4ef20d3f6 (diff)
downloadmarco-3ba516419041962944da9f9bdf0cb55810a2ad02.tar.bz2
marco-3ba516419041962944da9f9bdf0cb55810a2ad02.tar.xz
Merge pull request #26 from sbalneav/master
Deprecations and warnings
Diffstat (limited to 'src/core/keybindings.c')
-rw-r--r--src/core/keybindings.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 8dda13cd..07384b22 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1273,7 +1273,11 @@ meta_display_process_key_event (MetaDisplay *display,
/* window may be NULL */
+#ifdef HAVE_XKB
+ keysym = XkbKeycodeToKeysym (display->xdisplay, event->xkey.keycode, 0, 0);
+#else
keysym = XKeycodeToKeysym (display->xdisplay, event->xkey.keycode, 0);
+#endif
str = XKeysymToString (keysym);