Big changes to how transparency works

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

1 files changed, 6 insertions, 29 deletions

diff --git a/src/FbTk/Button.cc b/src/FbTk/Button.cc
index c48b355..414979b 100644
--- a/src/FbTk/Button.cc
+++ b/src/FbTk/Button.cc
@@ -33,10 +33,9 @@ Button::Button(int screen_num, int x, int y,
                unsigned int width, unsigned int height):
     FbWindow(screen_num, x, y, width, height,
              ExposureMask | ButtonPressMask | ButtonReleaseMask),
-    m_foreground_pm(0),
     m_background_pm(0),
     m_pressed_pm(0),
-    m_pressed_color("black", screen_num),
+    m_pressed_color(),
     m_gc(DefaultGC(FbTk::App::instance()->display(), screen_num)),
     m_pressed(false) {
 
@@ -48,10 +47,9 @@ Button::Button(const FbWindow &parent, int x, int y,
                unsigned int width, unsigned int height):
     FbWindow(parent, x, y, width, height,
              ExposureMask | ButtonPressMask | ButtonReleaseMask),
-    m_foreground_pm(0),
     m_background_pm(0),
     m_pressed_pm(0),
-    m_pressed_color("black", parent.screenNumber()),
+    m_pressed_color(),
     m_gc(DefaultGC(FbTk::App::instance()->display(), screenNumber())),
     m_pressed(false) {
     // add this to eventmanager
@@ -70,15 +68,12 @@ void Button::setOnClick(RefCount<Command> &cmd, int button) {
     m_onclick[button - 1] = cmd;
 }
 
-void Button::setPixmap(Pixmap pm) {
-    m_foreground_pm = pm;
-}
-
 void Button::setPressedPixmap(Pixmap pm) {
     m_pressed_pm = pm;
 }
 
 void Button::setPressedColor(const FbTk::Color &color) {
+    m_pressed_pm = None;
     m_pressed_color = color;
 }
 
@@ -115,27 +110,16 @@ void Button::buttonReleaseEvent(XButtonEvent &event) {
     if (m_background_pm) {
         if (m_pressed_pm != 0) {
             update = true;
-            setBackgroundPixmap(m_background_pm);
+           FbTk::FbWindow::setBackgroundPixmap(m_background_pm);
         }
     } else if (m_pressed_color.isAllocated()) {
         update = true;
-        setBackgroundColor(m_background_color);
+        FbTk::FbWindow::setBackgroundColor(m_background_color);
     }
 
-    if (update) {
+    if (update)
         clear(); // clear background
 
-        if (m_foreground_pm) { // draw foreground pixmap
-            Display *disp = App::instance()->display();
-
-            if (m_gc == 0) // get default gc if we dont have one
-                m_gc = DefaultGC(disp, screenNumber());
-        
-            XCopyArea(disp, m_foreground_pm, window(), m_gc, 0, 0, width(), height(), 0, 0);
-        }
-
-    }
-
     // finaly, execute command (this must be done last since this object might be deleted by the command)
     if (event.button > 0 && event.button <= 5 &&
         event.x > 0 && event.x < static_cast<signed>(width()) &&
@@ -147,14 +131,7 @@ void Button::buttonReleaseEvent(XButtonEvent &event) {
 }
 
 void Button::exposeEvent(XExposeEvent &event) {
-    /*
-    if (m_background_pm)
-        setBackgroundPixmap(m_background_pm);
-    else
-        setBackgroundColor(m_background_color);
-    */
     clearArea(event.x, event.y, event.width, event.height);
-    //    updateTransparent(event.x, event.y, event.width, event.height);
 }
 
 }; // end namespace FbTk