getting rid of setlocale(), it doesn't seem to make sense with Xmb, artifact of Xutf8...

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index e487333..895bdc5 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #define _BSD_SOURCE
 #include <ctype.h>
-#include <locale.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -586,12 +585,13 @@ run(void) {
 
 void
 setup(Bool topbar) {
-       int i, j, n, x, y;
-       XModifierKeymap *modmap;
-       XSetWindowAttributes wa;
+       int i, j, x, y;
 #if XINERAMA
+       int n;
        XineramaScreenInfo *info = NULL;
 #endif
+       XModifierKeymap *modmap;
+       XSetWindowAttributes wa;
 
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);
@@ -618,9 +618,8 @@ setup(Bool topbar) {
        /* menu window geometry */
        mh = dc.font.height + 2;
 #if XINERAMA
-       if(XineramaIsActive(dpy)) {
+       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
                i = 0;
-               info = XineramaQueryScreens(dpy, &n);
                if(n > 1) {
                        int di;
                        unsigned int dui;
@@ -719,7 +718,7 @@ main(int argc, char *argv[]) {
                else
                        eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
                               "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
-       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+       if(!XSupportsLocale())
                fprintf(stderr, "warning: no locale support\n");
        if(!(dpy = XOpenDisplay(0)))
                eprint("dmenu: cannot open display\n");