removed unnecessary border color
Anselm R.Garbe arg@10ksloc.org
Thu, 10 Aug 2006 10:28:58 +0200
5 files changed,
7 insertions(+),
34 deletions(-)
M
config.arg.h
→
config.arg.h
@@ -6,4 +6,3 @@
#define FONT "-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*" #define BGCOLOR "#eeeeee" #define FGCOLOR "#666699" -#define BORDERCOLOR "#9999CC"
M
config.default.h
→
config.default.h
@@ -6,4 +6,3 @@
#define FONT "fixed" #define BGCOLOR "#666699" #define FGCOLOR "#eeeeee" -#define BORDERCOLOR "#9999CC"
M
draw.c
→
draw.c
@@ -9,26 +9,6 @@ #include <X11/Xlocale.h>
/* static */ -static void -drawborder(void) -{ - XPoint points[5]; - - XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); - XSetForeground(dpy, dc.gc, dc.border); - points[0].x = dc.x; - points[0].y = dc.y; - points[1].x = dc.w - 1; - points[1].y = 0; - points[2].x = 0; - points[2].y = dc.h - 1; - points[3].x = -(dc.w - 1); - points[3].y = 0; - points[4].x = 0; - points[4].y = -(dc.h - 1); - XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious); -} - static unsigned int textnw(const char *text, unsigned int len) {@@ -44,7 +24,7 @@
/* extern */ void -drawtext(const char *text, Bool invert, Bool border) +drawtext(const char *text, Bool invert) { int x, y, w, h; static char buf[256];@@ -54,10 +34,7 @@ XRectangle r = { dc.x, dc.y, dc.w, dc.h };
XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg); XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); - w = 0; - if(border) - drawborder(); if(!text) return;
M
main.c
→
main.c
@@ -77,17 +77,17 @@ dc.x = 0;
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 */@@ -95,13 +95,13 @@ for(i = curr; i != next; i=i->right) {
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);@@ -316,7 +316,6 @@
/* style */ dc.bg = getcolor(BGCOLOR); dc.fg = getcolor(FGCOLOR); - dc.border = getcolor(BORDERCOLOR); setfont(FONT); wa.override_redirect = 1;