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

.hgtags

@@ -25,3 +25,6 @@ b6e09682c8adcb6569656bee73c311f9ab457715 2.3
 9e9036cbfb4b7306c6fb366249e81dc0e65bdfde 2.4
 03e83e2788c83ddd63b45a667939d7ec783c98cb 2.4.1
 1ca5d430524e838c52ede912533cb90108c5cd66 2.4.2
+041143e9fc544c62edc58af52cae9ac5237e5945 2.5
+775f761a5647a05038e091d1c99fc35d3034cd68 2.6
+fbd9e9d63f202afe6834ccfdf890904f1897ec0b 2.7

config.mk

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

dmenu.1

@@ -1,4 +1,4 @@
-.TH DMENU 1 dmenu-VERSION
+.TH DMENU 1 dmenu\-VERSION
 .SH NAME
 dmenu \- dynamic menu
 .SH SYNOPSIS
@@ -53,41 +53,41 @@ dmenu is completely controlled by the keyboard. The following keys are recognize
 Appends the character to the text in the input field.  This works as a filter:
 only items containing this text will be displayed.
 .TP
-.B Left/Right (Mod1-h/Mod1-l)
+.B Left/Right (Mod1\-h/Mod1\-l)
 Select the previous/next item.
 .TP
-.B PageUp/PageDown (Mod1-k/Mod1-j)
+.B PageUp/PageDown (Mod1\-k/Mod1\-j)
 Select the first item of the previous/next 'page' of items.
 .TP
-.B Home/End (Mod1-g/Mod1-G)
+.B Home/End (Mod1\-g/Mod1\-G)
 Select the first/last item.
 .TP
-.B Tab (Control-i)
+.B Tab (Control\-i)
 Copy the selected item to the input field.
 .TP
-.B Return (Control-j)
+.B Return (Control\-j)
 Confirm selection and quit (print the selected item to standard output). Returns
 .B 0
 on termination.
 .TP
-.B Shift-Return (Control-Shift-j)
+.B Shift\-Return (Control\-Shift\-j)
 Confirm selection and quit (print the text in the input field to standard output).
 Returns
 .B 0
 on termination.
 .TP
-.B Escape (Control-bracketleft)
+.B Escape (Control\-bracketleft)
 Quit without selecting an item. Returns
 .B 1
 on termination.
 .TP
-.B Backspace (Control-h)
+.B Backspace (Control\-h)
-Remove enough characters from the input field to change its filtering effect.
+Remove a character from the input field.
 .TP
-.B Control-u
+.B Control\-u
 Remove all characters from the input field.
 .TP
-.B Control-w
+.B Control\-w
 Remove all characters of current word from the input field.
 .SH SEE ALSO
 .BR dwm (1),

draw.c

@@ -12,7 +12,6 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len, olen;
-	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
 	XSetForeground(dpy, dc.gc, col[ColBG]);
@@ -41,17 +40,11 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 	}
 	if(w > dc.w)
 		return; /* too long */
-	gcv.foreground = col[ColFG];
+	XSetForeground(dpy, dc.gc, col[ColFG]);
-	if(dc.font.set) {
+	if(dc.font.set)
-		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
-		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc,
+	else
-				x, y, buf, len);
-	}
-	else {
-		gcv.font = dc.font.xfont->fid;
-		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-	}
 }
 
 unsigned int

main.c

@@ -108,6 +108,19 @@ drawmenu(void) {
 	XFlush(dpy);
 }
 
+static Bool
+grabkeyboard(void) {
+	unsigned int len;
+
+	for(len = 1000; len; len--) {
+		if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+			== GrabSuccess)
+			break;
+		usleep(1000);
+	}
+	return len > 0;
+}
+
 static unsigned long
 initcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
@@ -196,7 +209,7 @@ match(char *pattern) {
 static void
 kpress(XKeyEvent * e) {
 	char buf[32];
-	int i, num, prev_nitem;
+	int i, num;
 	unsigned int len;
 	KeySym ksym;
 
@@ -282,12 +295,8 @@ kpress(XKeyEvent * e) {
 		}
 		break;
 	case XK_BackSpace:
-		if((i = len)) {
+		if(len) {
-			prev_nitem = nitem;
+			text[--len] = 0;
-			do {
-				text[--i] = 0;
-				match(text);
-			} while(i && nitem && prev_nitem == nitem);
 			match(text);
 		}
 		break;
@@ -418,12 +427,6 @@ main(int argc, char *argv[]) {
 	XModifierKeymap *modmap;
 	XSetWindowAttributes wa;
 
-	if(argc == 2 && !strncmp("-v", argv[1], 3))
-		eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
-	else if(isatty(STDIN_FILENO)) {
-		fputs("error: dmenu can't run in an interactive shell\n", stdout);
-		usage();
-	}
 	/* command line args */
 	for(i = 1; i < argc; i++)
 		if(!strncmp(argv[i], "-b", 3)) {
@@ -447,6 +450,8 @@ main(int argc, char *argv[]) {
 		else if(!strncmp(argv[i], "-sf", 4)) {
 			if(++i < argc) selfg = argv[i];
 		}
+		else if(!strncmp(argv[i], "-v", 3))
+			eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
 		else
 			usage();
 	setlocale(LC_CTYPE, "");
@@ -455,10 +460,14 @@ main(int argc, char *argv[]) {
 		eprint("dmenu: cannot open display\n");
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
-	while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
+	if(isatty(STDIN_FILENO)) {
-			 GrabModeAsync, CurrentTime) != GrabSuccess)
+		maxname = readstdin();
-		usleep(1000);
+		running = grabkeyboard();
-	maxname = readstdin();
+	}
+	else { /* prevent keypress loss */
+		running = grabkeyboard();
+		maxname = readstdin();
+	}
 	/* init modifier map */
 	modmap = XGetModifierMapping(dpy);
 	for (i = 0; i < 8; i++) {
@@ -490,6 +499,8 @@ main(int argc, char *argv[]) {
 	dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
 	dc.gc = XCreateGC(dpy, root, 0, 0);
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+	if(!dc.font.set)
+		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 	if(maxname)
 		cmdw = textw(maxname);
 	if(cmdw > mw / 3)