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

[dmenu.git] / dinput.c

diff --git a/dinput.c b/dinput.c
index 283b018..b69dcb3 100644 (file)
--- a/dinput.c
+++ b/dinput.c
@@ -25,7 +25,7 @@ static void cleanup(void);
 static void drawcursor(void);
 static void drawinput(void);
 static Bool grabkeyboard(void);
 static void drawcursor(void);
 static void drawinput(void);
 static Bool grabkeyboard(void);

-static void kpress(XKeyEvent * e);
+static void kpress(XKeyEvent *e);

 static void run(void);
 static void setup(Bool topbar);
 
 static void run(void);
 static void setup(Bool topbar);
 


@@ -72,15 +72,15 @@ drawinput(void)
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
        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;
        /* print prompt? */
        if(prompt) {
                dc.w = promptw;

-               drawtext(&dc, prompt, selcol);
+               drawtext(&dc, prompt, normcol, False);

                dc.x += dc.w;
        }
        dc.w = mw - dc.x;
                dc.x += dc.w;
        }
        dc.w = mw - dc.x;

-       drawtext(&dc, *text ? text : NULL, normcol);
+       drawtext(&dc, *text ? text : NULL, selcol, False);

        drawcursor();
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XFlush(dpy);
        drawcursor();
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XFlush(dpy);


@@ -100,7 +100,7 @@ grabkeyboard(void) {
 }
 
 void
 }
 
 void

-kpress(XKeyEvent * e) {
+kpress(XKeyEvent *e) {

        char buf[sizeof text];
        int num;
        unsigned int i, len;
        char buf[sizeof text];
        int num;
        unsigned int i, len;


@@ -140,6 +140,7 @@ kpress(XKeyEvent * e) {
                        ksym = XK_BackSpace;
                        break;
                case XK_j:
                        ksym = XK_BackSpace;
                        break;
                case XK_j:

+               case XK_m:

                        ksym = XK_Return;
                        break;
                case XK_k:
                        ksym = XK_Return;
                        break;
                case XK_k:


@@ -232,7 +233,7 @@ run(void) {
 
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev))
 
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev))

-               switch (ev.type) {
+               switch(ev.type) {

                case KeyPress:
                        kpress(&ev.xkey);
                        break;
                case KeyPress:
                        kpress(&ev.xkey);
                        break;


@@ -274,12 +275,11 @@ setup(Bool topbar) {
        selcol[ColBG] = getcolor(&dc, selbgcolor);
        selcol[ColFG] = getcolor(&dc, selfgcolor);
        initfont(&dc, font);
        selcol[ColBG] = getcolor(&dc, selbgcolor);
        selcol[ColFG] = getcolor(&dc, selfgcolor);
        initfont(&dc, font);

-       fprintf(stderr, "dc.font.xfont: %u\n", (size_t)dc.font.xfont);

 
        /* input window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
 
        /* input window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;

-       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
+       wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;

 
        /* input window geometry */
        mh = dc.font.height + 2;
 
        /* input window geometry */
        mh = dc.font.height + 2;


@@ -329,11 +329,15 @@ main(int argc, char *argv[]) {
        /* command line args */
        progname = argv[0];
        for(i = 1; i < argc; i++)
        /* 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]);
                }
                        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];
                }
                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], "-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 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)))
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fprintf(stderr, "dinput: warning: no locale support\n");
        if(!(dpy = XOpenDisplay(NULL)))