--- a/event.c	Mon Aug 14 15:33:23 2006 +0200
+++ b/event.c	Mon Aug 14 15:43:04 2006 +0200
@@ -4,7 +4,6 @@
  */
 #include "dwm.h"
 #include <stdlib.h>
-#include <unistd.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
@@ -361,11 +360,6 @@
 	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,
@@ -376,5 +370,6 @@
 				GrabModeAsync, GrabModeAsync);
 		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
+		XSync(dpy, False);
 	}
 }