X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=3bf687e159cab0f8bbd3358500eedfb81f581872;hb=a308b7507abb77940f3b4ba34655c5a7c234bee3;hp=ccd317585607c09520b8e627fa019b2accae6a53;hpb=e655e8a7d5d81d91444a0fddd9814f6f1ab10e06;p=dwm.git

diff --git a/draw.c b/draw.c
index ccd3175..3bf687e 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,7 +29,7 @@ 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;
@@ -74,23 +73,24 @@ 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;
+	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(border) {
+	else if(emptysquare) {
 		pt[0].x = dc.x + 1;
 		pt[0].y = dc.y + 1;
-		pt[1].x = dc.w - 2;
+		pt[1].x = x;
 		pt[1].y = 0;
 		pt[2].x = 0;
-		pt[2].y = dc.h - 2;
-		pt[3].x = -(dc.w - 2);
+		pt[2].y = x;
+		pt[3].x = -x;
 		pt[3].y = 0;
 		pt[4].x = 0;
-		pt[4].y = -(dc.h - 2);
+		pt[4].y = -x;
 		XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
 	}
 }
@@ -166,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);
@@ -178,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;
@@ -202,10 +197,7 @@ setfont(const char *fontstr) {
 		if(dc.font.xfont)
 			XFreeFont(dpy, dc.font.xfont);
 		dc.font.xfont = NULL;
-		dc.font.xfont = XLoadQueryFont(dpy, fontstr);
-		if (!dc.font.xfont)
-			dc.font.xfont = XLoadQueryFont(dpy, "fixed");
-		if (!dc.font.xfont)
+		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
 			eprint("error, cannot init 'fixed' font\n");
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;