removed the hardcoded fixed fallback, it is useless in non-Latin1 environments

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index cef5efb..3bf687e 100644 (file)
--- 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,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;