X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=eeb3e568de3265452d19e5023e7c2e30ba17ae3a;hb=d42c3ba2dc249a77f1f2417a1c72a3b7744fd932;hp=671062c5285e1c2350e94d221a0cb66dc17cd580;hpb=61a1910f91fe6aba428193087d6c3ff21374ee5e;p=dwm.git

diff --git a/draw.c b/draw.c
index 671062c..eeb3e56 100644
--- a/draw.c
+++ b/draw.c
@@ -4,7 +4,6 @@
 #include "dwm.h"
 #include <stdio.h>
 #include <string.h>
-#include <X11/Xlocale.h>
 
 /* static */
 
@@ -30,12 +29,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 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[5];
 
 	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
@@ -73,17 +73,25 @@ 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;
+	x = (h + 2) / 4;
+	if(filledsquare) {
+		r.x = dc.x + 1;
+		r.y = dc.y + 1;
+		r.width = r.height = x + 1;
 		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);
+	else if(emptysquare) {
+		pt[0].x = dc.x + 1;
+		pt[0].y = dc.y + 1;
+		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);
 	}
 }
 
@@ -158,11 +166,10 @@ getcolor(const char *colstr) {
 
 void
 setfont(const char *fontstr) {
-	char **missing, *def;
+	char *def, **missing;
 	int i, n;
 
 	missing = NULL;
-	setlocale(LC_ALL, "");
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
@@ -170,10 +177,6 @@ setfont(const char *fontstr) {
 		while(n--)
 			fprintf(stderr, "missing fontset: %s\n", missing[n]);
 		XFreeStringList(missing);
-		if(dc.font.set) {
-			XFreeFontSet(dpy, dc.font.set);
-			dc.font.set = NULL;
-		}
 	}
 	if(dc.font.set) {
 		XFontSetExtents *font_extents;