X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=draw.c;h=c4448dbef13339d7aada204466d93c162d1c30b4;hp=c0b233fe22b0177a52ab4fab28fe34d243b4af14;hb=cb4aa5bc35cf16a06bb2b4e880648e390fa2cc55;hpb=9bd9ea423e5b4c4bfee65a8495c5d611b242f7b7

diff --git a/draw.c b/draw.c
index c0b233f..c4448db 100644
--- a/draw.c
+++ b/draw.c
@@ -1,10 +1,9 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
 #include <stdio.h>
 #include <string.h>
-#include <X11/Xlocale.h>
 
 /* static */
 
@@ -167,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);
@@ -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;
 	}