From ec26c13de147ef048bb8070e11f96af4879faabd Mon Sep 17 00:00:00 2001
From: Ivan Kanakarakis <ivan.kanak@gmail.com>
Date: Tue, 13 Mar 2012 21:58:51 +0200
Subject: Replace XKeycodeToKeysym with XkbKeycodeToKeysym

XKeycodeToKeysym is now deprecated, as per
http://www.x.org/releases/X11R7.6/changelog.txt
Dirk Wallenstein (5):
    man: Redirect users from XKeycodeToKeysym to XkbKeycodeToKeysym #25732
---
 monsterwm.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'monsterwm.c')

diff --git a/monsterwm.c b/monsterwm.c
index 6f2c061..b2ee3f0 100644
--- a/monsterwm.c
+++ b/monsterwm.c
@@ -7,9 +7,8 @@
 #include <string.h>
 #include <signal.h>
 #include <sys/wait.h>
-#include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/keysym.h>
+#include <X11/XKBlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
 
@@ -408,7 +407,7 @@ void grid(int hh, int cy) {
 
 /* on the press of a key check to see if there's a binded function to call */
 void keypress(XEvent *e) {
-    KeySym keysym = XKeycodeToKeysym(dis, (KeyCode)e->xkey.keycode, 0);
+    KeySym keysym = XkbKeycodeToKeysym(dis, e->xkey.keycode, 0, 0);
     for (unsigned int i=0; i<LENGTH(keys); i++)
         if (keysym == keys[i].keysym && CLEANMASK(keys[i].mod) == CLEANMASK(e->xkey.state)
                    && keys[i].func) keys[i].func(&keys[i].arg);
-- 
cgit v1.3.1