aboutsummaryrefslogtreecommitdiffstats
path: root/draw.c
diff options
context:
space:
mode:
authorAnselm R.Garbe <arg@10ksloc.org>2006-08-10 11:12:15 +0200
committerAnselm R.Garbe <arg@10ksloc.org>2006-08-10 11:12:15 +0200
commit00255728aae0dcbb657e8a4e145515c673b546a4 (patch)
tree028b4d8e4d85d72b1d0aea8ee29ed9f83825561e /draw.c
parent4b0328f2097dedd70bbb36ea2b5159ac55b7cbcb (diff)
downloaddwm-00255728aae0dcbb657e8a4e145515c673b546a4.tar.gz
readded border color, this sucks least
Diffstat (limited to 'draw.c')
-rw-r--r--draw.c36
1 files changed, 22 insertions, 14 deletions
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 */