fixed a bug when dmenu is run with -v

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 3ac1c91..cd0e2b5 100644 (file)
--- a/main.c
+++ b/main.c
@@ -109,7 +109,7 @@ drawmenu(void) {
 }
 
 static unsigned long
 }
 
 static unsigned long

-getcolor(const char *colstr) {
+initcolor(const char *colstr) {

        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 


@@ -418,7 +418,9 @@ main(int argc, char *argv[]) {
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
 
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
 

-       if(isatty(STDIN_FILENO)) {
+       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();
        }
                fputs("error: dmenu can't run in an interactive shell\n", stdout);
                usage();
        }


@@ -445,8 +447,6 @@ main(int argc, char *argv[]) {
                else if(!strncmp(argv[i], "-sf", 4)) {
                        if(++i < argc) selfg = argv[i];
                }
                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, "");
                else
                        usage();
        setlocale(LC_CTYPE, "");


@@ -470,10 +470,10 @@ main(int argc, char *argv[]) {
        }
        XFreeModifiermap(modmap);
        /* style */
        }
        XFreeModifiermap(modmap);
        /* style */

-       dc.norm[ColBG] = getcolor(normbg);
-       dc.norm[ColFG] = getcolor(normfg);
-       dc.sel[ColBG] = getcolor(selbg);
-       dc.sel[ColFG] = getcolor(selfg);
+       dc.norm[ColBG] = initcolor(normbg);
+       dc.norm[ColFG] = initcolor(normfg);
+       dc.sel[ColBG] = initcolor(selbg);
+       dc.sel[ColFG] = initcolor(selfg);

        initfont(font);
        /* menu window */
        wa.override_redirect = 1;
        initfont(font);
        /* menu window */
        wa.override_redirect = 1;