Big changes to how transparency works

Consequently rearrange lots of rendering ops, and strip calls to 
updateTransparent

1 files changed, 163 insertions, 217 deletions

diff --git a/src/WinButton.cc b/src/WinButton.cc
index f9e6fe2..9ae2593 100644
--- a/src/WinButton.cc
+++ b/src/WinButton.cc
@@ -25,6 +25,7 @@
 #include "App.hh"
 #include "Window.hh"
 #include "WinButtonTheme.hh"
+#include "FbTk/Color.hh"
 
 WinButton::WinButton(const FluxboxWindow &listen_to, 
                      WinButtonTheme &theme,
@@ -32,261 +33,206 @@ WinButton::WinButton(const FluxboxWindow &listen_to,
                      int x, int y,
                      unsigned int width, unsigned int height):
     FbTk::Button(parent, x, y, width, height),
-    m_type(buttontype), m_listen_to(listen_to), m_theme(theme) {
+    m_type(buttontype), m_listen_to(listen_to), m_theme(theme), 
+    overrode_bg(false), overrode_pressed(false) {
 
     theme.reconfigSig().attach(this);
 }
 
 void WinButton::exposeEvent(XExposeEvent &event) {
     FbTk::Button::exposeEvent(event);
-    drawType(false, false);
+    drawType();
 }
 
 void WinButton::buttonReleaseEvent(XButtonEvent &event) {
     FbTk::Button::buttonReleaseEvent(event);
 }
 
-// clear is used to force this to clear the window (e.g. called from clear())
-void WinButton::drawType(bool clear, bool no_trans) {
-    bool used = false;
+// when someone else tries to set the background, we may override it
+void WinButton::setBackgroundPixmap(Pixmap pm) {
+    Pixmap my_pm = getBackgroundPixmap();
 
-    // if it's odd and we're centring, we need to add one
-    int oddW = width()%2;
-    int oddH = height()%2;
-
-    switch (m_type) {
-    case MAXIMIZE:
+    if (my_pm != 0) {
+        overrode_bg = true;
+        pm = my_pm;
+    } else {
+        overrode_bg = false;
+    }
 
-        if (pressed() && m_theme.maximizePressedPixmap().pixmap().drawable() != 0) { 
-            FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                maximizePressedPixmap().
-                                                pixmap().drawable());
-            used = true;
-        } else {
-            // check focus 
-            if (!m_listen_to.isFocused()) {
-                if (m_theme.maximizeUnfocusPixmap().pixmap().drawable() != 0) {
-                    // not focused
-                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                        maximizeUnfocusPixmap().
-                                                        pixmap().drawable());
-                    used = true;
-                }
-            } else if (m_theme.maximizePixmap().pixmap().drawable() != 0) {
-                FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                    maximizePixmap().
-                                                    pixmap().drawable());
-                used = true;
-            }
-        }
-        if (used || clear)
-            FbTk::FbWindow::clear();
-            
-        // if no pixmap was used, use old style
-        if (!used) {            
-            if (gc() == 0) // must have valid graphic context
-                return;
+    FbTk::Button::setBackgroundPixmap(pm);
+}
 
-            drawRectangle(gc(),
-                          2, 2, width() - 5, height() - 5);
-            drawLine(gc(),
-                     2, 3, width() - 3, 3);
-        }
-        break;
-    case MINIMIZE:
+void WinButton::setBackgroundColor(const FbTk::Color &color) {
+    Pixmap my_pm = getBackgroundPixmap();
 
-        if (pressed() && m_theme.iconifyPressedPixmap().pixmap().drawable() != 0) { 
-            FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                iconifyPressedPixmap().
-                                                pixmap().drawable());
-            used = true;
-        } else {
-            if (m_theme.iconifyPixmap().pixmap().drawable()){
-                // check focus 
-                if (!m_listen_to.isFocused()) {
-                    if (m_theme.iconifyUnfocusPixmap().pixmap().drawable() != 0) {
-                        // not focused
-                        FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                            iconifyUnfocusPixmap().
-                                                            pixmap().drawable());
-                        used = true;
-                    }
-                } else if (m_theme.iconifyPixmap().pixmap().drawable() != 0) {
-                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                        iconifyPixmap().
-                                                        pixmap().drawable());
-                    used = true;
-                }
-            }
+    if (my_pm != 0) {
+        overrode_bg = true;
+        FbTk::Button::setBackgroundPixmap(my_pm);
+    } else {
+        overrode_bg = false;
+        FbTk::Button::setBackgroundColor(color);
+    }
+}
 
