preliminary support for composite/compositing manager. Also general work

for consistency with transparency resources

5 files changed, 91 insertions, 26 deletions

diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 2e69339..7e6c863 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWindow.cc,v 1.42 2004/09/11 22:59:15 fluxgen Exp $
+// $Id: FbWindow.cc,v 1.43 2004/09/12 14:56:19 rathnor Exp $
 
 #include "FbWindow.hh"
 #include "FbPixmap.hh"
@@ -161,6 +161,9 @@ void FbWindow::clearArea(int x, int y,
 
 void FbWindow::updateTransparent(int the_x, int the_y, unsigned int the_width, unsigned int the_height) {
 #ifdef HAVE_XRENDER
+    if (!m_transparent.get())
+        return;
+
     if (width() == 0 || height() == 0)
         return;
 
@@ -174,9 +177,6 @@ void FbWindow::updateTransparent(int the_x, int the_y, unsigned int the_width, u
         the_y = 0;
     }
 
-    if (!m_transparent.get())
-        return;
-
     // update source and destination if needed
     Pixmap root = FbPixmap::getRootPixmap(screenNumber());
     if (m_transparent->source() != root)
@@ -215,7 +215,13 @@ void FbWindow::updateTransparent(int the_x, int the_y, unsigned int the_width, u
 
 void FbWindow::setAlpha(unsigned char alpha) {
 #ifdef HAVE_XRENDER
-    if (m_transparent.get() == 0 && alpha < 255) {
+    if (FbTk::Transparent::haveComposite()) {
+        if (m_transparent.get() != 0)
+            m_transparent.reset(0);
+
+        // don't setOpaque, let controlling objects do that
+        // since it's only needed on toplevel windows
+    } else if (m_transparent.get() == 0 && alpha < 255) {
         m_transparent.reset(new Transparent(FbPixmap::getRootPixmap(screenNumber()), window(), alpha, screenNumber()));
     } else if (alpha < 255 && alpha != m_transparent->alpha())
         m_transparent->setAlpha(alpha);
@@ -395,6 +401,14 @@ long FbWindow::eventMask() const {
 
 }
 
+void FbWindow::setOpaque(unsigned char alpha) {
+#ifdef HAVE_XRENDER
+    static Atom m_alphaatom = XInternAtom(display(), "_NET_WM_WINDOW_OPACITY", False);
+    unsigned int opacity = alpha << 24;
+    changeProperty(m_alphaatom, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &opacity, 1l);
+#endif // HAVE_XRENDER
+}
+
 void FbWindow::setBufferPixmap(Pixmap pm) {
     m_buffer_pm = pm;
 }
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index c39b8c1..d408216 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWindow.hh,v 1.34 2004/09/11 12:33:14 rathnor Exp $
+// $Id: FbWindow.hh,v 1.35 2004/09/12 14:56:19 rathnor Exp $
 
 #ifndef FBTK_FBWINDOW_HH
 #define FBTK_FBWINDOW_HH
@@ -163,6 +163,9 @@ public:
     inline bool operator == (const FbWindow &win) const { return m_window == win.m_window; }
     inline bool operator != (const FbWindow &win) const { return m_window != win.m_window; }
 
+    // used for composite
+    void setOpaque(unsigned char alpha);
+
 protected:
     /// creates a window with x window client (m_window = client)
     explicit FbWindow(Window client);
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 5cfb1d1..b1e186d 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Menu.cc,v 1.84 2004/09/11 22:59:15 fluxgen Exp $
+// $Id: Menu.cc,v 1.85 2004/09/12 14:56:19 rathnor Exp $
 
 //use GNU extensions
 #ifndef  _GNU_SOURCE
@@ -1379,10 +1379,14 @@ void Menu::keyPressEvent(XKeyEvent &event) {
 
 void Menu::reconfigure() {
 
-    if (alpha() == 255 && m_transp.get() != 0) {
+    if (FbTk::Transparent::haveComposite()) {
+        if (m_transp.get() != 0)
+            m_transp.reset(0);
+
+        menu.window.setOpaque(alpha());
+    } else if (alpha() == 255 && m_transp.get() != 0) {
         m_transp.reset(0);
     } else if (alpha () < 255) {
-
         if (m_transp.get() == 0) {
             m_transp.reset(new Transparent(FbPixmap::getRootPixmap(screenNumber()),
                                            m_real_frame_pm.drawable(), alpha(),
@@ -1484,7 +1488,6 @@ void Menu::renderTransp(int x, int y,
     if (m_transp->source() != root)
         m_transp->setSource(root, screenNumber());
 
-
     if (m_transp->dest() != m_real_frame_pm.drawable())
         m_transp->setDest(m_real_frame_pm.drawable(), screenNumber());
 
diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc
index b6521b9..f8ca2a8 100644
--- a/src/FbTk/Transparent.cc
+++ b/src/FbTk/Transparent.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Transparent.cc,v 1.8 2004/09/11 15:52:23 rathnor Exp $
+// $Id: Transparent.cc,v 1.9 2004/09/12 14:56:20 rathnor Exp $
 
 #include "Transparent.hh"
 #include "App.hh"
@@ -99,26 +99,67 @@ namespace FbTk {
 
 bool Transparent::s_init = false;
 bool Transparent::s_render = false;
+bool Transparent::s_composite = false;
 
-Transparent::Transparent(Drawable src, Drawable dest, unsigned char alpha, int screen_num):
-    m_alpha_pic(0), m_src_pic(0), m_dest_pic(0),
-    m_source(src), m_dest(dest), m_alpha(alpha) {
-
+void Transparent::init() {
     Display *disp = FbTk::App::instance()->display();
 
-    // check for RENDER support
-    if (!s_init) {
-        int major_opcode, first_event, first_error;
-        if (XQueryExtension(disp, "RENDER",
+    int major_opcode, first_event, first_error;
+    if (XQueryExtension(disp, "RENDER",
+                        &major_opcode,
+                        &first_event, &first_error) == False) {
+        s_render = false;
+        s_composite = false;
+    } else { // we have RENDER support
+        s_render = true;
+
+        if (XQueryExtension(disp, "Composite",
                             &major_opcode,
                             &first_event, &first_error) == False) {
-            s_render = false;
-        } else { // we got RENDER support
-            s_render = true;
+            s_composite = false;
+        } else { // we have Composite support
+            s_composite = true;
         }
-        s_init = true;
     }
+    s_init = true;
+}
 
+void Transparent::usePseudoTransparent(bool no_composite) {
+    if (s_composite != no_composite)
+        return;
+
+    s_init = false;
+    init(); // only use render if we have it
+
+    if (no_composite)
+        s_composite = false;
+}
+
+bool Transparent::haveComposite(bool for_real) {
+    if (for_real) {
+        Display *disp = FbTk::App::instance()->display();
+        int major_opcode, first_event, first_error;
+
+        return (XQueryExtension(disp, "Composite",
+                               &major_opcode,
+                               &first_event, &first_error) == True);
+    } else {
+        if (!s_init)
+            init();
+
+        return s_composite;
+    }
+}
+
+Transparent::Transparent(Drawable src, Drawable dest, unsigned char alpha, int screen_num):
+    m_alpha_pic(0), m_src_pic(0), m_dest_pic(0),
+    m_source(src), m_dest(dest), m_alpha(alpha) {
+
+    Display *disp = FbTk::App::instance()->display();
+
+    // check for Extension support
+    if (!s_init)
+        init();
 
 #ifdef HAVE_XRENDER
     if (!s_render)
@@ -126,7 +167,6 @@ Transparent::Transparent(Drawable src, Drawable dest, unsigned char alpha, int s
 
     allocAlpha(m_alpha);
 
-
     XRenderPictFormat *format =
         XRenderFindVisualFormat(disp,
                                 DefaultVisual(disp, screen_num));
diff --git a/src/FbTk/Transparent.hh b/src/FbTk/Transparent.hh
index fe29826..9aeeead 100644
--- a/src/FbTk/Transparent.hh
+++ b/src/FbTk/Transparent.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Transparent.hh,v 1.3 2003/05/13 21:16:27 fluxgen Exp $
+// $Id: Transparent.hh,v 1.4 2004/09/12 14:56:20 rathnor Exp $
 
 #ifndef FBTK_TRANSPARENT_HH
 #define FBTK_TRANSPARENT_HH
@@ -50,6 +50,10 @@ public:
     Drawable dest() const { return m_dest; }
     Drawable source() const { return m_source; }
 
+    static bool haveComposite(bool for_real = false);
+    static bool haveRender() { if (!s_init) init(); return s_render; }
+    static void usePseudoTransparent(bool no_composite);
+
 private:
     void freeAlpha();
     void allocAlpha(unsigned char newval);
@@ -61,7 +65,8 @@ private:
     
     static bool s_init;
     static bool s_render; ///< wheter we have RENDER support
-
+    static bool s_composite; ///< wheter we have Composite support
+    static void init();
 };
 
 }; // end namespace  FbTk