From ad4def8e521c449628f6e69b13a7eca63b152793 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 19 Jun 2007 21:52:44 +0000
Subject: check for damage and render extensions if going to use composite.
 require them for it. also include the cflags/libs. and only run the
 xcomposite stuff so far when the server supports it

---
 openbox/extensions.h |  5 +++++
 openbox/screen.c     | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'openbox')

diff --git a/openbox/extensions.h b/openbox/extensions.h
index 6a488a19..e1070e86 100644
--- a/openbox/extensions.h
+++ b/openbox/extensions.h
@@ -39,6 +39,11 @@
 #ifdef    SYNC
 #include <X11/extensions/sync.h>
 #endif
+#ifdef    USE_XCOMPOSITE
+#include <X11/extensions/Xcomposite.h>
+#include <X11/extensions/Xdamage.h>
+#include <X11/extensions/Xrender.h>
+#endif
 
 #include <glib.h>
 
diff --git a/openbox/screen.c b/openbox/screen.c
index d5a51941..1ef08075 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -365,10 +365,12 @@ void screen_startup(gboolean reconfig)
     }
 
 #ifdef USE_XCOMPOSITE
-    /* Redirect window contents to offscreen pixmaps */
-    XCompositeRedirectSubwindows(ob_display,
-                                 RootWindow(ob_display, ob_screen),
-                                 CompositeRedirectAutomatic);
+    if (extensions_comp) {
+        /* Redirect window contents to offscreen pixmaps */
+        XCompositeRedirectSubwindows(ob_display,
+                                     RootWindow(ob_display, ob_screen),
+                                     CompositeRedirectAutomatic);
+    }
 #endif
 
     /* get the initial size */
-- 
cgit v1.2.3