2 files changed, 1 insertions, 7 deletions
diff --git a/event.c b/event.c
index c5e5f40..1e077fa 100644
--- a/event.c
+++ b/event.c
@@ -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 @@ 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,
@@ -376,5 +370,6 @@ grabkeys()
 				GrabModeAsync, GrabModeAsync);
 		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
+		XSync(dpy, False);
 	}
 }
diff --git a/main.c b/main.c
index 6bbb28e..0a39c15 100644
--- a/main.c
+++ b/main.c
@@ -263,7 +263,6 @@ main(int argc, char *argv[])
 		if(readin)
 			FD_SET(STDIN_FILENO, &rd);
 		FD_SET(xfd, &rd);
-
 		i = select(xfd + 1, &rd, NULL, NULL, NULL);
 		if(i == -1 && errno == EINTR)
 			continue;