about summary refs log tree commit diff stats
path: root/draw.c
diff options
context:
space:
mode:
authorAnselm R.Garbe <arg@10ksloc.org>2006-08-11 11:52:55 +0200
committerAnselm R.Garbe <arg@10ksloc.org>2006-08-11 11:52:55 +0200
commit975b459c17b7438090afd6e1381b2c5fc749f5b8 (patch)
tree654f700ee4b0521ec43de8f7bb94afd37192a024 /draw.c
parent2b35faee06d980bd145d647b76a3d73b1bbd57d6 (diff)
downloaddwm-975b459c17b7438090afd6e1381b2c5fc749f5b8.tar.gz
simplified drawtext
Diffstat (limited to 'draw.c')
-rw-r--r--draw.c35
1 files changed, 14 insertions, 21 deletions
diff --git a/draw.c b/draw.c
index 869c2f2..6466f41 100644
--- a/draw.c
+++ b/draw.c
@@ -9,26 +9,6 @@
 
 /* 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)
 {
@@ -48,11 +28,24 @@ 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();
+	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);
 
 	if(!text)
 		return;