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

diff --git a/draw.c b/draw.c
index 4441a88..0237b40 100644
--- a/draw.c
+++ b/draw.c
@@ -30,7 +30,7 @@ textnw(const char *text, unsigned int len) {
 }
 
 static void
-drawtext(const char *text, unsigned long col[ColLast], Bool ldot, Bool rdot) {
+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;
@@ -43,8 +43,8 @@ drawtext(const char *text, unsigned long col[ColLast], Bool ldot, Bool rdot) {
 		return;
 	w = 0;
 	olen = len = strlen(text);
-	if(len >= sizeof(buf))
-		len = sizeof(buf) - 1;
+	if(len >= sizeof buf)
+		len = sizeof buf - 1;
 	memcpy(buf, text, len);
 	buf[len] = 0;
 	h = dc.font.ascent + dc.font.descent;
@@ -73,17 +73,13 @@ drawtext(const char *text, unsigned long col[ColLast], Bool ldot, Bool rdot) {
 		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
-	if(ldot) {
-		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(rdot) {
-		r.width = r.height = (h + 2) / 4;
-		r.x = dc.x + dc.w - r.width - 2;
-		r.y = dc.y + dc.h - r.height - 2;
-		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+	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);
 	}
 }