@@ -4,7 +4,6 @@ | |||||
#include "dmenu.h" | #include "dmenu.h" | ||||
#include <stdio.h> | #include <stdio.h> | ||||
#include <string.h> | #include <string.h> | ||||
#include <X11/Xlocale.h> | |||||
/* static */ | /* static */ | ||||
@@ -84,7 +83,6 @@ setfont(const char *fontstr) { | |||||
int i, n; | int i, n; | ||||
missing = NULL; | missing = NULL; | ||||
setlocale(LC_CTYPE, ""); | |||||
if(dc.font.set) | if(dc.font.set) | ||||
XFreeFontSet(dpy, dc.font.set); | XFreeFontSet(dpy, dc.font.set); | ||||
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); | dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); | ||||
@@ -5,6 +5,7 @@ | |||||
#include "dmenu.h" | #include "dmenu.h" | ||||
#include <ctype.h> | #include <ctype.h> | ||||
#include <locale.h> | |||||
#include <stdlib.h> | #include <stdlib.h> | ||||
#include <stdio.h> | #include <stdio.h> | ||||
#include <string.h> | #include <string.h> | ||||
@@ -309,6 +310,7 @@ main(int argc, char *argv[]) { | |||||
} | } | ||||
else | else | ||||
eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout); | eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout); | ||||
setlocale(LC_CTYPE, ""); | |||||
dpy = XOpenDisplay(0); | dpy = XOpenDisplay(0); | ||||
if(!dpy) | if(!dpy) | ||||
eprint("dmenu: cannot open display\n"); | eprint("dmenu: cannot open display\n"); | ||||