Add request attaching a layer surface as toplevel parent

CMakeLists.txt

@@ -4,13 +4,13 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(layershellqt)
-set(PROJECT_VERSION "6.1.90")
+set(PROJECT_VERSION "6.1.80")
 set(PROJECT_VERSION_MAJOR 6)
 
 set(CMAKE_C_STANDARD 99)
 
-set(QT_MIN_VERSION "6.7.0")
-set(KF6_MIN_VERSION "6.5.0")
+set(QT_MIN_VERSION "6.6.0")
+set(KF6_MIN_VERSION "6.2.0")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")
 
 set(CMAKE_CXX_STANDARD 20)
@@ -32,7 +32,6 @@ include(KDEClangFormat)
 include(ECMQtDeclareLoggingCategory)
 include(ECMQmlModule)
 include(KDEGitCommitHooks)
-include(ECMGenerateQDoc)
 
 find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
 find_package(WaylandScanner REQUIRED)

src/CMakeLists.txt

@@ -4,16 +4,10 @@
 remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS)
 
 add_library(LayerShellQtInterface)
-
-if (Qt6_VERSION VERSION_GREATER_EQUAL "6.8.0")
-    set(private_code_option  "PRIVATE_CODE")
-endif()
-qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface
-    ${private_code_option}
-    FILES
-        ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
-        ${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml
+qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface FILES
+    ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
+    ${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
+    ${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml
 )
 
 ecm_qt_declare_logging_category(LayerShellQtInterface
@@ -68,8 +62,6 @@ generate_export_header(LayerShellQtInterface
     EXPORT_FILE_NAME LayerShellQt/layershellqt_export.h
 )
 
-ecm_generate_qdoc(LayerShellQtInterface layershellqt.qdocconf)
-
 install(TARGETS layer-shell
         LIBRARY DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/wayland-shell-integration)
 

src/interfaces/shell.h

@@ -13,18 +13,12 @@
 
 namespace LayerShellQt
 {
-/*!
- * \class LayerShellQt::Shell
- * \inmodule LayerShellQt
- * \inheaderfile LayerShellQt/Shell
- *
+/**
+ * Sets the right environment so the shells created from now on use wlr-layer-shell.
  */
 class LAYERSHELLQT_EXPORT Shell
 {
 public:
-    /*!
-     * Sets the right environment so the shells created from now on use wlr-layer-shell.
-     */
     static void useLayerShell();
 };
 

src/interfaces/window.h

@@ -18,18 +18,10 @@ namespace LayerShellQt
 {
 class WindowPrivate;
 
-/*!
- * \class LayerShellQt::Window
- * \inmodule LayerShellQt
- * \inheaderfile LayerShellQt/Window
- *
- * \brief A window.
- */
 class LAYERSHELLQT_EXPORT Window : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Anchors anchors READ anchors WRITE setAnchors NOTIFY anchorsChanged)
-    /*! \property LayerShellQt::Window::scope */
     Q_PROPERTY(QString scope READ scope WRITE setScope)
     Q_PROPERTY(QMargins margins READ margins WRITE setMargins NOTIFY marginsChanged)
     Q_PROPERTY(qint32 exclusionZone READ exclusionZone WRITE setExclusiveZone NOTIFY exclusionZoneChanged)
@@ -40,24 +32,17 @@ class LAYERSHELLQT_EXPORT Window : public QObject
 public:
     ~Window() override;
 
-    /*!
-     * \value AnchorNone
-     * \value AnchorTop The top edge of the anchor rectangle
-     * \value AnchorBottom The bottom edge of the anchor rectangle
-     * \value AnchorLeft The left edge of the anchor rectangle
-     * \value AnchorRight The right edge of the anchor rectangle
-     */
     enum Anchor {
         AnchorNone = 0,
-        AnchorTop = 1,
-        AnchorBottom = 2,
-        AnchorLeft = 4,
-        AnchorRight = 8,
+        AnchorTop = 1, ///< The top edge of the anchor rectangle
+        AnchorBottom = 2, ///< The bottom edge of the anchor rectangle
+        AnchorLeft = 4, ///< The left edge of the anchor rectangle
+        AnchorRight = 8, ///< The right edge of the anchor rectangle
     };
     Q_ENUM(Anchor);
     Q_DECLARE_FLAGS(Anchors, Anchor)
 
-    /*!
+    /**
      * This enum type is used to specify the layer where a surface can be put in.
      */
     enum Layer {
@@ -68,7 +53,7 @@ public:
     };
     Q_ENUM(Layer)
 
-    /*!
+    /**
      * This enum type is used to specify how the layer surface handles keyboard focus.
      */
     enum KeyboardInteractivity {
@@ -78,7 +63,7 @@ public:
     };
     Q_ENUM(KeyboardInteractivity)
 
-    /*!
+    /**
      * This enum type is used to specify which screen to place the surface on.
      * ScreenFromQWindow (the default) reads QWindow::screen() while ScreenFromCompositor
      * passes nil and lets the compositor decide.
@@ -110,7 +95,7 @@ public:
     void setScreenConfiguration(ScreenConfiguration screenConfiguration);
     ScreenConfiguration screenConfiguration() const;
 
-    /*!
+    /**
      * Sets a string based identifier for this window.
      * This may be used by a compositor to determine stacking
      * order within a given layer.
@@ -118,17 +103,9 @@ public:
      * May also be referred to as a role
      */
     void setScope(const QString &scope);
-
-    /*!
-     * A string based identifier for this window.
-     * This may be used by a compositor to determine stacking
-     * order within a given layer.
-     *
-     * May also be referred to as a role
-     */
     QString scope() const;
 
-    /*!
+    /**
      * Whether the QWindow should be closed when the layer surface is dismissed by the compositor.
      * For example, if the associated screen has been removed.
      *
@@ -137,7 +114,7 @@ public:
     void setCloseOnDismissed(bool close);
     bool closeOnDismissed() const;
 
-    /*!
+    /**
      * Gets the LayerShell Window for a given Qt Window
      * Ownership is not transferred
      */

src/layershellqt.qdoc

@@ -1,72 +0,0 @@
-/*!
-    \module LayerShellQt
-    \title LayerShellQt C++ Classes
-
-    \cmakepackage LayerShellQt
-    \cmaketargetitem LayerShellQt::Interface
-*/
-
-/*!
-    \namespace LayerShellQt
-    \inmodule LayerShellQt
-
-    Stuff
-*/
-
-/*!
-    \qmlmodule org.kde.layershell
-    \title LayerShellQt QML Types
-*/
-
-/*!
-    \qmltype Window
-    \inqmlmodule org.kde.layershell
-
-    \nativetype LayerShellQt::Window
-*/
-
-/*!
-    \qmlproperty string Window::scope
-
-    A scope.
-*/
-
-/*!
-    \qmlproperty int Window::margins.top
-    \qmlproperty int Window::margins.bottom
-    \qmlproperty int Window::margins.left
-    \qmlproperty int Window::margins.right
-
-    Margins
-*/
-
-/*!
-    \qmlproperty int Window::exclusionZone
-*/
-
-/*!
-    \page layershellqt-index.html
-    \title LayerShellQt
-
-    Layer Shell
-
-    \section1 Using the Module
-
-    \include {module-use.qdocinc} {using the c++ api}
-
-    \section2 Building with CMake
-
-    \include {module-use.qdocinc} {building with cmake} {Widgets}
-
-    \section1 API Reference
-
-    \list
-        \li \l{LayerShellQt C++ Classes}
-        \li \l{LayerShellQt QML Types}
-    \endlist
-
-    \section1 Licenses
-
-    TODO
-*/
-

src/layershellqt.qdocconf

@@ -1,30 +0,0 @@
-include($KDE_DOCS/global/qt-module-defaults.qdocconf)
-
-project = LayerShellQt
-description = Qt component to allow applications to make use of the Wayland wl-layer-shell protocol
-
-documentationinheaders = true
-
-headerdirs = .
-
-headers.fileextensions = "*.qdoc *.h"
-
-outputdir  = doc/html
-outputformats = HTML
-
-depends += \
-    qtcore
-
-qhp.projects            = LayerShellQt
-
-qhp.LayerShellQt.file                = layershellqt.qhp
-qhp.LayerShellQt.namespace           = org.kde.layershellqt.$QT_VERSION_TAG
-qhp.LayerShellQt.virtualFolder       = layershellqt
-qhp.LayerShellQt.indexTitle          = LayerShellQt
-qhp.LayerShellQt.indexRoot           =
-
-qhp.LayerShellQt.subprojects         = classes
-qhp.LayerShellQt.subprojects.classes.title = C++ Classes
-qhp.LayerShellQt.subprojects.classes.indexTitle = LayerShellQt C++ Classes
-qhp.LayerShellQt.subprojects.classes.selectors = class fake:headerfile
-qhp.LayerShellQt.subprojects.classes.sortPages = true

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

@@ -231,10 +231,8 @@ void QWaylandLayerSurface::sendExpose()
 {
 #if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
     window()->handleExpose(QRect(QPoint(), m_pendingSize));
-#elif QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
-    window()->sendRecursiveExposeEvent();
 #else
-    window()->updateExposure();
+    window()->sendRecursiveExposeEvent();
 #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>