Add request attaching a layer surface as toplevel parent

CMakeLists.txt

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(layershellqt)
-set(PROJECT_VERSION "6.1.2")
+set(PROJECT_VERSION "6.1.80")
 set(PROJECT_VERSION_MAJOR 6)
 
 set(CMAKE_C_STANDARD 99)

src/qwaylandlayershellintegration.cpp

@@ -12,12 +12,15 @@
 #include <QtWaylandClient/private/qwaylanddisplay_p.h>
 #include <QtWaylandClient/private/qwaylandwindow_p.h>
 
+#include <QPlatformSurfaceEvent>
+
 namespace LayerShellQt
 {
 QWaylandLayerShellIntegration::QWaylandLayerShellIntegration()
     : QWaylandShellIntegrationTemplate<QWaylandLayerShellIntegration>(5)
     , m_xdgActivation(new QWaylandXdgActivationV1)
 {
+    qGuiApp->installEventFilter(this);
 }
 
 QWaylandLayerShellIntegration::~QWaylandLayerShellIntegration()
@@ -32,4 +35,29 @@ QtWaylandClient::QWaylandShellSurface *QWaylandLayerShellIntegration::createShel
     return new QWaylandLayerSurface(this, window);
 }
 
+bool QWaylandLayerShellIntegration::eventFilter(QObject *watched, QEvent *event)
+{
+    if (event->type() == QEvent::PlatformSurface && static_cast<QPlatformSurfaceEvent *>(event)->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) {
+        QWindow *window = qobject_cast<QWindow *>(watched);
+        if (!window) {
+            return false;
+        }
+        auto child = static_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
+        auto maybeSetParent = [child]() {
+            auto transientParent = child->window()->transientParent();
+            if (!transientParent) {
+                return;
+            }
+            if (auto layerParent = qobject_cast<QWaylandLayerSurface *>(static_cast<QtWaylandClient::QWaylandWindow *>(transientParent->handle())->shellSurface())) {
+                if (auto topevel = child->surfaceRole<xdg_toplevel>()) {
+                    layerParent->set_parent_of(topevel);
+                }
+            }
+        };
+        maybeSetParent();
+        connect(window, &QWindow::transientParentChanged, child, maybeSetParent);
+        connect(child, &QtWaylandClient::QWaylandWindow::surfaceRoleCreated, this, maybeSetParent);
+    }
+    return false;
+}
 }

src/qwaylandlayershellintegration_p.h

@@ -32,6 +32,7 @@ public:
     QtWaylandClient::QWaylandShellSurface *createShellSurface(QtWaylandClient::QWaylandWindow *window) override;
 
 private:
+    bool eventFilter(QObject *watched, QEvent *event) override;
     QScopedPointer<QWaylandXdgActivationV1> m_xdgActivation;
 };
 

src/qwaylandlayersurface.cpp

@@ -110,9 +110,13 @@ void QWaylandLayerSurface::attachPopup(QtWaylandClient::QWaylandShellSurface *po
 
 void QWaylandLayerSurface::applyConfigure()
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     m_configuring = true;
+#endif
     window()->resizeFromApplyConfigure(m_pendingSize);
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     m_configuring = false;
+#endif
 }
 
 void QWaylandLayerSurface::setDesiredSize(const QSize &size)
@@ -163,6 +167,7 @@ void QWaylandLayerSurface::setLayer(uint32_t layer)
         set_layer(layer);
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
 void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
 {
     if (m_configuring) {
@@ -171,6 +176,12 @@ void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
 
     setDesiredSize(geometry.size());
 }
+#else
+void QWaylandLayerSurface::setWindowSize(const QSize &size)
+{
+    setDesiredSize(size);
+}
+#endif
 
 bool QWaylandLayerSurface::requestActivate()
 {

src/qwaylandlayersurface_p.h

@@ -43,7 +43,11 @@ public:
     void setLayer(uint32_t layer);
 
     void applyConfigure() override;
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     void setWindowGeometry(const QRect &geometry) override;
+#else
+    void setWindowSize(const QSize &size) override;
+#endif
 
     bool requestActivate() override;
     void setXdgActivationToken(const QString &token) override;
@@ -61,7 +65,9 @@ private:
     QString m_activationToken;
 
     bool m_configured = false;
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     bool m_configuring = false;
+#endif
 };
 
 }

src/wlr-layer-shell-unstable-v1.xml

@@ -403,5 +403,11 @@
       </description>
       <arg name="edge" type="uint"/>
     </request>
+
+    <request name="set_parent_of">
+      <description summary="assign this layer_surface as an xdg_toplevel parent">
+      </description>
+      <arg name="toplevel" type="object" interface="xdg_toplevel" />
+    </request>
   </interface>
 </protocol>