also fixing dmenu accordingly

diff --git a/draw.c b/draw.c
index 29289a4..62f6e2c 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -4,7 +4,6 @@
 #include "dmenu.h"
 #include <stdio.h>
 #include <string.h>
 #include "dmenu.h"
 #include <stdio.h>
 #include <string.h>

-#include <X11/Xlocale.h>

 
 /* static */
 
 
 /* static */
 


@@ -84,7 +83,6 @@ setfont(const char *fontstr) {
        int i, n;
 
        missing = NULL;
        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);
        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 (file)
--- a/main.c
+++ b/main.c
@@ -5,6 +5,7 @@
 #include "dmenu.h"
 
 #include <ctype.h>
 #include "dmenu.h"
 
 #include <ctype.h>

+#include <locale.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.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);
                }
                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");
        dpy = XOpenDisplay(0);
        if(!dpy)
                eprint("dmenu: cannot open display\n");