From: arg@mig29 <unknown>
Date: Thu, 7 Dec 2006 09:06:06 +0000 (+0100)
Subject: also fixing dmenu accordingly
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=dd7ee0dae1e8cb9ffd58fbcab7708e9042eb560c;p=dmenu.git

also fixing dmenu accordingly
---

diff --git a/draw.c b/draw.c
index 29289a4..62f6e2c 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 */
 
@@ -84,7 +83,6 @@ setfont(const char *fontstr) {
 	int i, n;
 
 	missing = NULL;
-	setlocale(LC_CTYPE, "");
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
diff --git a/main.c b/main.c
index ce13a80..743967a 100644
--- a/main.c
+++ b/main.c
@@ -5,6 +5,7 @@
 #include "dmenu.h"
 
 #include <ctype.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -309,6 +310,7 @@ main(int argc, char *argv[]) {
 		}
 		else
 			eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout);
+	setlocale(LC_CTYPE, "");
 	dpy = XOpenDisplay(0);
 	if(!dpy)
 		eprint("dmenu: cannot open display\n");