no tabs

[chaz/openbox] / openbox / extensions.c

diff --git a/openbox/extensions.c b/openbox/extensions.c
index f1439b2f39fdc18738b278a5b112b44d10d96672..d6fa1c1d9f77ec3b7011f7112fb938d3871a7ee5 100644 (file)
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   extensions.c for the Openbox window manager
+   Copyright (c) 2003        Ben 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.
+*/
+
 #include "openbox.h"
 #include "geom.h"
 #include "extensions.h"
@@ -9,7 +27,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 +52,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 +73,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);
@@ -72,7 +88,8 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
         *nxin = 1;
         *xin_areas = g_new(Rect, *nxin + 1);
         RECT_SET((*xin_areas)[0], 0, 0,
-                 screen_physical_size.width, screen_physical_size.height);
+                 WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen)),
+                 HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen)));
     }
 
     /* returns one extra with the total area in it */