2 files changed, 9 insertions, 18 deletions

diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index 2379c24..5832924 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWinFrame.hh,v 1.13 2003/08/19 16:13:25 fluxgen Exp $
+// $Id: FbWinFrame.hh,v 1.14 2003/08/24 15:18:09 fluxgen Exp $
 
 #ifndef FBWINFRAME_HH
 #define FBWINFRAME_HH
@@ -134,7 +134,7 @@ public:
     //@}
  
     void reconfigure();
-
+    void setUseShape(bool value);
     /**
        @name accessors
     */
@@ -281,6 +281,7 @@ private:
     };
     ThemeListener m_themelistener;
     std::auto_ptr<Shape> m_shape;
+    bool m_disable_shape;
 };
 
 #endif // FBWINFRAME_HH
diff --git a/src/Window.cc b/src/Window.cc
index 3920367..1d2423d 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.220 2003/08/24 10:46:56 fluxgen Exp $
+// $Id: Window.cc,v 1.221 2003/08/24 15:14:41 fluxgen Exp $
 
 #include "Window.hh"
 
@@ -339,23 +339,13 @@ void FluxboxWindow::init() {
 
     // check for shape extension and whether the window is shaped
     m_shaped = false;
-#ifdef SHAPE
+
     if (Fluxbox::instance()->haveShape()) {
-        Display *disp = FbTk::App::instance()->display();
-        int not_used;
-        unsigned int not_used2;
-        int shaped;
-        XShapeSelectInput(disp, m_client->window(), ShapeNotifyMask);
-        XShapeQueryExtents(disp, m_client->window(), 
-                           &shaped,  /// bShaped
-                           &not_used, &not_used,  // xbs, ybs
-                           &not_used2, &not_used2, // wbs, hbs
-                           &not_used, // cShaped
-                           &not_used, &not_used, // xcs, ycs
-                           &not_used2, &not_used2); // wcs, hcs
-        m_shaped = (shaped != 0 ? true : false);
+        Shape::setShapeNotify(winClient());
+        m_shaped = Shape::isShaped(winClient());
     }
-#endif // SHAPE
+
+    frame().setUseShape(!m_shaped);
 
     //!! TODO init of client should be better
     // we don't want to duplicate code here and in attachClient