X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=event.c;h=c5e5f400ba179be229bab548e63ebaef31c2db55;hb=fe3dfbbe90f813294bb69e41f996a000f63c1560;hp=e5ca1664854a8402c24820185dbf8dce386de1d8;hpb=d4b7a9a3735deeab639f28b5bb2f568e0dc49616;p=dwm.git

diff --git a/event.c b/event.c
index e5ca166..c5e5f40 100644
--- 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,