aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorAnselm R. Garbe <arg@10kloc.org>2006-08-25 07:54:20 +0200
committerAnselm R. Garbe <arg@10kloc.org>2006-08-25 07:54:20 +0200
commit65be999a3f76ad51fb97e12f2fb481f5038f6817 (patch)
tree3e8855cafb5992a1d66515ce345bc619bc43f295 /main.c
parent37faefb1aab1a6a36c5a8017e24bbca22fd23530 (diff)
downloaddmenu-65be999a3f76ad51fb97e12f2fb481f5038f6817.tar.gz
dmenu-65be999a3f76ad51fb97e12f2fb481f5038f6817.tar.bz2
dmenu-65be999a3f76ad51fb97e12f2fb481f5038f6817.zip
back to 3 colors
Diffstat (limited to 'main.c')
-rw-r--r--main.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/main.c b/main.c
index c3cad1d..840a7bc 100644
--- a/main.c
+++ b/main.c
@@ -77,17 +77,17 @@ drawmenu()
dc.y = 0;
dc.w = mw;
dc.h = mh;
- drawtext(NULL, 0, False);
+ drawtext(NULL, False, False);
/* print command */
if(cmdw && item)
dc.w = cmdw;
- drawtext(text[0] ? text : NULL, 0, False);
+ drawtext(text[0] ? text : NULL, False, False);
dc.x += cmdw;
if(curr) {
dc.w = SPACE;
- drawtext((curr && curr->left) ? "<" : NULL, 0, False);
+ drawtext((curr && curr->left) ? "<" : NULL, False, False);
dc.x += dc.w;
/* determine maximum items */
@@ -95,13 +95,13 @@ drawmenu()
dc.w = textw(i->text);
if(dc.w > mw / 3)
dc.w = mw / 3;
- drawtext(i->text, sel == i ? 1 : 0, sel == i);
+ drawtext(i->text, sel == i, sel == i);
dc.x += dc.w;
}
dc.x = mw - SPACE;
dc.w = SPACE;
- drawtext(next ? ">" : NULL, 0, False);
+ drawtext(next ? ">" : NULL, False, False);
}
XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
XFlush(dpy);
@@ -315,10 +315,9 @@ main(int argc, char *argv[])
usleep(1000);
/* style */
- dc.bg[0] = getcolor(NORMBGCOLOR);
- dc.fg[0] = getcolor(NORMFGCOLOR);
- dc.bg[1] = getcolor(SELBGCOLOR);
- dc.fg[1] = getcolor(SELFGCOLOR);
+ dc.bg = getcolor(BGCOLOR);
+ dc.fg = getcolor(FGCOLOR);
+ dc.border = getcolor(BORDERCOLOR);
setfont(FONT);
wa.override_redirect = 1;