treadded border color, this sucks least - dwm - [fork] customized build of dwm,… | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 00255728aae0dcbb657e8a4e145515c673b546a4 | |
parent 4b0328f2097dedd70bbb36ea2b5159ac55b7cbcb | |
Author: Anselm R.Garbe <[email protected]> | |
Date: Thu, 10 Aug 2006 11:12:15 +0200 | |
readded border color, this sucks least | |
Diffstat: | |
M config.arg.h | 1 + | |
M config.default.h | 1 + | |
M draw.c | 36 +++++++++++++++++++----------… | |
M dwm.h | 1 + | |
M main.c | 1 + | |
5 files changed, 26 insertions(+), 14 deletions(-) | |
--- | |
diff --git a/config.arg.h b/config.arg.h | |
t@@ -11,6 +11,7 @@ const char *tags[] = { "work", "net", "fnord", NULL }; | |
#define FONT "-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso… | |
#define BGCOLOR "#eeeeee" | |
#define FGCOLOR "#666699" | |
+#define BORDERCOLOR "#9999CC" | |
#define MODKEY Mod1Mask | |
#define NUMLOCKMASK Mod2Mask | |
#define MASTERW 60 /* percent */ | |
diff --git a/config.default.h b/config.default.h | |
t@@ -11,6 +11,7 @@ const char *tags[] = { "0", "1", "2", "3", "4", NULL }; | |
#define FONT "fixed" | |
#define BGCOLOR "#666699" | |
#define FGCOLOR "#eeeeee" | |
+#define BORDERCOLOR "#9999CC" | |
#define MODKEY Mod1Mask | |
#define NUMLOCKMASK Mod2Mask | |
#define MASTERW 60 /* percent */ | |
diff --git a/draw.c b/draw.c | |
t@@ -9,6 +9,26 @@ | |
/* 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) | |
{ | |
t@@ -28,11 +48,12 @@ drawtext(const char *text, Bool invert) | |
static char buf[256]; | |
unsigned int len; | |
XGCValues gcv; | |
- XPoint points[5]; | |
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); | |
+ drawborder(); | |
+ | |
if(!text) | |
return; | |
t@@ -66,19 +87,6 @@ drawtext(const char *text, Bool invert) | |
XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &g… | |
XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len); | |
} | |
- | |
- XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); | |
- 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); | |
} | |
/* extern */ | |
diff --git a/dwm.h b/dwm.h | |
t@@ -43,6 +43,7 @@ struct DC { /* draw context */ | |
int x, y, w, h; | |
unsigned long bg; | |
unsigned long fg; | |
+ unsigned long border; | |
Drawable drawable; | |
Fnt font; | |
GC gc; | |
diff --git a/main.c b/main.c | |
t@@ -217,6 +217,7 @@ main(int argc, char *argv[]) | |
/* style */ | |
dc.bg = getcolor(BGCOLOR); | |
dc.fg = getcolor(FGCOLOR); | |
+ dc.border = getcolor(BORDERCOLOR); | |
setfont(FONT); | |
sx = sy = 0; |