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

2 files changed, 32 insertions, 14 deletions

diff --git a/dinput.c b/dinput.c
index 0bf2679..b69dcb3 100644
--- a/dinput.c
+++ b/dinput.c
@@ -76,11 +76,11 @@ drawinput(void)
         /* print prompt? */
         if(prompt) {
                 dc.w = promptw;
-                drawtext(&dc, prompt, selcol, False);
+                drawtext(&dc, prompt, normcol, False);
                 dc.x += dc.w;
         }
         dc.w = mw - dc.x;
-        drawtext(&dc, *text ? text : NULL, normcol, False);
+        drawtext(&dc, *text ? text : NULL, selcol, False);
         drawcursor();
         XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
         XFlush(dpy);
@@ -329,11 +329,15 @@ main(int argc, char *argv[]) {
         /* command line args */
         progname = argv[0];
         for(i = 1; i < argc; i++)
-                if(!strcmp(argv[i], "-b"))
+                if(!strcmp(argv[i], "-i"))
+                        ;  /* ignore flag */
+                else if(!strcmp(argv[i], "-b"))
                         topbar = False;
                 else if(!strcmp(argv[i], "-e")) {
                         if(++i < argc) parent = atoi(argv[i]);
                 }
+                else if(!strcmp(argv[i], "-l"))
+                        i++;  /* ignore flag */
                 else if(!strcmp(argv[i], "-fn")) {
                         if(++i < argc) font = argv[i];
                 }
@@ -352,13 +356,17 @@ main(int argc, char *argv[]) {
                 else if(!strcmp(argv[i], "-sf")) {
                         if(++i < argc) selfgcolor = argv[i];
                 }
-                else if(!strcmp(argv[i], "-v"))
-                        eprint("dinput-"VERSION", © 2006-2010 dinput engineers, see LICENSE for details\n");
+                else if(!strcmp(argv[i], "-v")) {
+                        printf("dinput-"VERSION", © 2006-2010 dinput engineers, see LICENSE for details\n");
+                        exit(EXIT_SUCCESS);
+                }
                 else if(!*text)
                         strncpy(text, argv[i], sizeof text);
-                else
-                        eprint("usage: dinput [-b] [-e <xid>] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-                               "              [-p <prompt>] [-sb <color>] [-sf <color>] [-v] [<text>]\n");
+                else {
+                        fputs("usage: dinput [-b] [-e <xid>] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+                              "              [-p <prompt>] [-sb <color>] [-sf <color>] [-v] [<text>]\n", stderr);
+                        exit(EXIT_FAILURE);
+                }
         if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                 fprintf(stderr, "dinput: warning: no locale support\n");
         if(!(dpy = XOpenDisplay(NULL)))
diff --git a/dmenu.c b/dmenu.c
index 8059f29..9e30add 100644
--- 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");
 }
 
@@ -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();