From 00255728aae0dcbb657e8a4e145515c673b546a4 Mon Sep 17 00:00:00 2001
From: "Anselm R.Garbe" <arg@10ksloc.org>
Date: Thu, 10 Aug 2006 11:12:15 +0200
Subject: [PATCH] readded border color, this sucks least

---
 config.arg.h     |  1 +
 config.default.h |  1 +
 draw.c           | 36 ++++++++++++++++++++++--------------
 dwm.h            |  1 +
 main.c           |  1 +
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/config.arg.h b/config.arg.h
index cc3ee20..ae27c26 100644
--- a/config.arg.h
+++ b/config.arg.h
@@ -11,6 +11,7 @@ const char *tags[] = { "work", "net", "fnord", NULL };
 #define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
 #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
index 9ce11fd..3847ff8 100644
--- a/config.default.h
+++ b/config.default.h
@@ -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
index fe5b7cb..5d19bfb 100644
--- a/draw.c
+++ b/draw.c
@@ -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)
 {
@@ -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;
 
@@ -66,19 +87,6 @@ drawtext(const char *text, Bool invert)
 		XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
 		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
index 78a984e..88640b8 100644
--- a/dwm.h
+++ b/dwm.h
@@ -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
index 534402c..5efe599 100644
--- a/main.c
+++ b/main.c
@@ -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;