fix elements of shaping, more to come

1 files changed, 12 insertions, 2 deletions

diff --git a/src/Window.cc b/src/Window.cc
index 653032e..ab917da 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -562,6 +562,11 @@ 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(),
@@ -2347,6 +2352,10 @@ void FluxboxWindow::handleEvent(XEvent &event) {
                 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);
@@ -3204,10 +3213,11 @@ void FluxboxWindow::applyDecorations(bool initial) {
     }
 
     frame().reconfigure();
-    if (!initial && client_move) {
+    if (client_move)
         Fluxbox::instance()->updateFrameExtents(*this);
+
+    if (!initial && client_move)
         sendConfigureNotify();
-    }
 
 }