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

diff --git a/draw.c b/draw.c
index 4441a88..f5f9556 100644
--- a/draw.c
+++ b/draw.c
@@ -30,12 +30,13 @@ 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 border, Bool ldot) {
 	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);
@@ -43,8 +44,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;
@@ -79,11 +80,18 @@ drawtext(const char *text, unsigned long col[ColLast], Bool ldot, Bool rdot) {
 		r.width = r.height = (h + 2) / 4;
 		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 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(border) {
+		pt[0].x = dc.x;
+		pt[0].y = dc.y;
+		pt[1].x = dc.w - 1;
+		pt[1].y = 0;
+		pt[2].x = 0;
+		pt[2].y = dc.h - 1;
+		pt[3].x = -(dc.w - 1);
+		pt[3].y = 0;
+		pt[4].x = 0;
+		pt[4].y = -(dc.h - 1);
+		XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
 	}
 }