remove the xinerama active boolean, just count the extension as not present if it...

diff --git a/openbox/extensions.c b/openbox/extensions.c
index f1439b2f39fdc18738b278a5b112b44d10d96672..73e610cb9f6c449004c8341a32543feecf8e6cd9 100644 (file)
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -9,7 +9,6 @@ gboolean extensions_shape     = FALSE;
 int      extensions_shape_event_basep;
 gboolean extensions_xinerama  = FALSE;
 int      extensions_xinerama_event_basep;
-gboolean extensions_xinerama_active = FALSE;
 gboolean extensions_randr     = FALSE;
 int      extensions_randr_event_basep;
 gboolean extensions_vidmode   = FALSE;
@@ -35,8 +34,7 @@ void extensions_query_all()
 #ifdef XINERAMA
     extensions_xinerama =
        XineramaQueryExtension(ob_display, &extensions_xinerama_event_basep,
-                              &junk);
-    extensions_xinerama_active = XineramaIsActive(ob_display);
+                              &junk) && XineramaIsActive(ob_display);
 #endif
 
 #ifdef XRANDR
@@ -57,7 +55,7 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
     guint i;
     gint l, r, t, b;
 #ifdef XINERAMA
-    if (extensions_xinerama_active) {
+    if (extensions_xinerama) {
         guint i;
         gint n;
         XineramaScreenInfo *info = XineramaQueryScreens(ob_display, &n);

diff --git a/openbox/extensions.h b/openbox/extensions.h
index c07076e787cd8527f9230a1ab48e6db708286af1..e8262768a060a68438096ea786650038f638ba00 100644 (file)
--- a/openbox/extensions.h
+++ b/openbox/extensions.h
@@ -33,8 +33,6 @@ extern int extensions_shape_event_basep;
 extern gboolean extensions_xinerama;
 /*! Base for events for the Xinerama extension */
 extern int extensions_xinerama_event_basep;
-/*! Is Xinerama enabled? */
-extern gboolean extensions_xinerama_active;
 
 /*! Does the display have the RandR extension? */
 extern gboolean extensions_randr;
@@ -48,6 +46,6 @@ extern int extensions_vidmode_event_basep;
 
 void extensions_query_all();
 
-void extensions_xinerama_screens(Rect **xin_areas, guint *nxin);
-
+void extensions_xinerama_screens(Rect **areas, guint *nxin);
+  
 #endif