No idea what this setShapable() stuff is, but it certainly

doesn't belong to detectNoBorder().
CCMAIL: thomas.luebking@web.de


svn path=/trunk/KDE/kdebase/kwin/; revision=428551

client.cpp

@@ -358,7 +358,6 @@ void Client::detectNoBorder()
         case NET::Dialog :
         case NET::Utility :
             noborder = false;
-            setShapable(FALSE);
           break;
         default:
             assert( false );
@@ -370,6 +369,30 @@ void Client::detectNoBorder()
         noborder = true;
     }
 
+void Client::detectShapable()
+    {
+    if( Shape::hasShape( window()))
+        return;
+    switch( windowType())
+        {
+        case NET::Desktop :
+        case NET::Dock :
+        case NET::TopMenu :
+        case NET::Splash :
+          break;
+        case NET::Unknown :
+        case NET::Normal :
+        case NET::Toolbar :
+        case NET::Menu :
+        case NET::Dialog :
+        case NET::Utility :
+            setShapable(FALSE);
+          break;
+        default:
+            assert( false );
+        }
+    }
+
 void Client::updateFrameExtents()
     {
     NETStrut strut;

client.h

@@ -405,6 +405,7 @@ class Client : public QObject, public KDecorationDefines
 
         void embedClient( Window w, const XWindowAttributes &attr );    
         void detectNoBorder();
+        void detectShapable();
         void destroyDecoration();
         void updateFrameExtents();
 

manage.cpp

@@ -104,6 +104,7 @@ bool Client::manage( Window w, bool isMapped )
     setCaption( cap_normal, true );
 
     detectNoBorder();
+    detectShapable();
     fetchIconicName();
     getWMHints(); // needs to be done before readTransient() because of reading the group
     modal = ( info->state() & NET::Modal ) != 0; // needs to be valid before handling groups