X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=e4b2b88a5e6bebc57a1ecf90a7c3c6c25b3275b0;hb=857d825eeb9f0d91a3d8a2507e8955196646f9a1;hp=5be403b6c72d5fc6373cbcc9af9c97919c11f518;hpb=c73d5cb7b67d60abc92ff83aff57fc610dcd08e1;p=dwm.git

diff --git a/draw.c b/draw.c
index 5be403b..e4b2b88 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 filleddot, Bool emptydot) {
+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;
@@ -75,15 +75,15 @@ drawtext(const char *text, unsigned long col[ColLast], Bool filleddot, Bool empt
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
 	x = (h + 2) / 4;
-	if(filleddot) {
-		r.x = dc.x + 2;
-		r.y = dc.y + 2;
-		r.width = r.height = x;
+	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(emptydot) {
-		pt[0].x = dc.x + 2;
-		pt[0].y = dc.y + 2;
+	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;
@@ -167,22 +167,20 @@ getcolor(const char *colstr) {
 
 void
 setfont(const char *fontstr) {
-	char **missing, *def;
+	char *def, *lc, **missing;
 	int i, n;
 
+	lc = setlocale(LC_CTYPE, NULL);
+	setlocale(LC_CTYPE, "UTF-8");
 	missing = NULL;
-	setlocale(LC_ALL, "");
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+	setlocale(LC_CTYPE, lc);
 	if(missing) {
 		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;