applied the saner patch (removed the pathetic one)

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 4357eae..c5e5f40 100644 (file)
--- a/event.c
+++ b/event.c
@@ -4,6 +4,7 @@
  */
 #include "dwm.h"
 #include <stdlib.h>
+#include <unistd.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
@@ -254,13 +255,15 @@ keypress(XEvent *e)
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-       for(i = 0; i < len; i++)
+       for(i = 0; i < len; i++) {
                if(keysym == key[i].keysym &&
-                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) {
+                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+               {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
                        return;
                }
+       }
 }
 
 static void
@@ -358,6 +361,11 @@ grabkeys()
        unsigned int i;
        KeyCode code;
 
+       while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
+                        GrabModeAsync, CurrentTime) != GrabSuccess)
+               usleep(1000);
+       XUngrabKeyboard(dpy, CurrentTime);
+
        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);
                XGrabKey(dpy, code, key[i].mod, root, True,
@@ -370,19 +378,3 @@ grabkeys()
                                GrabModeAsync, GrabModeAsync);
        }
 }
-
-void
-ungrabkeys()
-{
-       static unsigned int len = sizeof(key) / sizeof(key[0]);
-       unsigned int i;
-       KeyCode code;
-
-       for(i = 0; i < len; i++) {
-               code = XKeysymToKeycode(dpy, key[i].keysym);
-               XUngrabKey(dpy, code, key[i].mod, root);
-               XUngrabKey(dpy, code, key[i].mod | LockMask, root);
-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);
-       }
-}