diff options
| -rw-r--r-- | config.arg.h | 7 | ||||
| -rw-r--r-- | config.default.h | 7 | ||||
| -rw-r--r-- | dmenu.h | 7 | ||||
| -rw-r--r-- | draw.c | 21 | ||||
| -rw-r--r-- | main.c | 17 |
5 files changed, 32 insertions, 27 deletions
diff --git a/config.arg.h b/config.arg.h index 91b014f..066c1a4 100644 --- a/config.arg.h +++ b/config.arg.h @@ -4,7 +4,6 @@ */ #define FONT "-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*" -#define NORMBGCOLOR "#666699" -#define NORMFGCOLOR "#eeeeee" -#define SELBGCOLOR "#eeeeee" -#define SELFGCOLOR "#000088" +#define BGCOLOR "#666699" +#define FGCOLOR "#eeeeee" +#define BORDERCOLOR "#9999CC" diff --git a/config.default.h b/config.default.h index 48c810a..cf1baea 100644 --- a/config.default.h +++ b/config.default.h @@ -4,7 +4,6 @@ */ #define FONT "fixed" -#define NORMBGCOLOR "#666699" -#define NORMFGCOLOR "#eeeeee" -#define SELBGCOLOR "#eeeeee" -#define SELFGCOLOR "#666699" +#define BGCOLOR "#666699" +#define FGCOLOR "#eeeeee" +#define BORDERCOLOR "#9999CC" @@ -22,8 +22,9 @@ struct Fnt { struct DC { /* draw context */ int x, y, w, h; - unsigned long bg[2]; - unsigned long fg[2]; + unsigned long bg; + unsigned long fg; + unsigned long border; Drawable drawable; Fnt font; GC gc; @@ -34,7 +35,7 @@ extern Display *dpy; extern DC dc; /* draw.c */ -extern void drawtext(const char *text, unsigned int colidx, Bool border); +extern void drawtext(const char *text, Bool invert, Bool border); extern unsigned long getcolor(const char *colstr); extern void setfont(const char *fontstr); extern unsigned int textw(const char *text); @@ -24,19 +24,19 @@ textnw(const char *text, unsigned int len) /* extern */ void -drawtext(const char *text, unsigned int colidx, Bool border) +drawtext(const char *text, Bool invert, Bool border) { int x, y, w, h; static char buf[256]; unsigned int len, olen; + XGCValues gcv; XPoint points[5]; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; - XSetForeground(dpy, dc.gc, dc.bg[colidx]); + XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg); XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); w = 0; - XSetForeground(dpy, dc.gc, dc.fg[colidx]); if(border) { points[0].x = dc.x; points[0].y = dc.y; @@ -48,6 +48,7 @@ drawtext(const char *text, unsigned int colidx, Bool border) points[3].y = 0; points[4].x = 0; points[4].y = -(dc.h - 1); + XSetForeground(dpy, dc.gc, dc.border); XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious); } @@ -79,11 +80,17 @@ drawtext(const char *text, unsigned int colidx, Bool border) if(w > dc.w) return; /* too long */ - if(dc.font.set) - XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len); + gcv.foreground = invert ? dc.bg : dc.fg; + gcv.background = invert ? dc.fg : dc.bg; + if(dc.font.set) { + XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv); + XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc, + x, y, buf, len); + } else { - XSetFont(dpy, dc.gc, dc.font.xfont->fid); - XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); + gcv.font = dc.font.xfont->fid; + XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv); + XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len); } } @@ -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; |