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 */
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;
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_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;
switch(ksym) {
case XK_g: ksym = XK_Home; break;
case XK_G: ksym = XK_End; break;
- case XK_h: ksym = XK_Prior; break;
- case XK_j: ksym = XK_Up; break;
- case XK_k: ksym = XK_Down; break;
- case XK_l: ksym = XK_Next; 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;
}
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();