Xinqi Bao's Git

projects / dmenu.git / diff
summary | log | commit | diff | tree
raw | patch | inline | side by side (parent: 88efbf3)
similiar change as in dwm
authorAnselm R Garbe <[email protected]>
Fri, 18 Jul 2008 19:20:19 +0000 (20:20 +0100)
committerAnselm R Garbe <[email protected]>
Fri, 18 Jul 2008 19:20:19 +0000 (20:20 +0100)
dmenu.c diff | blob | history

diff --git a/dmenu.c b/dmenu.c
index 863a262..1206e95 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -587,11 +587,12 @@ run(void) {
 void
 setup(Bool topbar) {
        int i, j, x, y;
 void
 setup(Bool topbar) {
        int i, j, x, y;
-       XModifierKeymap *modmap;
-       XSetWindowAttributes wa;
 #if XINERAMA
 #if XINERAMA
+       int n;
        XineramaScreenInfo *info = NULL;
 #endif
        XineramaScreenInfo *info = NULL;
 #endif
+       XModifierKeymap *modmap;
+       XSetWindowAttributes wa;
 
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);
 
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);
@@ -618,10 +619,8 @@ setup(Bool topbar) {
        /* menu window geometry */
        mh = dc.font.height + 2;
 #if XINERAMA
        /* menu window geometry */
        mh = dc.font.height + 2;
 #if XINERAMA
-       if(XineramaIsActive(dpy)) {
-               int n;
+       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
                i = 0;
                i = 0;
-               info = XineramaQueryScreens(dpy, &n);
                if(n > 1) {
                        int di;
                        unsigned int dui;
                if(n > 1) {
                        int di;
                        unsigned int dui;