remove trailing whitespace

[chaz/openbox] / openbox / extensions.c

diff --git a/openbox/extensions.c b/openbox/extensions.c
index 32ad00123302508370daa732bf0125c89dfb35b2..89a965769970e8224d01029cf8c9a3f934b665cd 100644 (file)
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -2,18 +2,18 @@
 
    extensions.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
-   
+   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.
 */
 
@@ -21,6 +21,7 @@
 #include "geom.h"
 #include "extensions.h"
 #include "screen.h"
+#include "debug.h"
 
 gboolean extensions_xkb       = FALSE;
 gint     extensions_xkb_event_basep;
@@ -30,34 +31,54 @@ gboolean extensions_xinerama  = FALSE;
 gint     extensions_xinerama_event_basep;
 gboolean extensions_randr     = FALSE;
 gint     extensions_randr_event_basep;
+gboolean extensions_sync      = FALSE;
+gint     extensions_sync_event_basep;
 
 void extensions_query_all()
 {
     gint junk;
     (void)junk;
-     
+
 #ifdef XKB
     extensions_xkb =
         XkbQueryExtension(ob_display, &junk, &extensions_xkb_event_basep,
                           &junk, NULL, NULL);
+    if (!extensions_xkb)
+        ob_debug("XKB extension is not present on the server\n");
 #endif
 
 #ifdef SHAPE
     extensions_shape =
         XShapeQueryExtension(ob_display, &extensions_shape_event_basep,
                              &junk);
+    if (!extensions_shape)
+        ob_debug("X Shape extension is not present on the server\n");
 #endif
 
 #ifdef XINERAMA
     extensions_xinerama =
         XineramaQueryExtension(ob_display, &extensions_xinerama_event_basep,
                                &junk) && XineramaIsActive(ob_display);
+    if (!extensions_xinerama)
+        ob_debug("Xinerama extension is not present on the server\n");
 #endif
 
 #ifdef XRANDR
     extensions_randr =
         XRRQueryExtension(ob_display, &extensions_randr_event_basep,
                           &junk);
+    if (!extensions_randr)
+        ob_debug("XRandR extension is not present on the server\n");
+#endif
+
+#ifdef SYNC
+    extensions_sync =
+        XSyncQueryExtension(ob_display, &extensions_sync_event_basep,
+                            &junk) &&
+        XSyncInitialize(ob_display, &junk, &junk);
+    if (!extensions_sync)
+        ob_debug("X Sync extension is not present on the server or is an "
+                 "incompatible version\n");
 #endif
 }
 
@@ -78,7 +99,15 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
         XFree(info);
     } else
 #endif
-    {
+    if (ob_debug_xinerama) {
+        gint w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen));
+        gint h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen));
+        *nxin = 2;
+        *xin_areas = g_new(Rect, *nxin + 1);
+        RECT_SET((*xin_areas)[0], 0, 0, w/2, h);
+        RECT_SET((*xin_areas)[1], w/2, 0, w-(w/2), h);
+    }
+    else {
         *nxin = 1;
         *xin_areas = g_new(Rect, *nxin + 1);
         RECT_SET((*xin_areas)[0], 0, 0,