attempt to grab the keyboard only 1000 times, not forever.

.hgtags

@@ -27,3 +27,4 @@ b6e09682c8adcb6569656bee73c311f9ab457715 2.3
 1ca5d430524e838c52ede912533cb90108c5cd66 2.4.2
 041143e9fc544c62edc58af52cae9ac5237e5945 2.5
 775f761a5647a05038e091d1c99fc35d3034cd68 2.6
+fbd9e9d63f202afe6834ccfdf890904f1897ec0b 2.7

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 2.7
+VERSION = 2.8
 
 # Customize below to fit your system
 

main.c

@@ -108,11 +108,17 @@ drawmenu(void) {
 	XFlush(dpy);
 }
 
-static void
+static Bool
 grabkeyboard(void) {
-	while(XGrabKeyboard(dpy, win, True, GrabModeAsync,
+	unsigned int len;
-			 GrabModeAsync, CurrentTime) != GrabSuccess)
+
+	for(len = 1000; len; len--) {
+		if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+			== GrabSuccess)
+			break;
 		usleep(1000);
+	}
+	return len > 0;
 }
 
 static unsigned long
@@ -454,6 +460,24 @@ main(int argc, char *argv[]) {
 		eprint("dmenu: cannot open display\n");
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
+	if(isatty(STDIN_FILENO)) {
+		maxname = readstdin();
+		running = grabkeyboard();
+	}
+	else { /* prevent keypress loss */
+		running = grabkeyboard();
+		maxname = readstdin();
+	}
+	/* init modifier map */
+	modmap = XGetModifierMapping(dpy);
+	for (i = 0; i < 8; i++) {
+		for (j = 0; j < modmap->max_keypermod; j++) {
+			if(modmap->modifiermap[i * modmap->max_keypermod + j]
+			== XKeysymToKeycode(dpy, XK_Num_Lock))
+				numlockmask = (1 << i);
+		}
+	}
+	XFreeModifiermap(modmap);
 	/* style */
 	dc.norm[ColBG] = initcolor(normbg);
 	dc.norm[ColFG] = initcolor(normfg);
@@ -477,25 +501,6 @@ main(int argc, char *argv[]) {
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 	if(!dc.font.set)
 		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
-	drawmenu();
-	XMapRaised(dpy, win);
-	if(isatty(STDIN_FILENO)) {
-		maxname = readstdin();
-		grabkeyboard();
-	}
-	else { /* prevent keypress loss */
-		grabkeyboard();
-		maxname = readstdin();
-	}
-	/* init modifier map */
-	modmap = XGetModifierMapping(dpy);
-	for(i = 0; i < 8; i++)
-		for(j = 0; j < modmap->max_keypermod; j++) {
-			if(modmap->modifiermap[i * modmap->max_keypermod + j]
-			== XKeysymToKeycode(dpy, XK_Num_Lock))
-				numlockmask = (1 << i);
-		}
-	XFreeModifiermap(modmap);
 	if(maxname)
 		cmdw = textw(maxname);
 	if(cmdw > mw / 3)
@@ -506,6 +511,8 @@ main(int argc, char *argv[]) {
 		promptw = mw / 5;
 	text[0] = 0;
 	match(text);
+	XMapRaised(dpy, win);
+	drawmenu();
 	XSync(dpy, False);
 
 	/* main event loop */