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

reverting keyboard grab to root window - invoking several dmenu's now works again...
Wait for an Expose and draw the menu immediately after mapping the window.
2007-03-07 11:01:14 +01:00 · 2007-03-07 10:54:21 +01:00 · 2007-03-06 03:24:40 -05:00 · 2007-03-05 11:25:18 +01:00 · 2007-03-02 21:48:48 +01:00 · 2007-03-02 15:16:36 +01:00
4 changed files with 20 additions and 17 deletions
--- a/.hgtags
+++ b/.hgtags
@ -26,3 +26,5 @@ b6e09682c8adcb6569656bee73c311f9ab457715 2.3
 03e83e2788c83ddd63b45a667939d7ec783c98cb 2.4.1
 1ca5d430524e838c52ede912533cb90108c5cd66 2.4.2
 041143e9fc544c62edc58af52cae9ac5237e5945 2.5
+775f761a5647a05038e091d1c99fc35d3034cd68 2.6
+fbd9e9d63f202afe6834ccfdf890904f1897ec0b 2.7
--- a/config.mk
+++ b/config.mk
@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 2.6
+VERSION = 2.8

 # Customize below to fit your system

--- a/draw.c
+++ b/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];
-	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
-		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc,
-				x, y, buf, len);
-	}
-	else {
-		gcv.font = dc.font.xfont->fid;
-		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+	XSetForeground(dpy, dc.gc, col[ColFG]);
+	if(dc.font.set)
+		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+	else
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-	}
 }

 unsigned int
--- a/main.c
+++ b/main.c
@ -108,11 +108,17 @@ drawmenu(void) {
 	XFlush(dpy);
 }

-static void
+static Bool
 grabkeyboard(void) {
-	while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
-			 GrabModeAsync, CurrentTime) != GrabSuccess)
+	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
@ -456,10 +462,10 @@ main(int argc, char *argv[]) {
 	root = RootWindow(dpy, screen);
 	if(isatty(STDIN_FILENO)) {
 		maxname = readstdin();
-		grabkeyboard();
+		running = grabkeyboard();
 	}
 	else { /* prevent keypress loss */
-		grabkeyboard();
+		running = grabkeyboard();
 		maxname = readstdin();
 	}
 	/* init modifier map */
@ -493,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)
Author	SHA1	Message	Date
Anselm R. Garbe	f555908cef	attempt to grab the keyboard only 1000 times, not forever.	2007-03-07 11:01:14 +01:00
Anselm R. Garbe	73120414e2	reverting keyboard grab to root window - invoking several dmenu's now works again...	2007-03-07 10:54:21 +01:00
Kris Maglione	9911455f5b	Wait for an Expose and draw the menu immediately after mapping the window.	2007-03-06 03:24:40 -05:00
Anselm R. Garbe	2772c51e79	Added tag 2.7 for changeset fbd9e9d63f20	2007-03-05 11:25:18 +01:00
Anselm R. Garbe	d57c873f10	keyboard grab works on the dmenu window now (not on the root window) - thx for Kris for this hint	2007-03-02 21:48:48 +01:00
Anselm R. Garbe	724f72142f	also, don't set the font all the time	2007-03-02 15:16:36 +01:00
Anselm R. Garbe	5b8dce15d3	Added tag 2.6 for changeset 775f761a5647	2007-03-01 15:47:54 +01:00