Add property shaped for hasOwnShape method

Inclusive notify signal.

effects.cpp

@@ -1408,11 +1408,6 @@ QRegion EffectWindowImpl::shape() const
     return sw ? sw->shape() : geometry();
 }
 
-bool EffectWindowImpl::hasOwnShape() const
-{
-    return toplevel->shape();
-}
-
 QRect EffectWindowImpl::decorationInnerRect() const
 {
     Client *client = dynamic_cast<Client*>(toplevel);

effects.h

@@ -244,7 +244,6 @@ public:
     virtual const EffectWindowGroup* group() const;
 
     virtual QRegion shape() const;
-    virtual bool hasOwnShape() const;
     virtual QRect decorationInnerRect() const;
     virtual QByteArray readProperty(long atom, long type, int format) const;
     virtual void deleteProperty(long atom) const;

libkwineffects/kwineffects.cpp

@@ -325,6 +325,7 @@ WINDOW_HELPER(bool, isComboBox, "comboBox")
 WINDOW_HELPER(bool, isDNDIcon, "dndIcon")
 WINDOW_HELPER(bool, isManaged, "managed")
 WINDOW_HELPER(bool, isDeleted, "deleted")
+WINDOW_HELPER(bool, hasOwnShape, "shaped")
 WINDOW_HELPER(QString, windowRole, "windowRole")
 
 QString EffectWindow::windowClass() const

libkwineffects/kwineffects.h

@@ -1127,7 +1127,7 @@ public:
     virtual QRegion shape() const = 0;
     int screen() const;
     /** @internal Do not use */
-    virtual bool hasOwnShape() const = 0; // only for shadow effect, for now
+    bool hasOwnShape() const; // only for shadow effect, for now
     QPoint pos() const;
     QSize size() const;
     QRect rect() const;

toplevel.cpp

@@ -104,7 +104,11 @@ QRect Toplevel::decorationRect() const
 
 void Toplevel::detectShape(Window id)
 {
+    const bool wasShape = is_shape;
     is_shape = Extensions::hasShape(id);
+    if (wasShape != is_shape) {
+        emit shapedChanged();
+    }
 }
 
 // used only by Deleted::copy()

toplevel.h

@@ -153,6 +153,10 @@ class Toplevel
      * Whether this Toplevel represents an already deleted window and only kept for the compositor for animations.
      **/
     Q_PROPERTY(bool deleted READ isDeleted CONSTANT)
+    /**
+     * Whether the window has an own shape
+     **/
+    Q_PROPERTY(bool shaped READ shape NOTIFY shapedChanged)
 public:
     Toplevel(Workspace *ws);
     Window frameId() const;
@@ -278,6 +282,12 @@ signals:
     void geometryShapeChanged(KWin::Toplevel* toplevel, const QRect& old);
     void windowClosed(KWin::Toplevel* toplevel, KWin::Deleted* deleted);
     void windowShown(KWin::Toplevel* toplevel);
+    /**
+     * Signal emitted when the window's shape state changed. That is if it did not have a shape
+     * and received one or if the shape was withdrawn. Think of Chromium enabling/disabling KWin's
+     * decoration.
+     **/
+    void shapedChanged();
 
 protected:
     virtual ~Toplevel();