X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/c34e4e4b39a8c014e0798e47844b22f470ab9092..6e72d781f71dd38fffae1f34cb0c9930b40e74d6:/draw.c?ds=sidebyside

diff --git a/draw.c b/draw.c
index c60df6d..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[3];
 
 	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
@@ -74,20 +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;
-		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);
+	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);
 	}
 }