X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fextensions.c;h=2fdc686316321b278b188ee411a7104e5e8b957d;hb=fa6f70ce3a1e5aff0cdafb4b641128f360278f2a;hp=4807528eb7efa3114db5d1fab0454bd013888208;hpb=d9f14c1d010860e658f4a9adc6682e0264b410aa;p=chaz%2Fopenbox

diff --git a/openbox/extensions.c b/openbox/extensions.c
index 4807528e..2fdc6863 100644
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -2,7 +2,7 @@
 
    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
@@ -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,6 +31,10 @@ 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;
+gboolean extensions_comp      = FALSE;
+gint     extensions_comp_event_basep;
 
 void extensions_query_all()
 {
@@ -40,24 +45,58 @@ void extensions_query_all()
     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
+
+#ifdef USE_XCOMPOSITE
+    if (XCompositeQueryExtension(ob_display, &extensions_comp_event_basep,
+                                 &junk))
+    {
+        gint major = 0, minor = 2;
+        XCompositeQueryVersion(ob_display, &major, &minor);
+        /* Version 0.2 is the first version to have the
+           XCompositeNameWindowPixmap() request. */
+        if (major > 0 || minor >= 2)
+            extensions_comp = TRUE;
+    }
+    if (!extensions_comp)
+        ob_debug("X Composite extension is not present on the server or is an "
+                 "incompatible version\n");
 #endif
 }
 
@@ -75,9 +114,18 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
         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
 #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,
@@ -98,3 +146,10 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
     }
     RECT_SET((*xin_areas)[*nxin], l, t, r - l + 1, b - t + 1);
 }
+
+#ifdef USE_XCOMPOSITE
+Picture extensions_create_composite_picture(Window win, Visual *vis,
+                                            gboolean *has_alpha)
+{
+}
+#endif