Add shell to shell surfaces

Each and every shell surface now expose the shell it belongs to, so we can find it without casting to the actual implementation. Issue: #22
lirios · Sep 24, 2022 · 80a5d39 · 80a5d39
1 parent 729b665
commit 80a5d39
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 13 deletions.
diff --git a/src/compositor/extensions/aurorawaylandiviapplication.cpp b/src/compositor/extensions/aurorawaylandiviapplication.cpp
@@ -88,7 +88,7 @@ namespace Compositor {
  * Constructs a WaylandIviApplication object.
  */
 WaylandIviApplication::WaylandIviApplication()
-    : WaylandCompositorExtensionTemplate<WaylandIviApplication>()
+    : WaylandShellTemplate<WaylandIviApplication>()
     , d_ptr(new WaylandIviApplicationPrivate(this))
 {
 }
@@ -97,7 +97,7 @@ WaylandIviApplication::WaylandIviApplication()
  * Constructs a WaylandIviApplication object for the provided \a compositor.
  */
 WaylandIviApplication::WaylandIviApplication(WaylandCompositor *compositor)
-    : WaylandCompositorExtensionTemplate<WaylandIviApplication>(compositor)
+    : WaylandShellTemplate<WaylandIviApplication>(compositor)
     , d_ptr(new WaylandIviApplicationPrivate(this))
 {
 }
@@ -112,7 +112,7 @@ WaylandIviApplication::~WaylandIviApplication()
 void WaylandIviApplication::initialize()
 {
     Q_D(WaylandIviApplication);
-    WaylandCompositorExtensionTemplate::initialize();
+    WaylandShellTemplate::initialize();
 
     WaylandCompositor *compositor = static_cast<WaylandCompositor *>(extensionContainer());
     if (!compositor) {
@@ -172,7 +172,7 @@ QByteArray WaylandIviApplication::interfaceName()
  */
 
 WaylandIviApplicationPrivate::WaylandIviApplicationPrivate(WaylandIviApplication *self)
-    : WaylandCompositorExtensionPrivate(self)
+    : WaylandShellPrivate(self)
 {
 }
 

diff --git a/src/compositor/extensions/aurorawaylandiviapplication.h b/src/compositor/extensions/aurorawaylandiviapplication.h
@@ -32,6 +32,7 @@
 
 #include <LiriAuroraCompositor/WaylandCompositorExtension>
 #include <LiriAuroraCompositor/WaylandSurface>
+#include <LiriAuroraCompositor/WaylandShell>
 #include <LiriAuroraCompositor/WaylandResource>
 #include <LiriAuroraCompositor/WaylandIviSurface>
 #include <QtCore/QSize>
@@ -42,7 +43,7 @@ namespace Compositor {
 
 class WaylandIviApplicationPrivate;
 
-class LIRIAURORACOMPOSITOR_EXPORT WaylandIviApplication : public WaylandCompositorExtensionTemplate<WaylandIviApplication>
+class LIRIAURORACOMPOSITOR_EXPORT WaylandIviApplication : public WaylandShellTemplate<WaylandIviApplication>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(WaylandIviApplication)

diff --git a/src/compositor/extensions/aurorawaylandiviapplication_p.h b/src/compositor/extensions/aurorawaylandiviapplication_p.h
@@ -30,7 +30,7 @@
 #ifndef AURORA_COMPOSITOR_WAYLANDIVIAPPLICATION_P_H
 #define AURORA_COMPOSITOR_WAYLANDIVIAPPLICATION_P_H
 
-#include <LiriAuroraCompositor/private/aurorawaylandcompositorextension_p.h>
+#include <LiriAuroraCompositor/private/aurorawaylandshell_p.h>
 #include <LiriAuroraCompositor/private/aurora-server-ivi-application.h>
 
 #include <LiriAuroraCompositor/WaylandIviApplication>
@@ -53,7 +53,7 @@ namespace Aurora {
 namespace Compositor {
 
 class LIRIAURORACOMPOSITOR_EXPORT WaylandIviApplicationPrivate
-        : public WaylandCompositorExtensionPrivate
+        : public WaylandShellPrivate
         , public PrivateServer::ivi_application
 {
     Q_DECLARE_PUBLIC(WaylandIviApplication)

diff --git a/src/compositor/extensions/aurorawaylandivisurface.cpp b/src/compositor/extensions/aurorawaylandivisurface.cpp
@@ -122,6 +122,15 @@ void WaylandIviSurface::initialize(WaylandIviApplication *iviApplication, Waylan
     WaylandCompositorExtension::initialize();
 }
 
+/*!
+ * \internal
+ */
+WaylandShell *WaylandIviSurface::shell() const
+{
+    Q_D(const WaylandIviSurface);
+    return d->m_iviApplication;
+}
+
 /*!
  * \qmlproperty WaylandSurface AuroraCompositor::IviSurface::surface
  *

diff --git a/src/compositor/extensions/aurorawaylandivisurface.h b/src/compositor/extensions/aurorawaylandivisurface.h
@@ -64,6 +64,7 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandIviSurface : public WaylandShellSurface
                                 Aurora::Compositor::WaylandSurface *surface,
                                 uint iviId, const Aurora::Compositor::WaylandResource &resource);
 
+    WaylandShell *shell() const override;
     WaylandSurface *surface() const;
     uint iviId() const;
 

diff --git a/src/compositor/extensions/aurorawaylandshellsurface.h b/src/compositor/extensions/aurorawaylandshellsurface.h
@@ -39,11 +39,13 @@ namespace Compositor {
 
 class WaylandQuickShellIntegration;
 class WaylandQuickShellSurfaceItem;
+class WaylandShell;
 
 class LIRIAURORACOMPOSITOR_EXPORT WaylandShellSurface : public WaylandCompositorExtension
 {
     Q_OBJECT
     Q_PROPERTY(Qt::WindowType windowType READ windowType NOTIFY windowTypeChanged)
+    Q_PROPERTY(Aurora::Compositor::WaylandShell *shell READ shell NOTIFY shellChanged)
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     QML_NAMED_ELEMENT(ShellSurface)
     QML_UNCREATABLE("")
@@ -54,9 +56,13 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandShellSurface : public WaylandCompositor
     virtual WaylandQuickShellIntegration *createIntegration(WaylandQuickShellSurfaceItem *item) = 0;
 #endif
     WaylandShellSurface(WaylandObject *waylandObject) : WaylandCompositorExtension(waylandObject) {}
+
+    virtual WaylandShell *shell() const = 0;
+
     virtual Qt::WindowType windowType() const { return Qt::WindowType::Window; }
 
 Q_SIGNALS:
+    void shellChanged();
     void windowTypeChanged();
 };
 

diff --git a/src/compositor/extensions/aurorawaylandwlrlayershellv1.h b/src/compositor/extensions/aurorawaylandwlrlayershellv1.h
@@ -118,7 +118,7 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrLayerSurfaceV1
                                 const QString &nameSpace,
                                 const Aurora::Compositor::WaylandResource &resource);
 
-    WaylandWlrLayerShellV1 *shell() const;
+    WaylandWlrLayerShellV1 *shell() const override;
     WaylandSurface *surface() const;
     WaylandOutput *output() const;
     WaylandWlrLayerShellV1::Layer layer() const;
@@ -152,7 +152,6 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrLayerSurfaceV1
     static WaylandSurfaceRole *role();
 
 Q_SIGNALS:
-    void shellChanged();
     void surfaceChanged();
     void layerChanged();
     void sizeChanged();

diff --git a/src/compositor/extensions/aurorawaylandwlshell.h b/src/compositor/extensions/aurorawaylandwlshell.h
@@ -124,7 +124,7 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlShellSurface : public WaylandShellSur
     QString className() const;
 
     WaylandSurface *surface() const;
-    WaylandWlShell *shell() const;
+    WaylandWlShell *shell() const override;
 
     Qt::WindowType windowType() const override;
 
@@ -147,7 +147,6 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void surfaceChanged();
-    void shellChanged();
     void titleChanged();
     void classNameChanged();
     void pong();

diff --git a/src/compositor/extensions/aurorawaylandxdgshell.h b/src/compositor/extensions/aurorawaylandxdgshell.h
@@ -111,7 +111,7 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandXdgSurface : public WaylandShellSurface
 
     Qt::WindowType windowType() const override;
 
-    WaylandXdgShell *shell() const;
+    WaylandXdgShell *shell() const override;
     WaylandSurface *surface() const;
     WaylandXdgToplevel *toplevel() const;
     WaylandXdgPopup *popup() const;
@@ -126,7 +126,6 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandXdgSurface : public WaylandShellSurface
 #endif
 
 Q_SIGNALS:
-    void shellChanged();
     void surfaceChanged();
     void toplevelCreated();
     void popupCreated();