Faris
/
dmenu
mirror of git://git.suckless.org/dmenu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new libdraw

This commit is contained in:
Connor Lane Smith 2010-08-19 16:43:39 +01:00
parent c7a8f17bd2
commit 5376113039
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dmenu.c
View File

@ -80,13 +80,13 @@ calcoffsets(void) {
if(lines > 0) if(lines > 0)
n = lines * bh; n = lines * bh;
else else
n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">")); n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">"));
for(i = 0, next = curr; next; next = next->right) for(i = 0, next = curr; next; next = next->right)
if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), mw/3)) > n) if((i += (lines > 0) ? bh : MIN(dc_textw(dc, next->text), mw/3)) > n)
break; break;
for(i = 0, prev = curr; prev && prev->left; prev = prev->left) for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), mw/3)) > n) if((i += (lines > 0) ? bh : MIN(dc_textw(dc, prev->left->text), mw/3)) > n)
break; break;
} }
@ -98,41 +98,41 @@ drawmenu(void) {
dc->x = 0; dc->x = 0;
dc->y = 0; dc->y = 0;
dc->h = bh; dc->h = bh;
drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol)); dc_drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
if(prompt) { if(prompt) {
dc->w = promptw; dc->w = promptw;
drawtext(dc, prompt, selcol); dc_drawtext(dc, prompt, selcol);
dc->x = dc->w; dc->x = dc->w;
} }
dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw; dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
drawtext(dc, text, normcol); dc_drawtext(dc, text, normcol);
if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w) if((curpos = dc_textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol)); dc_drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
if(lines > 0) { if(lines > 0) {
dc->w = mw - dc->x; dc->w = mw - dc->x;
for(item = curr; item != next; item = item->right) { for(item = curr; item != next; item = item->right) {
dc->y += dc->h; dc->y += dc->h;
drawtext(dc, item->text, (item == sel) ? selcol : normcol); dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
} }
} }
else if(matches) { else if(matches) {
dc->x += inputw; dc->x += inputw;
dc->w = textw(dc, "<"); dc->w = dc_textw(dc, "<");
if(curr->left) if(curr->left)
drawtext(dc, "<", normcol); dc_drawtext(dc, "<", normcol);
for(item = curr; item != next; item = item->right) { for(item = curr; item != next; item = item->right) {
dc->x += dc->w; dc->x += dc->w;
dc->w = MIN(textw(dc, item->text), mw/3); dc->w = MIN(dc_textw(dc, item->text), mw/3);
drawtext(dc, item->text, (item == sel) ? selcol : normcol); dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
} }
dc->w = textw(dc, ">"); dc->w = dc_textw(dc, ">");
dc->x = mw - dc->w; dc->x = mw - dc->w;
if(next) if(next)
drawtext(dc, ">", normcol); dc_drawtext(dc, ">", normcol);
} }
mapdraw(dc, win, mw, mh); dc_map(dc, win, mw, mh);
} }
char * char *
@ -396,7 +396,7 @@ readstdin(void) {
if(!(item->text = strdup(buf))) if(!(item->text = strdup(buf)))
eprintf("cannot strdup %u bytes\n", strlen(buf)+1); eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
item->next = item->left = item->right = NULL; item->next = item->left = item->right = NULL;
inputw = MAX(inputw, textw(dc, item->text)); inputw = MAX(inputw, dc_textw(dc, item->text));
} }
} }
@ -437,10 +437,10 @@ setup(void) {
root = RootWindow(dc->dpy, screen); root = RootWindow(dc->dpy, screen);
utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
normcol[ColBG] = getcolor(dc, normbgcolor); normcol[ColBG] = dc_color(dc, normbgcolor);
normcol[ColFG] = getcolor(dc, normfgcolor); normcol[ColFG] = dc_color(dc, normfgcolor);
selcol[ColBG] = getcolor(dc, selbgcolor); selcol[ColBG] = dc_color(dc, selbgcolor);
selcol[ColFG] = getcolor(dc, selfgcolor); selcol[ColFG] = dc_color(dc, selfgcolor);
/* menu geometry */ /* menu geometry */
bh = dc->font.height + 2; bh = dc->font.height + 2;
@ -478,9 +478,9 @@ setup(void) {
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
grabkeyboard(); grabkeyboard();
resizedraw(dc, mw, mh); dc_resize(dc, mw, mh);
inputw = MIN(inputw, mw/3); inputw = MIN(inputw, mw/3);
promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0; promptw = prompt ? MIN(dc_textw(dc, prompt), mw/5) : 0;
XMapRaised(dc->dpy, win); XMapRaised(dc->dpy, win);
text[0] = '\0'; text[0] = '\0';
match(); match();
@ -528,8 +528,8 @@ main(int argc, char *argv[]) {
else else
usage(); usage();
dc = initdraw(); dc = dc_init();
initfont(dc, font); dc_font(dc, font);
readstdin(); readstdin();
setup(); setup();
run(); run();