referred to LICENSE file

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index beb8411..9c10958 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,4 @@
-/* (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.
- */
+/* See LICENSE file for copyright and license details. */
 #include "dmenu.h"
 #include <ctype.h>
 #include <locale.h>
@@ -108,11 +105,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
@@ -130,6 +133,8 @@ initfont(const char *fontstr) {
        char *def, **missing;
        int i, n;
 
+       if(!fontstr || fontstr[0] == '\0')
+               eprint("error, cannot load font: '%s'\n", fontstr);
        missing = NULL;
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
@@ -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))
@@ -423,29 +435,29 @@ main(int argc, char *argv[]) {
 
        /* command line args */
        for(i = 1; i < argc; i++)
-               if(!strncmp(argv[i], "-b", 3)) {
+               if(!strcmp(argv[i], "-b")) {
                        bottom = True;
                }
-               else if(!strncmp(argv[i], "-fn", 4)) {
+               else if(!strcmp(argv[i], "-fn")) {
                        if(++i < argc) font = argv[i];
                }
-               else if(!strncmp(argv[i], "-nb", 4)) {
+               else if(!strcmp(argv[i], "-nb")) {
                        if(++i < argc) normbg = argv[i];
                }
-               else if(!strncmp(argv[i], "-nf", 4)) {
+               else if(!strcmp(argv[i], "-nf")) {
                        if(++i < argc) normfg = argv[i];
                }
-               else if(!strncmp(argv[i], "-p", 3)) {
+               else if(!strcmp(argv[i], "-p")) {
                        if(++i < argc) prompt = argv[i];
                }
-               else if(!strncmp(argv[i], "-sb", 4)) {
+               else if(!strcmp(argv[i], "-sb")) {
                        if(++i < argc) selbg = argv[i];
                }
-               else if(!strncmp(argv[i], "-sf", 4)) {
+               else if(!strcmp(argv[i], "-sf")) {
                        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 if(!strcmp(argv[i], "-v"))
+                       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 */