X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=3842685c2eeac1a19efe97e0d9e7a0d1efb5020d;hb=4881857458f7558f5609d44956e966809eb9f93e;hp=c60df6de7315ec44cee823db00432342bb62ca3c;hpb=c34e4e4b39a8c014e0798e47844b22f470ab9092;p=dwm.git

diff --git a/draw.c b/draw.c
index c60df6d..3842685 100644
--- a/draw.c
+++ b/draw.c
@@ -30,13 +30,13 @@ 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 filledsquare, Bool emptysquare) {
 	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[3];
+	XPoint pt[5];
 
 	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
@@ -74,20 +74,25 @@ 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) {
+	x = (h + 2) / 4;
+	if(filledsquare) {
 		r.x = dc.x + 2;
 		r.y = dc.y + 2;
-		r.width = r.height = (h + 2) / 4;
+		r.width = r.height = x;
 		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	}
-	if(border) {
-		pt[0].x = dc.x;
-		pt[0].y = dc.y + dc.h;
-		pt[1].x = 0;
-		pt[1].y = -dc.h;
-		pt[2].x = dc.w;
-		pt[2].y = 0;
-		XDrawLines(dpy, dc.drawable, dc.gc, pt, 3, CoordModePrevious);
+	else if(emptysquare) {
+		pt[0].x = dc.x + 2;
+		pt[0].y = dc.y + 2;
+		pt[1].x = x;
+		pt[1].y = 0;
+		pt[2].x = 0;
+		pt[2].y = x;
+		pt[3].x = -x;
+		pt[3].y = 0;
+		pt[4].x = 0;
+		pt[4].y = -x;
+		XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
 	}
 }