dinput with dmenu flags, fixed usage & -v, cosmetics

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 8c0ea41..9e30add 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -49,6 +49,7 @@ static void setup(Bool topbar);
 #include "draw.h"
 
 /* variables */
+static char **argp = NULL;
 static char *maxname = NULL;
 static char *prompt = NULL;
 static char text[4096];
@@ -151,7 +152,9 @@ cleanup(void) {
 void
 dinput(void) {
        cleanup();
-       execlp("dinput", "dinput", text, NULL); /* todo: argv */
+       argp[0] = "dinput";
+       argp[1] = text;
+       execvp("dinput", argp);
        eprint("cannot exec dinput\n");
 }
 
@@ -161,18 +164,18 @@ drawmenu(void) {
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
-       drawtext(&dc, NULL, normcol);
+       drawtext(&dc, NULL, normcol, False);
        /* print prompt? */
        if(prompt) {
                dc.w = promptw;
-               drawtext(&dc, prompt, selcol);
+               drawtext(&dc, prompt, selcol, False);
                dc.x += dc.w;
        }
        dc.w = mw - dc.x;
        /* print command */
        if(cmdw && item && lines == 0)
                dc.w = cmdw;
-       drawtext(&dc, *text ? text : NULL, normcol);
+       drawtext(&dc, *text ? text : NULL, normcol, False);
        if(curr) {
                if(lines > 0)
                        drawmenuv();
@@ -189,16 +192,16 @@ drawmenuh(void) {
 
        dc.x += cmdw;
        dc.w = spaceitem;
-       drawtext(&dc, curr->left ? "<" : NULL, normcol);
+       drawtext(&dc, curr->left ? "<" : NULL, normcol, False);
        dc.x += dc.w;
        for(i = curr; i != next; i = i->right) {
                dc.w = MIN(textw(&dc, i->text), mw / 3);
-               drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
+               drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
                dc.x += dc.w;
        }
        dc.w = spaceitem;
        dc.x = mw - dc.w;
-       drawtext(&dc, next ? ">" : NULL, normcol);
+       drawtext(&dc, next ? ">" : NULL, normcol, False);
 }
 
 void
@@ -209,11 +212,11 @@ drawmenuv(void) {
        dc.h = dc.font.height + 2;
        dc.y = dc.h;
        for(i = curr; i != next; i = i->right) {
-               drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
+               drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
                dc.y += dc.h;
        }
        dc.h = mh - dc.y;
-       drawtext(&dc, NULL, normcol);
+       drawtext(&dc, NULL, normcol, False);
 }
 
 Bool
@@ -456,7 +459,7 @@ run(void) {
 
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev))
-               switch (ev.type) {
+               switch(ev.type) {
                case KeyPress:
                        kpress(&ev.xkey);
                        break;
@@ -587,11 +590,15 @@ main(int argc, char *argv[]) {
                else if(!strcmp(argv[i], "-sf")) {
                        if(++i < argc) selfgcolor = argv[i];
                }
-               else if(!strcmp(argv[i], "-v"))
-                       eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
-               else
-                       eprint("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
-                              "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+               else if(!strcmp(argv[i], "-v")) {
+                       printf("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
+                       exit(EXIT_SUCCESS);
+               }
+               else {
+                       fputs("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
+                              "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n", stderr);
+                       exit(EXIT_FAILURE);
+               }
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fprintf(stderr, "dmenu: warning: no locale support\n");
        if(!(dpy = XOpenDisplay(NULL)))
@@ -599,6 +606,9 @@ main(int argc, char *argv[]) {
        screen = DefaultScreen(dpy);
        if(!parent)
                parent = RootWindow(dpy, screen);
+       if(!(argp = malloc(sizeof *argp * (argc+2))))
+               eprint("cannot malloc %u bytes\n", sizeof *argp * (argc+2));
+       memcpy(argp + 2, argv + 1, sizeof *argp * argc);
 
        readstdin();
        running = grabkeyboard();