X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=0237b40ebe1e244c3e1517d3ec48f96d3bc1503d;hb=6e72d781f71dd38fffae1f34cb0c9930b40e74d6;hp=ccd317585607c09520b8e627fa019b2accae6a53;hpb=e655e8a7d5d81d91444a0fddd9814f6f1ab10e06;p=dwm.git

diff --git a/draw.c b/draw.c
index ccd3175..0237b40 100644
--- a/draw.c
+++ b/draw.c
@@ -30,13 +30,12 @@ textnw(const char *text, unsigned int len) {
 }
 
 static void
-drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool border) {
+drawtext(const char *text, unsigned long col[ColLast], Bool hborder, Bool vborder) {
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len, olen;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-	XPoint pt[5];
 
 	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
@@ -74,24 +73,13 @@ drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool border) {
 		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
-	if(dot) {
-		r.x = dc.x + 2;
-		r.y = dc.y + 2;
-		r.width = r.height = (h + 2) / 4;
-		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+	if(vborder) {
+		XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + 1, dc.y + dc.h - 1);
+		XDrawLine(dpy, dc.drawable, dc.gc, dc.x + dc.w - 2, dc.y + 1, dc.x + dc.w - 2, dc.y + dc.h - 1);
 	}
-	if(border) {
-		pt[0].x = dc.x + 1;
-		pt[0].y = dc.y + 1;
-		pt[1].x = dc.w - 2;
-		pt[1].y = 0;
-		pt[2].x = 0;
-		pt[2].y = dc.h - 2;
-		pt[3].x = -(dc.w - 2);
-		pt[3].y = 0;
-		pt[4].x = 0;
-		pt[4].y = -(dc.h - 2);
-		XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
+	if(hborder) {
+		XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 2, dc.y + 1);
+		XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + dc.h - 2, dc.x + dc.w - 2, dc.y + dc.h - 2);
 	}
 }