X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=draw.c;h=92f07ca786b705d991a6d06fd3051d64ff8e76e3;hb=771c0cb6072b3e90d4ed7007073552736c49e655;hp=74a47a6aea8840b07c49c1f23495c41a688dc774;hpb=8c20e5dbd3aac1aa45902c6bce3bc32d57c2d598;p=dmenu.git

diff --git a/draw.c b/draw.c
index 74a47a6..92f07ca 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 "dmenu.h"
 #include <stdio.h>
 #include <string.h>
-#include <X11/Xlocale.h>
 
 /* static */
 
@@ -80,21 +79,15 @@ 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);
-	if(missing) {
+	if(missing)
 		XFreeStringList(missing);
-		if(dc.font.set) {
-			XFreeFontSet(dpy, dc.font.set);
-			dc.font.set = NULL;
-		}
-	}
 	if(dc.font.set) {
 		XFontSetExtents *font_extents;
 		XFontStruct **xfonts;
@@ -114,11 +107,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;
 	}