-        } 
+void WinButton::setPressedPixmap(Pixmap pm) {
+    Pixmap my_pm = getPressedPixmap();
 
-        if (used || clear) {
-            FbTk::FbWindow::clear();
-        }
-        if (!used && gc() != 0) { // must have valid graphic context
-            FbTk::FbWindow::drawRectangle(gc(),
-                                          2, height() - 5, width() - 5, 2);
-        }
-        break;
-    case STICK:
+    if (my_pm != 0) {
+        overrode_pressed = true;
+        pm = my_pm;
+    } else {
+        overrode_pressed = false;
+    }
 
-        if (m_listen_to.isStuck() && !pressed()) {
-            if ( m_theme.stuckPixmap().pixmap().drawable() &&
-                 ! pressed()) { // we're using the same pixmap for pressed as in not stuck
-                // check focus 
-                if (!m_listen_to.isFocused()) {
-                    if ( m_theme.stuckUnfocusPixmap().pixmap().drawable() != 0) {
-                        // not focused
-                        FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                            stuckUnfocusPixmap().
-                                                            pixmap().drawable());
-                        used = true;
-                    }
-                } else if (m_theme.stuckPixmap().pixmap().drawable() != 0) {
-                    // focused
-                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                        stuckPixmap().
-                                                        pixmap().drawable());
-                    used = true;
-                }
-            }
-        } else { // not stuck and pressed
-            if (pressed()) {
-                if (m_theme.stickPressedPixmap().pixmap().drawable() != 0) { 
-                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                        stickPressedPixmap().
-                                                        pixmap().drawable());
-                    used = true;
-                }
-            } else { // not pressed
-                // check focus 
-                if (!m_listen_to.isFocused()) {
-                    if (m_theme.stickUnfocusPixmap().pixmap().drawable() != 0) {
-                        // not focused
-                        FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                            stickUnfocusPixmap().
-                                                            pixmap().drawable());
-                        used = true;
-                    }
-                } else if (m_theme.stickPixmap().pixmap().drawable()) { // focused
-                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                        stickPixmap().
-                                                        pixmap().drawable());
-                    used = true;
-                }
+    FbTk::Button::setBackgroundPixmap(pm);
+}
 
-            }
-            
-        } 
+void WinButton::setPressedColor(const FbTk::Color &color) {
+    Pixmap my_pm = getPressedPixmap();
 
-        if (used || clear)
-            FbTk::FbWindow::clear();
+    if (my_pm != 0) {
+        overrode_pressed = true;
+        FbTk::Button::setPressedPixmap(my_pm);
+    } else {
+        overrode_pressed = false;
+        FbTk::Button::setPressedColor(color);
+    }
+}
 
-        if (!used && gc() != 0) {
-            // width/4 != width/2, so we use /4*2 so that it's properly centred
-            if (m_listen_to.isStuck()) {
-                fillRectangle(gc(),
-                              width()/2 - width()/4, height()/2 - height()/4,
-                              width()/4*2 + oddW, height()/4*2 + oddH);
-            } else {
-                fillRectangle(gc(),
-                              width()/2 - width()/10, height()/2 - height()/10,
-                              width()/10*2 + oddW, height()/10*2 + oddH);
-            }
+Pixmap WinButton::getBackgroundPixmap() const {
+    bool focused = m_listen_to.isFocused();
+    switch(m_type) {
+    case MAXIMIZE:
+        if (focused)
+            return m_theme.maximizePixmap().pixmap().drawable();
+        else
+            return m_theme.maximizeUnfocusPixmap().pixmap().drawable();
+        break;
+    case MINIMIZE:
+        if (focused)
+            return m_theme.iconifyPixmap().pixmap().drawable();
+        else
+            return m_theme.iconifyUnfocusPixmap().pixmap().drawable();
+        break;
+    case STICK: {
+        bool stuck = m_listen_to.isStuck();
+        if (stuck) {
+            if (focused)
+                return m_theme.stuckPixmap().pixmap().drawable();
+            else
+                return m_theme.stuckUnfocusPixmap().pixmap().drawable();
+        } else {
+            if (focused)
+                return m_theme.stickPixmap().pixmap().drawable();
+            else
+                return m_theme.stickUnfocusPixmap().pixmap().drawable();
         }
+    }
         break;
     case CLOSE:
-        
-        if (pressed()) { 
-            if (m_theme.closePressedPixmap().pixmap().drawable()) {
-                FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                    closePressedPixmap().
-                                                    pixmap().drawable());
-                used = true;
-            }
-        } else { // not pressed
-            // check focus 
-            if (!m_listen_to.isFocused()) {
-                if (m_theme.closeUnfocusPixmap().pixmap().drawable() != 0) {
-                    // not focused
-                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                        closeUnfocusPixmap().
-                                                        pixmap().drawable());
-                    used = true;
-                }
-            } else if (m_theme.closePixmap().pixmap().drawable() != 0) { // focused
-                FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                    closePixmap().
-                                                    pixmap().drawable());
-                used = true;
-            }
-        }
+        if (focused)
+            return m_theme.closePixmap().pixmap().drawable();
+        else
+            return m_theme.closeUnfocusPixmap().pixmap().drawable();
+        break;
+    case SHADE:
+        if (focused)
+            return m_theme.shadePixmap().pixmap().drawable();
+        else
+            return m_theme.shadeUnfocusPixmap().pixmap().drawable();
+        break;
+    }
+    return None;
+}
 
