Fix regression in 84a1bc5

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index eae5685..a246111 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -541,7 +541,7 @@ run(void)
 static void
 setup(void)
 {
 static void
 setup(void)
 {

-       int x, y, i = 0;
+       int x, y, i, j;

        unsigned int du;
        XSetWindowAttributes swa;
        XIM xim;
        unsigned int du;
        XSetWindowAttributes swa;
        XIM xim;


@@ -551,9 +551,8 @@ setup(void)
 #ifdef XINERAMA
        XineramaScreenInfo *info;
        Window pw;
 #ifdef XINERAMA
        XineramaScreenInfo *info;
        Window pw;

-       int a, j, di, n, area = 0;
+       int a, di, n, area = 0;

 #endif
 #endif

-

        /* init appearance */
        for (j = 0; j < SchemeLast; j++)
                scheme[j] = drw_scm_create(drw, colors[j], 2);
        /* init appearance */
        for (j = 0; j < SchemeLast; j++)
                scheme[j] = drw_scm_create(drw, colors[j], 2);


@@ -566,6 +565,7 @@ setup(void)
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA

+       i = 0;

        if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
                XGetInputFocus(dpy, &w, &di);
                if (mon >= 0 && mon < n)
        if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
                XGetInputFocus(dpy, &w, &di);
                if (mon >= 0 && mon < n)