ignore prompt if it is empty in addition to NULL

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 99db24e..3962801 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -72,7 +72,7 @@ main(int argc, char *argv[]) {
        for(i = 1; i < argc; i++)
                /* these options take no arguments */
                if(!strcmp(argv[i], "-v")) {      /* prints version information */
        for(i = 1; i < argc; i++)
                /* these options take no arguments */
                if(!strcmp(argv[i], "-v")) {      /* prints version information */

-                       puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details");
+                       puts("dmenu-"VERSION", © 2006-2012 dmenu engineers, see LICENSE for details");

                        exit(EXIT_SUCCESS);
                }
                else if(!strcmp(argv[i], "-b"))   /* appears at the bottom of the screen */
                        exit(EXIT_SUCCESS);
                }
                else if(!strcmp(argv[i], "-b"))   /* appears at the bottom of the screen */


@@ -117,7 +117,7 @@ main(int argc, char *argv[]) {
        setup();
        run();
 
        setup();
        run();
 

-       return EXIT_FAILURE; /* unreachable */
+       return 1; /* unreachable */

 }
 
 void
 }
 
 void


@@ -169,7 +169,7 @@ drawmenu(void) {
        dc->h = bh;
        drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
 
        dc->h = bh;
        drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
 

-       if(prompt) {
+       if(prompt && *prompt) {

                dc->w = promptw;
                drawtext(dc, prompt, selcol);
                dc->x = dc->w;
                dc->w = promptw;
                drawtext(dc, prompt, selcol);
                dc->x = dc->w;


@@ -243,21 +243,21 @@ keypress(XKeyEvent *ev) {
        len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
        if(status == XBufferOverflow)
                return;
        len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
        if(status == XBufferOverflow)
                return;

-       if(ev->state & ControlMask) {
-               KeySym lower, upper;
-
-               XConvertCase(ksym, &lower, &upper);
-               switch(lower) {
+       if(ev->state & ControlMask)
+               switch(ksym) {

                case XK_a: ksym = XK_Home;      break;
                case XK_b: ksym = XK_Left;      break;
                case XK_c: ksym = XK_Escape;    break;
                case XK_d: ksym = XK_Delete;    break;
                case XK_e: ksym = XK_End;       break;
                case XK_f: ksym = XK_Right;     break;
                case XK_a: ksym = XK_Home;      break;
                case XK_b: ksym = XK_Left;      break;
                case XK_c: ksym = XK_Escape;    break;
                case XK_d: ksym = XK_Delete;    break;
                case XK_e: ksym = XK_End;       break;
                case XK_f: ksym = XK_Right;     break;

+               case XK_g: ksym = XK_Escape;    break;

                case XK_h: ksym = XK_BackSpace; break;
                case XK_i: ksym = XK_Tab;       break;
                case XK_h: ksym = XK_BackSpace; break;
                case XK_i: ksym = XK_Tab;       break;

-               case XK_j: ksym = XK_Return;    break;
-               case XK_m: ksym = XK_Return;    break;
+               case XK_j: /* fallthrough */
+               case XK_J: ksym = XK_Return;    break;
+               case XK_m: /* fallthrough */
+               case XK_M: ksym = XK_Return;    break;

                case XK_n: ksym = XK_Down;      break;
                case XK_p: ksym = XK_Up;        break;
 
                case XK_n: ksym = XK_Down;      break;
                case XK_p: ksym = XK_Up;        break;
 


@@ -281,7 +281,17 @@ keypress(XKeyEvent *ev) {
                default:
                        return;
                }
                default:
                        return;
                }

-       }
+       else if(ev->state & Mod1Mask)
+               switch(ksym) {
+               case XK_g: ksym = XK_Home;  break;
+               case XK_G: ksym = XK_End;   break;
+               case XK_h: ksym = XK_Up;    break;
+               case XK_j: ksym = XK_Next;  break;
+               case XK_k: ksym = XK_Prior; break;
+               case XK_l: ksym = XK_Down;  break;
+               default:
+                       return;
+               }

        switch(ksym) {
        default:
                if(!iscntrl(*buf))
        switch(ksym) {
        default:
                if(!iscntrl(*buf))


@@ -569,18 +579,18 @@ setup(void) {
                y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
                mw = DisplayWidth(dc->dpy, screen);
        }
                y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
                mw = DisplayWidth(dc->dpy, screen);
        }

-       promptw = prompt ? textw(dc, prompt) : 0;
+       promptw = (prompt && *prompt) ? textw(dc, prompt) : 0;

        inputw = MIN(inputw, mw/3);
        match();
 
        /* create menu window */
        swa.override_redirect = True;
        inputw = MIN(inputw, mw/3);
        match();
 
        /* create menu window */
        swa.override_redirect = True;

-       swa.background_pixmap = ParentRelative;
+       swa.background_pixel = normcol[ColBG];

        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
                            DefaultDepth(dc->dpy, screen), CopyFromParent,
                            DefaultVisual(dc->dpy, screen),
        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
                            DefaultDepth(dc->dpy, screen), CopyFromParent,
                            DefaultVisual(dc->dpy, screen),

-                           CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa);
+                           CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);

 
        /* open input methods */
        xim = XOpenIM(dc->dpy, NULL, NULL, NULL);
 
        /* open input methods */
        xim = XOpenIM(dc->dpy, NULL, NULL, NULL);