suckless-desktop/dmenu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: suckless-desktop:9fbfcdcee2fb858c0c74a799d0813efcdb7e4549
Branches Tags
suckless-desktop:mymain
..
compare: suckless-desktop:6a3e21f568a500bfcf504a61cdd791c251359027
Branches Tags
suckless-desktop:mymain

No commits in common. "9fbfcdcee2fb858c0c74a799d0813efcdb7e4549" and "6a3e21f568a500bfcf504a61cdd791c251359027" have entirely different histories.
9fbfcdcee2 ... 6a3e21f568

1 changed files with 16 additions and 23 deletions
Show Stats Expand all files Collapse all files

27
dmenu.c
View File

@ -170,26 +170,21 @@ drawmenu(void)
int x = 0, y = 0, w; int x = 0, y = 0, w;
drw_setscheme(drw, scheme[SchemeNorm]); drw_setscheme(drw, scheme[SchemeNorm]);
drw_rect(drw, x, y, mw, mh, 1, 1); drw_rect(drw, 0, 0, mw, mh, 1, 1);
if (prompt && *prompt) { if (prompt && *prompt) {
drw_setscheme(drw, scheme[SchemeSel]); drw_setscheme(drw, scheme[SchemeSel]);
int prompt_x = drw_text(drw, x, y, promptw, bh, lrpad / 2, prompt, 0); x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
if (lines > 0) {
y += bh;
} else {
x += prompt_x;
}
} }
/* draw input field */ /* draw input field */
w = (lines > 0 || !matches) ? mw - x : inputw; w = (lines > 0 || !matches) ? mw - x : inputw;
drw_setscheme(drw, scheme[SchemeNorm]); drw_setscheme(drw, scheme[SchemeNorm]);
drw_text(drw, x, y, w, bh, lrpad / 2, text, 0); drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
curpos = TEXTW(text) - TEXTW(&text[cursor]); curpos = TEXTW(text) - TEXTW(&text[cursor]);
if ((curpos += lrpad / 2 - 1) < w) { if ((curpos += lrpad / 2 - 1) < w) {
drw_setscheme(drw, scheme[SchemeCaret]); drw_setscheme(drw, scheme[SchemeCaret]);
drw_rect(drw, x + curpos, y + 2, 2, bh - 4, 1, 0); drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
} }
if (lines > 0) { if (lines > 0) {
@ -208,15 +203,15 @@ drawmenu(void)
w = TEXTW("<"); w = TEXTW("<");
if (curr->left) { if (curr->left) {
drw_setscheme(drw, scheme[SchemeNorm]); drw_setscheme(drw, scheme[SchemeNorm]);
drw_text(drw, x, y, w, bh, lrpad / 2, "<", 0); drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);
} }
x += w; x += w;
for (item = curr; item != next; item = item->right) for (item = curr; item != next; item = item->right)
x = drawitem(item, x, y, textw_clamp(item->stext, mw - x - TEXTW(">"))); x = drawitem(item, x, 0, textw_clamp(item->stext, mw - x - TEXTW(">")));
if (next) { if (next) {
w = TEXTW(">"); w = TEXTW(">");
drw_setscheme(drw, scheme[SchemeNorm]); drw_setscheme(drw, scheme[SchemeNorm]);
drw_text(drw, mw - w, y, w, bh, lrpad / 2, ">", 0); drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
} }
} }
drw_map(drw, win, 0, 0, mw, mh); drw_map(drw, win, 0, 0, mw, mh);
@ -543,15 +538,13 @@ insert:
break; break;
case XK_Return: case XK_Return:
case XK_KP_Enter: case XK_KP_Enter:
/* This is where we are handling Ctrl+Enter/Enter and were handling Shift+Enter */ puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
if (sel) {
puts(sel->text);
if (!(ev->state & ControlMask)) { if (!(ev->state & ControlMask)) {
cleanup(); cleanup();
exit(0); exit(0);
} }
if (sel)
sel->out = 1; sel->out = 1;
}
break; break;
case XK_Right: case XK_Right:
case XK_KP_Right: case XK_KP_Right:
@ -720,7 +713,7 @@ setup(void)
/* calculate menu geometry */ /* calculate menu geometry */
bh = drw->fonts->h + 2; bh = drw->fonts->h + 2;
lines = MAX(lines, 0); lines = MAX(lines, 0);
mh = (lines + 1 + (lines ? 1 : 0)) * bh; mh = (lines + 1) * bh;
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
#ifdef XINERAMA #ifdef XINERAMA
i = 0; i = 0;