port shape fixes stage 2 from trunk

1 files changed, 8 insertions, 53 deletions

diff --git a/src/Window.cc b/src/Window.cc
index c64a0c9..b0aa678 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -260,7 +260,6 @@ FluxboxWindow::FluxboxWindow(WinClient &client, FbWinFrameTheme &tm,
     m_old_decoration_mask(0),
     m_client(&client),
     m_toggled_decos(false),
-    m_shaped(false),
     m_icon_hidden(false),
     m_focus_hidden(false),
     m_old_pos_x(0), m_old_pos_y(0),
@@ -355,16 +354,10 @@ void FluxboxWindow::init() {
     m_client->setFluxboxWindow(this);
     m_client->setGroupLeftWindow(None); // nothing to the left.
 
-    // check for shape extension and whether the window is shaped
-    m_shaped = false;
-
     if (Fluxbox::instance()->haveShape()) {
         Shape::setShapeNotify(winClient());
-        m_shaped = Shape::isShaped(winClient());
     }
 
-    frame().setUseShape(!m_shaped);
-
     //!! TODO init of client should be better
     // we don't want to duplicate code here and in attachClient
     m_clientlist.push_back(m_client);
@@ -554,36 +547,12 @@ void FluxboxWindow::init() {
 
     sendConfigureNotify();
 
-    if (m_shaped)
-        shape();
-
     setupWindow();
 
     FbTk::App::instance()->sync(false);
 
 }
 
-/// apply shape to this window
-void FluxboxWindow::shape() {
-#ifdef SHAPE
-    if (m_shaped) {
-        XShapeCombineShape(display,
-                           frame().window().window(), ShapeClip,
-                           0, frame().clientArea().y(), // xOff, yOff
-                           m_client->window(),
-                           ShapeClip, ShapeSet);
-        XShapeCombineShape(display,
-                           frame().window().window(), ShapeBounding,
-                           0, frame().clientArea().y(), // xOff, yOff
-                           m_client->window(),
-                           ShapeBounding, ShapeSet);
-        XFlush(display);
-    }
-#endif // SHAPE
-
-}
-
-
 /// attach a client to this window and destroy old window
 void FluxboxWindow::attachClient(WinClient &client, int x, int y) {
     //!! TODO: check for isGroupable in client
@@ -1024,6 +993,7 @@ bool FluxboxWindow::setCurrentClient(WinClient &client, bool setinput) {
 #endif // DEBUG
     // frame focused doesn't necessarily mean input focused
     frame().setLabelButtonFocus(*button);
+    frame().setShapingClient(&client, false);
 
     return setinput && focus();
 }
@@ -1041,6 +1011,8 @@ void FluxboxWindow::associateClientWindow(bool use_attrs,
     m_client->updateTitle();
     m_client->updateIconTitle();
 
+    frame().setShapingClient(m_client, false);
+
     if (use_attrs)
         frame().moveResizeForClient(x, y,
                                     width, height, gravity, client_bw);
@@ -1258,7 +1230,6 @@ void FluxboxWindow::moveResize(int new_x, int new_y,
         sendConfigureNotify();
     }
 
-    shape();
 
     if (!moving) {
         m_last_resize_x = new_x;
@@ -1278,8 +1249,6 @@ void FluxboxWindow::moveResizeForClient(int new_x, int new_y,
     shaded = false;
     sendConfigureNotify();
 
-    shape();
-
     if (!moving) {
         m_last_resize_x = new_x;
         m_last_resize_y = new_y;
@@ -1599,7 +1568,7 @@ void FluxboxWindow::setFullscreen(bool flag) {
 
         fullscreen = false;
 
-        frame().setUseShape(!m_shaped);
+        frame().setUseShape(true);
         if (m_toggled_decos) {
             if (m_old_decoration_mask & DECORM_TITLEBAR)
                 setDecorationMask(DECOR_NONE);
@@ -2244,24 +2213,10 @@ void FluxboxWindow::handleEvent(XEvent &event) {
 #endif // DEBUG
             XShapeEvent *shape_event = (XShapeEvent *)&event;
 
-            if (shape_event->kind != ShapeBounding)
-                break;
-
-            if (shape_event->shaped) {
-                m_shaped = true;
-                shape();
-            } else {
-                m_shaped = false;
-                // set no shape
-                XShapeCombineMask(display,
-                                  frame().window().window(), ShapeClip,
-                                  0, 0,
-                                  None, ShapeSet);
-                XShapeCombineMask(display,
-                                  frame().window().window(), ShapeBounding,
-                                  0, 0,
-                                  None, ShapeSet);
-            }
+            if (shape_event->shaped)
+                frame().setShapingClient(m_client, true);
+            else
+                frame().setShapingClient(0, true);
 
             FbTk::App::instance()->sync(false);
             break;