X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=draw.c;h=598a667b3a3d12caf2a9ca98901068122a0c6a0c;hb=c7da1241490e782bc8d6b7578d7f03f843d27c72;hp=cef5efb7c77b29025a1bf19da614e7f9be06b607;hpb=71b82fb1f6ab39409389962e891624ee1f0849c4;p=dwm.git

diff --git a/draw.c b/draw.c
index cef5efb..598a667 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 */
 
@@ -167,10 +166,9 @@ getcolor(const char *colstr) {
 
 void
 setfont(const char *fontstr) {
-	char **missing, *def;
+	char *def, **missing;
 	int i, n;
 
-	setlocale(LC_CTYPE, "");
 	missing = NULL;
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
@@ -199,11 +197,8 @@ 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)
-			eprint("error, cannot init 'fixed' font\n");
+		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+			eprint("error, cannot load font: '%s'\n", fontstr);
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
 	}