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

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index beb8411..fa03ec8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -108,11 +108,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
@@ -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 */