X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=draw.c;h=ea02c4df796b81b1d7fbc2cf435140633780f0cd;hb=796c4fb9e542d3e14c9a2a62a4a673d210c9ad12;hp=56a1beb37e6778b92ede9223691ab93f94748341;hpb=5d43e9243ce7b3273f2438bec2da170dcc8e329b;p=dmenu.git

diff --git a/draw.c b/draw.c
index 56a1beb..ea02c4d 100644
--- a/draw.c
+++ b/draw.c
@@ -4,7 +4,6 @@
 #include "dmenu.h"
 #include <stdio.h>
 #include <string.h>
-#include <X11/Xlocale.h>
 
 /* static */
 
@@ -80,11 +79,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);
@@ -109,10 +107,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;