summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-06-19 21:52:44 +0000
committerDana Jansens <danakj@orodu.net>2007-06-19 21:52:44 +0000
commitad4def8e521c449628f6e69b13a7eca63b152793 (patch)
treed9018fc95e9fe2a6b96cd6c7d02ebde48ff3a455 /openbox
parent85c15cf7b6f66729695609339b21b16649ee92c8 (diff)
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
Diffstat (limited to 'openbox')
-rw-r--r--openbox/extensions.h5
-rw-r--r--openbox/screen.c10
2 files changed, 11 insertions, 4 deletions
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 */