X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=main.c;h=c63ac08a07710cfbf819ffce0883ad41dc51ee0c;hb=f189781bbd9d6519a31630c857e21407a5dac610;hp=beb8411d267e5d8124ae5fdee96b1c47eda402a9;hpb=d57c873f104cb8be34299efe70e02df4bf275d92;p=dmenu.git

diff --git a/main.c b/main.c
index beb8411..c63ac08 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,6 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI-MMVII Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dmenu.h"
 #include <ctype.h>
 #include <locale.h>
@@ -108,11 +107,17 @@ drawmenu(void) {
 	XFlush(dpy);
 }
 
-static void
+static Bool
 grabkeyboard(void) {
-	while(XGrabKeyboard(dpy, win, 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
@@ -210,6 +215,13 @@ kpress(XKeyEvent * e) {
 	len = strlen(text);
 	buf[0] = 0;
 	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
+	if(IsKeypadKey(ksym)) { 
+		if(ksym == XK_KP_Enter) {
+			ksym = XK_Return;
+		} else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) {
+			ksym = (ksym - XK_KP_0) + XK_0;
+		}
+	}
 	if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
 			|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
 			|| IsPrivateKeypadKey(ksym))
@@ -445,7 +457,7 @@ main(int argc, char *argv[]) {
 			if(++i < argc) selfg = argv[i];
 		}
 		else if(!strncmp(argv[i], "-v", 3))
-			eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
+			eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
 		else
 			usage();
 	setlocale(LC_CTYPE, "");
@@ -454,6 +466,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 +507,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 +517,8 @@ main(int argc, char *argv[]) {
 		promptw = mw / 5;
 	text[0] = 0;
 	match(text);
+	XMapRaised(dpy, win);
+	drawmenu();
 	XSync(dpy, False);
 
 	/* main event loop */