-            
-        if (used || clear)
-            FbTk::FbWindow::clear();            
+Pixmap WinButton::getPressedPixmap() const {
+    switch(m_type) {
+    case MAXIMIZE:
+        return m_theme.maximizePressedPixmap().pixmap().drawable();
+    case MINIMIZE:
+        return m_theme.iconifyPressedPixmap().pixmap().drawable();
+    case STICK:
+        return m_theme.stickPressedPixmap().pixmap().drawable();
+    case CLOSE:
+        return m_theme.closePressedPixmap().pixmap().drawable();
+    case SHADE:
+        return m_theme.shadePressedPixmap().pixmap().drawable();
+    }
+    return None;
+}
 
-        if (!used && gc() != 0) { // must have valid graphic context
+// clear is used to force this to clear the window (e.g. called from clear())
+void WinButton::drawType() {
+    bool used = false;
 
-            drawLine(gc(), 
-                     2, 2,
-                     width() - 3, height() - 3);
-            // I can't figure out why this second one needs a y offset of 1?????
-            // but it does - at least on my box:
-            //   XFree86 Version 4.2.1.1 (Debian 4.2.1-12.1 20031003005825)
-            //   (protocol Version 11, revision 0, vendor release 6600)
-            // But not on mine? It's wonky. Put back to the same coords.
-            //  was width-2, 1 in the second drawline
-            // Perhaps some X versions don't draw the endpoint?
-            // Mine:
-            // XFree86 Version 4.3.0.1 (Debian 4.3.0.dfsg.1-1 20040428170728)
-            // (X Protocol Version 11, Revision 0, Release 6.6)
+    // if it's odd and we're centring, we need to add one
+    int oddW = width()%2;
+    int oddH = height()%2;
+
+    bool is_pressed = pressed();
+    if (is_pressed && overrode_pressed) 
+        return;
+    if (!is_pressed && overrode_bg)
+        return;
+    if (gc() == 0)
+        return;
 
+    // otherwise draw old style imagery
+    switch (m_type) {
+    case MAXIMIZE:
+        // if no pixmap was used, use old style
+        if (gc() == 0) // must have valid graphic context
+            return;
 
-            drawLine(gc(), 
-                     2, height() - 3,
-                     width() - 3, 2);
+        drawRectangle(gc(),
+                      2, 2, width() - 5, height() - 5);
+        drawLine(gc(),
+                 2, 3, width() - 3, 3);
+        break;
+    case MINIMIZE:
+        FbTk::FbWindow::drawRectangle(gc(),
+                                      2, height() - 5, width() - 5, 2);
+        break;
+    case STICK:
+        // width/4 != width/2, so we use /4*2 so that it's properly centred
+        if (m_listen_to.isStuck()) {
+            fillRectangle(gc(),
+                          width()/2 - width()/4, height()/2 - height()/4,
+                          width()/4*2 + oddW, height()/4*2 + oddH);
+        } else {
+            fillRectangle(gc(),
+                          width()/2 - width()/10, height()/2 - height()/10,
+                          width()/10*2 + oddW, height()/10*2 + oddH);
         }
         break;
+    case CLOSE:
+        drawLine(gc(), 
+                 2, 2,
+                 width() - 3, height() - 3);
+        // I can't figure out why this second one needs a y offset of 1?????
+        // but it does - at least on my box:
+        //   XFree86 Version 4.2.1.1 (Debian 4.2.1-12.1 20031003005825)
+        //   (protocol Version 11, revision 0, vendor release 6600)
+        // But not on mine? It's wonky. Put back to the same coords.
+        //  was width-2, 1 in the second drawline
+        // Perhaps some X versions don't draw the endpoint?
+        // Mine:
+        // XFree86 Version 4.3.0.1 (Debian 4.3.0.dfsg.1-1 20040428170728)
+        // (X Protocol Version 11, Revision 0, Release 6.6)
+
+        drawLine(gc(), 
+                 2, height() - 3,
+                 width() - 3, 2);
+        break;
     case SHADE:
-
-        if (pressed()) { 
-            if (m_theme.shadePressedPixmap().pixmap().drawable()) {
-                FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                    shadePressedPixmap().
-                                                    pixmap().drawable());
-                used = true;
-            }
-        } else { // not pressed
-            // check focus 
-            if (!m_listen_to.isFocused()) {
-                if ( m_theme.shadeUnfocusPixmap().pixmap().drawable() != 0) {
-                    // not focused
-                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                        shadeUnfocusPixmap().
-                                                        pixmap().drawable());
-                    used = true;
-                }
-            } else if (m_theme.shadePixmap().pixmap().drawable() != 0) { // focused
-                FbTk::FbWindow::setBackgroundPixmap(m_theme.
-                                                    shadePixmap().
-                                                    pixmap().drawable());
-                used = true;
-            }
-        }
-
-        if (used || clear)
-            FbTk::FbWindow::clear();            
-
+        // no cute image defined
         break;
     }
-    //    if ((used || clear) && !no_trans)
-    updateTransparent();
 }
 
 void WinButton::clear() {
-    drawType(true, true);
+    FbTk::Button::clear();
+    drawType();
 }
 
 void WinButton::update(FbTk::Subject *subj) {