X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/d32fd15ea47bab2bb9cc2674b75c3cc008ef04aa..4318bf2905a8da290ec83cb67f26bd06ba2e4dc9:/main.c?ds=sidebyside diff --git a/main.c b/main.c index ee32011..14581c4 100644 --- a/main.c +++ b/main.c @@ -77,32 +77,31 @@ drawmenu() dc.y = 0; dc.w = mw; dc.h = mh; - drawtext(NULL, False, False); + drawtext(NULL, False); /* print command */ if(cmdw && item) dc.w = cmdw; - drawtext(text[0] ? text : NULL, False, False); + drawtext(text[0] ? text : NULL, False); dc.x += cmdw; if(curr) { dc.w = SPACE; - drawtext((curr && curr->left) ? "<" : NULL, False, False); + drawtext((curr && curr->left) ? "<" : NULL, False); dc.x += dc.w; /* determine maximum items */ for(i = curr; i != next; i=i->right) { - dc.border = False; dc.w = textw(i->text); if(dc.w > mw / 3) dc.w = mw / 3; - drawtext(i->text, sel == i, sel == i); + drawtext(i->text, sel == i); dc.x += dc.w; } dc.x = mw - SPACE; dc.w = SPACE; - drawtext(next ? ">" : NULL, False, False); + drawtext(next ? ">" : NULL, False); } XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); XFlush(dpy); @@ -173,18 +172,16 @@ kpress(XKeyEvent * e) return; break; case XK_h: + case XK_H: ksym = XK_BackSpace; break; - case XK_U: case XK_u: + case XK_U: text[0] = 0; match(text); drawmenu(); return; break; - case XK_bracketleft: - ksym = XK_Escape; - break; } } switch(ksym) { @@ -319,7 +316,6 @@ main(int argc, char *argv[]) /* style */ dc.bg = getcolor(BGCOLOR); dc.fg = getcolor(FGCOLOR); - dc.border = getcolor(BORDERCOLOR); setfont(FONT); wa.override_redirect = 1;