X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/0c9d9a3d949c0c0c3fb24417b54fca8182f54cb6..c73d5cb7b67d60abc92ff83aff57fc610dcd08e1:/draw.c?ds=sidebyside

diff --git a/draw.c b/draw.c
index f5f9556..5be403b 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 border, Bool ldot) {
+drawtext(const char *text, unsigned long col[ColLast], Bool filleddot, Bool emptydot) {
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len, olen;
@@ -74,23 +74,24 @@ drawtext(const char *text, unsigned long col[ColLast], Bool border, Bool ldot) {
 		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
-	if(ldot) {
+	x = (h + 2) / 4;
+	if(filleddot) {
 		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;
-		pt[1].x = dc.w - 1;
+	if(emptydot) {
+		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 = dc.h - 1;
-		pt[3].x = -(dc.w - 1);
+		pt[2].y = x;
+		pt[3].x = -x;
 		pt[3].y = 0;
 		pt[4].x = 0;
-		pt[4].y = -(dc.h - 1);
+		pt[4].y = -x;
 		XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
 	}
 }