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

diff --git a/openbox/extensions.c b/openbox/extensions.c
index b2759fe1..23d3e0c8 100644
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -1,78 +1,121 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   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.
+*/
+
 #include "openbox.h"
 #include "geom.h"
 #include "extensions.h"
 #include "screen.h"
+#include "debug.h"
 
 gboolean extensions_xkb       = FALSE;
-int      extensions_xkb_event_basep;
+gint     extensions_xkb_event_basep;
 gboolean extensions_shape     = FALSE;
-int      extensions_shape_event_basep;
+gint     extensions_shape_event_basep;
 gboolean extensions_xinerama  = FALSE;
-int      extensions_xinerama_event_basep;
-gboolean extensions_xinerama_active = FALSE;
+gint     extensions_xinerama_event_basep;
 gboolean extensions_randr     = FALSE;
-int      extensions_randr_event_basep;
-gboolean extensions_vidmode   = FALSE;
-int      extensions_vidmode_event_basep;
+gint     extensions_randr_event_basep;
+gboolean extensions_sync      = FALSE;
+gint     extensions_sync_event_basep;
 
-void extensions_query_all()
+void extensions_query_all(void)
 {
-    int junk;
+    gint junk;
     (void)junk;
-     
+
 #ifdef XKB
     extensions_xkb =
-	XkbQueryExtension(ob_display, &junk, &extensions_xkb_event_basep,
-			  &junk, NULL, NULL);
+        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);
+        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);
-    extensions_xinerama_active = XineramaIsActive(ob_display);
+        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,
+        XRRQueryExtension(ob_display, &extensions_randr_event_basep,
                           &junk);
+    if (!extensions_randr)
+        ob_debug("XRandR extension is not present on the server\n");
 #endif
 
-#ifdef VIDMODE
-    extensions_vidmode =
-	XF86VidModeQueryExtension(ob_display, &extensions_vidmode_event_basep,
-                                  &junk);
+#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
 }
 
 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_active) {
-        guint i;
-        gint n;
-        XineramaScreenInfo *info = XineramaQueryScreens(ob_display, &n);
+    XineramaScreenInfo *info;
+#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);
+    }
+#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);
-    } else
+        XFree(info);
+    }
 #endif
+    else
     {
         *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 */
@@ -83,8 +126,8 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
     for (i = 1; i < *nxin; ++i) {
         l = MIN(l, (*xin_areas)[i].x);
         t = MIN(l, (*xin_areas)[i].y);
-        r = MAX(r, (*xin_areas)[0].x + (*xin_areas)[0].width - 1);
-        b = MAX(b, (*xin_areas)[0].y + (*xin_areas)[0].height - 1);
+        r = MAX(r, (*xin_areas)[i].x + (*xin_areas)[i].width - 1);
+        b = MAX(b, (*xin_areas)[i].y + (*xin_areas)[i].height - 1);
     }
     RECT_SET((*xin_areas)[*nxin], l, t, r - l + 1, b - t + 1);
 }