adding trunk

[chaz/openbox] / openbox / composite.c

diff --git a/openbox/composite.c b/openbox/composite.c
index 1e2ce6a9b0ef628eb8e971758a34965b2f268903..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/openbox/composite.c
+++ b/openbox/composite.c
@@ -1,72 +0,0 @@
-#include "composite.h"
-#include "openbox.h"
-#include "extensions.h"
-
-#ifndef USE_XCOMPOSITE
-void composite_startup(gboolean reconfig) {}
-void composite_shutdown(gboolean reconfig) {}
-gboolean composite_window_has_alpha(Visual *vis) { return FALSE; }
-XID composite_get_window_picture(Window win, Visual *vis) { return None; }
-Pixmap composite_get_window_pixmap(Window win) { return None; }
-#else
-
-static Picture root_picture = None;
-
-void composite_startup(gboolean reconfig)
-{
-    if (reconfig) return;
-    if (!extensions_comp) return;
-
-    /* Redirect window contents to offscreen pixmaps */
-    XCompositeRedirectSubwindows(ob_display,
-                                 RootWindow(ob_display, ob_screen),
-                                 CompositeRedirectAutomatic);
-}
-
-void composite_shutdown(gboolean reconfig)
-{
-    if (reconfig) return;
-    if (!extensions_comp) return;
-}
-
-void composite_setup_root_window()
-{
-    if (root_picture)
-        XRenderFreePicture(ob_display, root_picture);
-
-    root_picture =
-        composite_get_window_picture(RootWindow(ob_display, ob_screen),
-                                     RrVisual(ob_rr_inst));
-}
-
-gboolean composite_window_has_alpha(Visual *vis)
-{
-    XRenderPictFormat *format;
-
-    if (!extensions_comp) return FALSE;
-
-    format = XRenderFindVisualFormat(ob_display, vis);
-    return format->type == PictTypeDirect && format->direct.alphaMask;
-}
-
-XID composite_get_window_picture(Window win, Visual *vis)
-{
-    XRenderPictureAttributes pa;
-    XRenderPictFormat *format;
-
-    if (!extensions_comp) return None;
-
-    format = XRenderFindVisualFormat(ob_display, vis);
-
-    pa.subwindow_mode = IncludeInferiors;
-    return XRenderCreatePicture(ob_display, win, format, CPSubwindowMode, &pa);
-}
-
-Pixmap composite_get_window_pixmap(Window win)
-{
-    if (!extensions_comp) return None;
-
-    return XCompositeNameWindowPixmap(ob_display, win);
-}
-
-#endif