X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fextensions.c;h=23d3e0c818809eacd04eebfdc7021f5751509f67;hb=828c095c8b5a2df96a38faaeb8a0df504e68e70f;hp=b7d8e73aa9ea53f148e36e1c81f29890254067c2;hpb=4b73574406e24df84e909014926e56ab1e5c7934;p=chaz%2Fopenbox

diff --git a/openbox/extensions.c b/openbox/extensions.c
index b7d8e73a..23d3e0c8 100644
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -3,17 +3,17 @@
    extensions.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003-2007   Dana Jansens
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    See the COPYING file for a copy of the GNU General Public License.
 */
 
@@ -34,11 +34,11 @@ gint     extensions_randr_event_basep;
 gboolean extensions_sync      = FALSE;
 gint     extensions_sync_event_basep;
 
-void extensions_query_all()
+void extensions_query_all(void)
 {
     gint junk;
     (void)junk;
-     
+
 #ifdef XKB
     extensions_xkb =
         XkbQueryExtension(ob_display, &junk, &extensions_xkb_event_basep,
@@ -85,20 +85,11 @@ void extensions_query_all()
 void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
 {
     guint i;
-    gint l, r, t, b;
+    gint n, l, r, t, b;
 #ifdef XINERAMA
-    if (extensions_xinerama) {
-        guint i;
-        gint n;
-        XineramaScreenInfo *info = XineramaQueryScreens(ob_display, &n);
-        *nxin = n;
-        *xin_areas = g_new(Rect, *nxin + 1);
-        for (i = 0; i < *nxin; ++i)
-            RECT_SET((*xin_areas)[i], info[i].x_org, info[i].y_org,
-                     info[i].width, info[i].height);
-        XFree(info);
-    } else
+    XineramaScreenInfo *info;
 #endif
+
     if (ob_debug_xinerama) {
         gint w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen));
         gint h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen));
@@ -107,7 +98,19 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
         RECT_SET((*xin_areas)[0], 0, 0, w/2, h);
         RECT_SET((*xin_areas)[1], w/2, 0, w-(w/2), h);
     }
-    else {
+#ifdef XINERAMA
+    else if (extensions_xinerama &&
+             (info = XineramaQueryScreens(ob_display, &n))) {
+        *nxin = n;
+        *xin_areas = g_new(Rect, *nxin + 1);
+        for (i = 0; i < *nxin; ++i)
+            RECT_SET((*xin_areas)[i], info[i].x_org, info[i].y_org,
+                     info[i].width, info[i].height);
+        XFree(info);
+    }
+#endif
+    else
+    {
         *nxin = 1;
         *xin_areas = g_new(Rect, *nxin + 1);
         RECT_SET((*xin_areas)[0], 0, 0,