Update version number for 5.26.1

GIT_SILENT

.gitlab-ci.yml

@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: CC0-1.0
 
 include:
-  - project: sysadmin/ci-utilities
-    file:
-      - /gitlab-templates/reuse-lint.yml
-      - /gitlab-templates/linux-qt6.yml
-      - /gitlab-templates/freebsd-qt6.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml

.kde-ci.yml

@@ -4,6 +4,4 @@
 Dependencies:
 - 'on': ['@all']
   'require':
-    'frameworks/extra-cmake-modules': '@latest-kf6'
-    'third-party/wayland': '@latest'
-    'third-party/wayland-protocols': '@latest'
+    'frameworks/extra-cmake-modules': '@latest'

CMakeLists.txt

@@ -4,36 +4,37 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(layershellqt)
-set(PROJECT_VERSION "5.92.0")
-set(PROJECT_VERSION_MAJOR 6)
+set(PROJECT_VERSION "5.26.1")
+set(PROJECT_VERSION_MAJOR 5)
 
 set(CMAKE_C_STANDARD 99)
 
-set(QT_MIN_VERSION "6.6.0")
-set(KF6_MIN_VERSION "5.240.0")
+set(QT_MIN_VERSION "5.15.2")
+set(KF5_MIN_VERSION "5.98.0")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE)
+find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMSetupVersion)
-include(ECMDeprecationSettings)
 include(ECMGenerateHeaders)
 include(CMakePackageConfigHelpers)
 include(FeatureSummary)
 include(GenerateExportHeader)
 include(KDEClangFormat)
 include(ECMQtDeclareLoggingCategory)
-include(ECMQmlModule)
 
-
-find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
+if (QT_MAJOR_VERSION EQUAL "5")
+    find_package(Qt5XkbCommonSupport REQUIRED PRIVATE)
+    find_package(QtWaylandScanner REQUIRED)
+endif()
 find_package(WaylandScanner REQUIRED)
 find_package(Wayland 1.3 COMPONENTS Client Server)
 find_package(WaylandProtocols REQUIRED)
@@ -48,19 +49,14 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90")
 ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX LAYERSHELLQT
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/layershellqt_version.h"
                         PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/LayerShellQtConfigVersion.cmake"
-                        SOVERSION ${PROJECT_VERSION_MAJOR})
+                        SOVERSION 5)
 
 file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
 kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
-
-ecm_set_disabled_deprecation_versions(QT 6.5
-    KF 5.240
-)
-
 add_subdirectory(src)
 add_subdirectory(tests)
 
-set(CMAKECONFIG_INSTALL_DIR ${KDE_INSTALL_CMAKEPACKAGEDIR}/LayerShellQt)
+set(CMAKECONFIG_INSTALL_DIR ${KDE_INSTALL_LIBDIR}/cmake/LayerShellQt)
 install(EXPORT LayerShellQtTargets
         NAMESPACE LayerShellQt::
         DESTINATION ${CMAKECONFIG_INSTALL_DIR}

LayerShellQtConfig.cmake.in

@@ -4,6 +4,6 @@
 @PACKAGE_INIT@
 
 include(CMakeFindDependencyMacro)
-find_dependency(Qt6Gui "@QT_MIN_VERSION@")
+find_dependency(Qt@QT_MAJOR_VERSION@Gui "@QT_MIN_VERSION@")
 
 include("${CMAKE_CURRENT_LIST_DIR}/LayerShellQtTargets.cmake")

src/CMakeLists.txt

@@ -4,13 +4,17 @@
 remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS)
 
 add_library(LayerShellQtInterface)
-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
-)
+if (QT_MAJOR_VERSION EQUAL "5")
+    ecm_add_qtwayland_client_protocol(LAYER_SHELL_SOURCES PROTOCOL ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml BASENAME xdg-shell)
+    ecm_add_qtwayland_client_protocol(LAYER_SHELL_SOURCES PROTOCOL wlr-layer-shell-unstable-v1.xml BASENAME wlr-layer-shell-unstable-v1)
+else()
+    qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface FILES
+        ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml
+    )
+endif()
 
-ecm_qt_declare_logging_category(LayerShellQtInterface
+ecm_qt_declare_logging_category(LAYER_SHELL_SOURCES
     HEADER
         layershellqt_logging.h
     IDENTIFIER
@@ -19,16 +23,8 @@ ecm_qt_declare_logging_category(LayerShellQtInterface
         layershellqt
 )
 
-target_sources(LayerShellQtInterface PRIVATE
-    qwaylandxdgactivationv1.cpp
-    qwaylandlayersurface.cpp
-    qwaylandlayershellintegration.cpp
-    interfaces/window.cpp
-    interfaces/shell.cpp
-)
-
-target_link_libraries(LayerShellQtInterface PUBLIC Qt::Gui)
-target_link_libraries(LayerShellQtInterface PRIVATE Qt::WaylandClientPrivate Wayland::Client PkgConfig::XKBCOMMON)
+target_sources(LayerShellQtInterface PRIVATE qwaylandlayersurface.cpp interfaces/window.cpp interfaces/shell.cpp qwaylandlayershellintegration.cpp qwaylandlayershell.cpp ${LAYER_SHELL_SOURCES})
+target_link_libraries(LayerShellQtInterface PRIVATE Qt::Gui Qt::WaylandClientPrivate Wayland::Client PkgConfig::XKBCOMMON)
 if (TARGET Qt::XkbCommonSupportPrivate)
     target_link_libraries(LayerShellQtInterface PRIVATE Qt::XkbCommonSupportPrivate)
 endif()
@@ -72,5 +68,3 @@ install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/LayerShellQt/layershellqt_export.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/LayerShellQt COMPONENT Devel
 )
-
-add_subdirectory(declarative)

src/declarative/CMakeLists.txt

@@ -1,10 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleix.pol_gonzalez@mercedes-benz.com>
-# SPDX-License-Identifier: BSD-3-Clause
-
-ecm_add_qml_module(LayerShellQtQml
-                  URI "org.kde.layershell"
-                  VERSION 1.0
-                  SOURCES layershellqtplugin.cpp)
-target_link_libraries(LayerShellQtQml PRIVATE Qt::Qml LayerShellQtInterface)
-
-ecm_finalize_qml_module(LayerShellQtQml DESTINATION ${KDE_INSTALL_QMLDIR})

src/declarative/layershellqtplugin.cpp

@@ -1,24 +0,0 @@
-/*
- *   SPDX-FileCopyrightText: 2023 Aleix Pol Gonzalez <aleix.pol_gonzalez@mercedes-benz.com>
- *
- *   SPDX-License-Identifier: LGPL-3.0-or-later
- */
-
-#include <QQmlExtensionPlugin>
-#include "../interfaces/window.h"
-#include <qqml.h>
-
-QML_DECLARE_TYPEINFO(LayerShellQt::Window, QML_HAS_ATTACHED_PROPERTIES)
-
-class Plugin : public QQmlExtensionPlugin
-{
-    Q_PLUGIN_METADATA(IID "org.kde.layershellqt")
-    Q_OBJECT
-public:
-    void registerTypes(const char *uri) override {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("org.kde.layershell"));
-        qmlRegisterType<LayerShellQt::Window>(uri, 1, 0, "Window");
-    }
-};
-
-#include "layershellqtplugin.moc"

src/interfaces/window.cpp

@@ -5,14 +5,9 @@
  */
 
 #include "window.h"
-#include "../qwaylandlayershellintegration_p.h"
-
 #include <layershellqt_logging.h>
 
 #include <QPointer>
-#include <optional>
-
-#include <QtWaylandClient/private/qwaylandwindow_p.h>
 
 using namespace LayerShellQt;
 
@@ -28,11 +23,10 @@ public:
     QString scope = QStringLiteral("window");
     Window::Anchors anchors = {Window::AnchorTop | Window::AnchorBottom | Window::AnchorLeft | Window::AnchorRight};
     int32_t exclusionZone = 0;
-    Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityOnDemand;
+    Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityExclusive;
     Window::Layer layer = Window::LayerTop;
     QMargins margins;
-    Window::ScreenConfiguration screenConfiguration = Window::ScreenFromQWindow;
-    bool closeOnDismissed = true;
+    QPointer<QScreen> desiredOutput;
 };
 
 static QMap<QWindow *, Window *> s_map;
@@ -44,10 +38,8 @@ Window::~Window()
 
 void Window::setAnchors(Anchors anchors)
 {
-    if (d->anchors != anchors) {
-        d->anchors = anchors;
-        Q_EMIT anchorsChanged();
-    }
+    d->anchors = anchors;
+    Q_EMIT anchorsChanged();
 }
 
 Window::Anchors Window::anchors() const
@@ -57,10 +49,8 @@ Window::Anchors Window::anchors() const
 
 void Window::setExclusiveZone(int32_t zone)
 {
-    if (d->exclusionZone != zone) {
-        d->exclusionZone = zone;
-        Q_EMIT exclusionZoneChanged();
-    }
+    d->exclusionZone = zone;
+    Q_EMIT exclusionZoneChanged();
 }
 
 int32_t Window::exclusionZone() const
@@ -70,10 +60,8 @@ int32_t Window::exclusionZone() const
 
 void Window::setMargins(const QMargins &margins)
 {
-    if (d->margins != margins) {
-        d->margins = margins;
-        Q_EMIT marginsChanged();
-    }
+    d->margins = margins;
+    Q_EMIT marginsChanged();
 }
 
 QMargins Window::margins() const
@@ -83,10 +71,8 @@ QMargins Window::margins() const
 
 void Window::setKeyboardInteractivity(KeyboardInteractivity interactivity)
 {
-    if (d->keyboardInteractivity != interactivity) {
-        d->keyboardInteractivity = interactivity;
-        Q_EMIT keyboardInteractivityChanged();
-    }
+    d->keyboardInteractivity = interactivity;
+    Q_EMIT keyboardInteractivityChanged();
 }
 
 Window::KeyboardInteractivity Window::keyboardInteractivity() const
@@ -96,10 +82,7 @@ Window::KeyboardInteractivity Window::keyboardInteractivity() const
 
 void Window::setLayer(Layer layer)
 {
-    if (d->layer != layer) {
-        d->layer = layer;
-        Q_EMIT layerChanged();
-    }
+    d->layer = layer;
 }
 
 void Window::setScope(const QString &scope)
@@ -118,24 +101,14 @@ Window::Layer Window::layer() const
     return d->layer;
 }
 
-Window::ScreenConfiguration Window::screenConfiguration() const
+QScreen *Window::desiredOutput() const
 {
-    return d->screenConfiguration;
+    return d->desiredOutput;
 }
 
-void Window::setScreenConfiguration(Window::ScreenConfiguration screenConfiguration)
+void Window::setDesiredOutput(QScreen *output)
 {
-    d->screenConfiguration = screenConfiguration;
-}
-
-bool Window::closeOnDismissed() const
-{
-    return d->closeOnDismissed;
-}
-
-void Window::setCloseOnDismissed(bool close)
-{
-    d->closeOnDismissed = close;
+    d->desiredOutput = output;
 }
 
 Window::Window(QWindow *window)
@@ -143,43 +116,13 @@ Window::Window(QWindow *window)
     , d(new WindowPrivate(window))
 {
     s_map.insert(d->parentWindow, this);
-
-    window->create();
-
-    auto waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
-    if (!waylandWindow) {
-        qCWarning(LAYERSHELLQT) << window << "is not a wayland window. Not creating zwlr_layer_surface";
-        return;
-    }
-
-    static QWaylandLayerShellIntegration *shellIntegration = nullptr;
-    if (!shellIntegration) {
-        shellIntegration = new QWaylandLayerShellIntegration();
-        if (!shellIntegration->initialize(waylandWindow->display())) {
-            delete shellIntegration;
-            shellIntegration = nullptr;
-            qCWarning(LAYERSHELLQT) << "Failed to initialize layer-shell integration, possibly because compositor does not support the layer-shell protocol";
-            return;
-        }
-    }
-
-    waylandWindow->setShellIntegration(shellIntegration);
 }
 
 Window *Window::get(QWindow *window)
 {
-    if (!window) {
-        return nullptr;
-    }
-
     auto layerShellWindow = s_map.value(window);
     if (layerShellWindow) {
         return layerShellWindow;
     }
     return new Window(window);
 }
-
-Window *Window::qmlAttachedProperties(QObject *object)
-{
-    return get(qobject_cast<QWindow *>(object));
-}

src/interfaces/window.h

@@ -21,14 +21,6 @@ class WindowPrivate;
 class LAYERSHELLQT_EXPORT Window : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(Anchors anchors READ anchors WRITE setAnchors NOTIFY anchorsChanged)
-    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)
-    Q_PROPERTY(Layer layer READ layer WRITE setLayer NOTIFY layerChanged)
-    Q_PROPERTY(KeyboardInteractivity keyboardInteractivity READ keyboardInteractivity WRITE setKeyboardInteractivity NOTIFY keyboardInteractivityChanged)
-    Q_PROPERTY(ScreenConfiguration screenConfiguration READ screenConfiguration WRITE setScreenConfiguration)
-
 public:
     ~Window() override;
 
@@ -62,17 +54,6 @@ 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.
-     */
-    enum ScreenConfiguration {
-        ScreenFromQWindow = 0,
-        ScreenFromCompositor = 1,
-    };
-    Q_ENUM(ScreenConfiguration)
-
     void setAnchors(Anchors anchor);
     Anchors anchors() const;
 
@@ -88,8 +69,13 @@ public:
     void setLayer(Layer layer);
     Layer layer() const;
 
-    void setScreenConfiguration(ScreenConfiguration screenConfiguration);
-    ScreenConfiguration screenConfiguration() const;
+    /**
+     * If set, the compositor will try to put the window on the given screen.
+     * If its not set, then the compositor will decide where to put the window.
+     * Under normal circumstances, this should be the active output.
+     */
+    void setDesiredOutput(QScreen *output);
+    QScreen *desiredOutput() const;
 
     /**
      * Sets a string based identifier for this window.
@@ -101,23 +87,12 @@ public:
     void setScope(const QString &scope);
     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.
-     *
-     * This can be used to map the window on another screen.
-     */
-    void setCloseOnDismissed(bool close);
-    bool closeOnDismissed() const;
-
     /**
      * Gets the LayerShell Window for a given Qt Window
      * Ownership is not transferred
      */
     static Window *get(QWindow *window);
 
-    static Window *qmlAttachedProperties(QObject *object);
-
 Q_SIGNALS:
     void anchorsChanged();
     void exclusionZoneChanged();

src/qwaylandlayershell.cpp

@@ -0,0 +1,29 @@
+/*
+ *   SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
+ *   SPDX-FileCopyrightText: 2018 Drew DeVault <sir@cmpwn.com>
+ *
+ *   SPDX-License-Identifier: LGPL-3.0-or-later
+ */
+
+#include "qwaylandlayershell_p.h"
+#include "qwaylandlayersurface_p.h"
+
+namespace LayerShellQt
+{
+QWaylandLayerShell::QWaylandLayerShell(::wl_registry *registry, uint32_t id, uint32_t version)
+    : QtWayland::zwlr_layer_shell_v1(registry, id, version)
+{
+}
+
+QWaylandLayerShell::~QWaylandLayerShell()
+{
+    if (zwlr_layer_shell_v1_get_version(object()) >= ZWLR_LAYER_SHELL_V1_DESTROY_SINCE_VERSION)
+        zwlr_layer_shell_v1_destroy(object());
+}
+
+QWaylandLayerSurface *QWaylandLayerShell::createLayerSurface(QtWaylandClient::QWaylandWindow *window)
+{
+    return new QWaylandLayerSurface(this, window);
+}
+
+}

src/qwaylandlayershell_p.h

@@ -0,0 +1,32 @@
+/*
+ *   SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
+ *   SPDX-FileCopyrightText: 2018 Drew DeVault <sir@cmpwn.com>
+ *
+ *   SPDX-License-Identifier: LGPL-3.0-or-later
+ */
+
+#ifndef _LAYERSHELL_H
+#define _LAYERSHELL_H
+
+#include <wayland-client.h>
+
+#include <QtWaylandClient/private/qwaylandshellintegration_p.h>
+#include <qwayland-wlr-layer-shell-unstable-v1.h>
+
+#include "qwaylandlayersurface_p.h"
+
+namespace LayerShellQt
+{
+class LAYERSHELLQT_EXPORT QWaylandLayerShell : public QtWayland::zwlr_layer_shell_v1
+{
+public:
+    QWaylandLayerShell(::wl_registry *registry, uint32_t id, uint32_t version);
+    ~QWaylandLayerShell() override;
+
+    QWaylandLayerSurface *createLayerSurface(QtWaylandClient::QWaylandWindow *window);
+    // TODO: Popups
+};
+
+}
+
+#endif

src/qwaylandlayershellintegration.cpp

@@ -5,32 +5,45 @@
  *   SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+#include "qwaylandlayershell_p.h"
 #include "qwaylandlayershellintegration_p.h"
-#include "qwaylandlayersurface_p.h"
-#include "qwaylandxdgactivationv1_p.h"
 
 #include <QtWaylandClient/private/qwaylanddisplay_p.h>
 #include <QtWaylandClient/private/qwaylandwindow_p.h>
+#include <qwayland-wlr-layer-shell-unstable-v1.h>
 
 namespace LayerShellQt
 {
 QWaylandLayerShellIntegration::QWaylandLayerShellIntegration()
-    : QWaylandShellIntegrationTemplate<QWaylandLayerShellIntegration>(4)
-    , m_xdgActivation(new QWaylandXdgActivationV1)
 {
 }
 
 QWaylandLayerShellIntegration::~QWaylandLayerShellIntegration()
 {
-    if (object() && zwlr_layer_shell_v1_get_version(object()) >= ZWLR_LAYER_SHELL_V1_DESTROY_SINCE_VERSION) {
-        zwlr_layer_shell_v1_destroy(object());
-    }
+}
+
+bool QWaylandLayerShellIntegration::initialize(QtWaylandClient::QWaylandDisplay *display)
+{
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QWaylandShellIntegration::initialize(display);
+#endif
+    display->addRegistryListener(registryLayer, this);
+    return m_layerShell != nullptr;
 }
 
 QtWaylandClient::QWaylandShellSurface *QWaylandLayerShellIntegration::createShellSurface(QtWaylandClient::QWaylandWindow *window)
 {
-    return new QWaylandLayerSurface(this, window);
+    return m_layerShell->createLayerSurface(window);
 }
 
+void QWaylandLayerShellIntegration::registryLayer(void *data, struct wl_registry *registry, uint32_t id, const QString &interface, uint32_t version)
+{
+    QWaylandLayerShellIntegration *shell = static_cast<QWaylandLayerShellIntegration *>(data);
+
+    if (interface == zwlr_layer_shell_v1_interface.name)
+        shell->m_layerShell.reset(new QWaylandLayerShell(registry, id, std::min(version, 4u)));
+}
 
 }
+
+//#include "qwaylandlayershellintegration.moc"

src/qwaylandlayershellintegration_p.h

@@ -8,26 +8,28 @@
 #ifndef _LAYERSHELLINTEGRATION_P_H
 #define _LAYERSHELLINTEGRATION_P_H
 
+#include <wayland-client.h>
+
 #include "layershellqt_export.h"
-
 #include <QtWaylandClient/private/qwaylandshellintegration_p.h>
-#include <qwayland-wlr-layer-shell-unstable-v1.h>
-
-class QWaylandXdgActivationV1;
 
 namespace LayerShellQt
 {
+class QWaylandLayerShell;
 
-class LAYERSHELLQT_EXPORT QWaylandLayerShellIntegration : public QtWaylandClient::QWaylandShellIntegrationTemplate<QWaylandLayerShellIntegration>, public QtWayland::zwlr_layer_shell_v1
+class LAYERSHELLQT_EXPORT QWaylandLayerShellIntegration : public QtWaylandClient::QWaylandShellIntegration
 {
 public:
     QWaylandLayerShellIntegration();
     ~QWaylandLayerShellIntegration() override;
 
-    QWaylandXdgActivationV1 *activation() const { return m_xdgActivation.data(); }
+    bool initialize(QtWaylandClient::QWaylandDisplay *display) override;
     QtWaylandClient::QWaylandShellSurface *createShellSurface(QtWaylandClient::QWaylandWindow *window) override;
+
 private:
-    QScopedPointer<QWaylandXdgActivationV1> m_xdgActivation;
+    static void registryLayer(void *data, struct wl_registry *registry, uint32_t id, const QString &interface, uint32_t version);
+
+    QScopedPointer<QWaylandLayerShell> m_layerShell;
 };
 
 }

src/qwaylandlayersurface.cpp

@@ -5,28 +5,28 @@
  *   SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-#include "interfaces/window.h"
+#include "interfaces/shell.h"
 #include "layershellqt_logging.h"
+#include "qwaylandlayershell_p.h"
 #include "qwaylandlayersurface_p.h"
-#include "qwaylandxdgactivationv1_p.h"
 
 #include <QtWaylandClient/private/qwaylandscreen_p.h>
 #include <QtWaylandClient/private/qwaylandsurface_p.h>
 #include <QtWaylandClient/private/qwaylandwindow_p.h>
 
-#include <QGuiApplication>
-
 namespace LayerShellQt
 {
-QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell, QtWaylandClient::QWaylandWindow *window)
+QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShell *shell, QtWaylandClient::QWaylandWindow *window)
     : QtWaylandClient::QWaylandShellSurface(window)
     , QtWayland::zwlr_layer_surface_v1()
-    , m_shell(shell)
-    , m_interface(Window::get(window->window()))
 {
+    LayerShellQt::Window *interface = Window::get(window->window());
+    Q_ASSERT(interface);
+
     wl_output *output = nullptr;
-    if (m_interface->screenConfiguration() == Window::ScreenFromQWindow) {
-        auto waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen *>(window->window()->screen()->handle());
+    QScreen *screen = interface->desiredOutput();
+    if (screen) {
+        auto waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen *>(screen->handle());
         // Qt will always assign a screen to a window, but if the compositor has no screens available a dummy QScreen object is created
         // this will not cast to a QWaylandScreen
         if (!waylandScreen) {
@@ -35,32 +35,32 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
             output = waylandScreen->output();
         }
     }
-    init(shell->get_layer_surface(window->waylandSurface()->object(), output, m_interface->layer(), m_interface->scope()));
-    connect(m_interface, &Window::layerChanged, this, [this]() {
-        setLayer(m_interface->layer());
+    init(shell->get_layer_surface(window->waylandSurface()->object(), output, interface->layer(), interface->scope()));
+    connect(interface, &Window::layerChanged, this, [this, interface]() {
+        setLayer(interface->layer());
     });
 
-    set_anchor(m_interface->anchors());
-    connect(m_interface, &Window::anchorsChanged, this, [this]() {
-        set_anchor(m_interface->anchors());
+    set_anchor(interface->anchors());
+    connect(interface, &Window::anchorsChanged, this, [this, interface]() {
+        set_anchor(interface->anchors());
     });
-    setExclusiveZone(m_interface->exclusionZone());
-    connect(m_interface, &Window::exclusionZoneChanged, this, [this]() {
-        setExclusiveZone(m_interface->exclusionZone());
+    setExclusiveZone(interface->exclusionZone());
+    connect(interface, &Window::exclusionZoneChanged, this, [this, interface]() {
+        setExclusiveZone(interface->exclusionZone());
     });
 
-    setMargins(m_interface->margins());
-    connect(m_interface, &Window::marginsChanged, this, [this]() {
-        setMargins(m_interface->margins());
+    setMargins(interface->margins());
+    connect(interface, &Window::marginsChanged, this, [this, interface]() {
+        setMargins(interface->margins());
     });
 
-    setKeyboardInteractivity(m_interface->keyboardInteractivity());
-    connect(m_interface, &Window::keyboardInteractivityChanged, this, [this]() {
-        setKeyboardInteractivity(m_interface->keyboardInteractivity());
+    setKeyboardInteractivity(interface->keyboardInteractivity());
+    connect(interface, &Window::keyboardInteractivityChanged, this, [this, interface]() {
+        setKeyboardInteractivity(interface->keyboardInteractivity());
     });
 
     QSize size = window->surfaceSize();
-    const Window::Anchors anchors = m_interface->anchors();
+    const Window::Anchors anchors = interface->anchors();
     if ((anchors & Window::AnchorLeft) && (anchors & Window::AnchorRight)) {
         size.setWidth(0);
     }
@@ -79,9 +79,7 @@ QWaylandLayerSurface::~QWaylandLayerSurface()
 
 void QWaylandLayerSurface::zwlr_layer_surface_v1_closed()
 {
-    if (m_interface->closeOnDismissed()) {
-        window()->window()->close();
-    }
+    window()->window()->close();
 }
 
 void QWaylandLayerSurface::zwlr_layer_surface_v1_configure(uint32_t serial, uint32_t width, uint32_t height)
@@ -100,17 +98,6 @@ void QWaylandLayerSurface::zwlr_layer_surface_v1_configure(uint32_t serial, uint
     }
 }
 
-void QWaylandLayerSurface::attachPopup(QtWaylandClient::QWaylandShellSurface *popup)
-{
-    std::any anyRole = popup->surfaceRole();
-
-    if (auto role = std::any_cast<::xdg_popup *>(&anyRole)) {
-        get_popup(*role);
-    } else {
-        qCWarning(LAYERSHELLQT) << "Cannot attach popup of unknown type";
-    }
-}
-
 void QWaylandLayerSurface::applyConfigure()
 {
     window()->resizeFromApplyConfigure(m_pendingSize);
@@ -119,7 +106,6 @@ void QWaylandLayerSurface::applyConfigure()
 void QWaylandLayerSurface::setAnchor(uint anchor)
 {
     set_anchor(anchor);
-    setWindowGeometry(window()->windowContentGeometry());
 }
 
 void QWaylandLayerSurface::setExclusiveZone(int32_t zone)
@@ -143,69 +129,4 @@ void QWaylandLayerSurface::setLayer(uint32_t layer)
         set_layer(layer);
 }
 
-void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
-{
-    const bool horizontallyConstrained = m_interface->anchors().testFlags({Window::AnchorLeft, Window::AnchorRight});
-    const bool verticallyConstrained = m_interface->anchors().testFlags({Window::AnchorTop, Window::AnchorBottom});
-
-    QSize size = geometry.size();
-    if (horizontallyConstrained) {
-        size.setWidth(0);
-    }
-    if (verticallyConstrained) {
-        size.setHeight(0);
-    }
-    set_size(size.width(), size.height());
 }
-
-bool QWaylandLayerSurface::requestActivate()
-{
-    QWaylandXdgActivationV1 *activation = m_shell->activation();
-    if (!activation->isActive()) {
-        return false;
-    }
-    if (!m_activationToken.isEmpty()) {
-        activation->activate(m_activationToken, window()->wlSurface());
-        m_activationToken = {};
-        return true;
-    } else {
-        const auto focusWindow = QGuiApplication::focusWindow();
-        const auto wlWindow = focusWindow ? static_cast<QtWaylandClient::QWaylandWindow*>(focusWindow->handle()) : window();
-        if (const auto seat = wlWindow->display()->lastInputDevice()) {
-            const auto tokenProvider = activation->requestXdgActivationToken(
-                wlWindow->display(), wlWindow->wlSurface(), 0, QString());
-            connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this,
-                    [this](const QString &token) {
-                        m_shell->activation()->activate(token, window()->wlSurface());
-                    });
-            connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, tokenProvider, &QObject::deleteLater);
-            return true;
-        }
-    }
-    return false;
-}
-
-void QWaylandLayerSurface::setXdgActivationToken(const QString &token)
-{
-    m_activationToken = token;
-}
-
-void QWaylandLayerSurface::requestXdgActivationToken(quint32 serial)
-{
-    QWaylandXdgActivationV1 *activation = m_shell->activation();
-    if (!activation->isActive()) {
-        return;
-    }
-    auto tokenProvider = activation->requestXdgActivationToken(
-        window()->display(), window()->wlSurface(), serial, QString());
-
-    connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this,
-            [this](const QString &token) {
-                Q_EMIT window()->xdgActivationTokenCreated(token);
-            });
-    connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, tokenProvider, &QObject::deleteLater);
-
-}
-
-}
-

src/qwaylandlayersurface_p.h

@@ -10,29 +10,25 @@
 
 #include <wayland-client.h>
 
-#include "qwaylandlayershellintegration_p.h"
-
 #include "layershellqt_export.h"
 #include <QtWaylandClient/private/qwaylandshellsurface_p.h>
 #include <qwayland-wlr-layer-shell-unstable-v1.h>
 
 namespace LayerShellQt
 {
-
-class Window;
+class QWaylandLayerShell;
 
 class LAYERSHELLQT_EXPORT QWaylandLayerSurface : public QtWaylandClient::QWaylandShellSurface, public QtWayland::zwlr_layer_surface_v1
 {
     Q_OBJECT
 public:
-    QWaylandLayerSurface(QWaylandLayerShellIntegration *shell, QtWaylandClient::QWaylandWindow *window);
+    QWaylandLayerSurface(QWaylandLayerShell *shell, QtWaylandClient::QWaylandWindow *window);
     ~QWaylandLayerSurface() override;
 
     bool isExposed() const override
     {
         return m_configured;
     }
-    void attachPopup(QtWaylandClient::QWaylandShellSurface *popup) override;
 
     void setAnchor(uint32_t anchor);
     void setExclusiveZone(int32_t zone);
@@ -41,20 +37,12 @@ public:
     void setLayer(uint32_t layer);
 
     void applyConfigure() override;
-    void setWindowGeometry(const QRect &geometry) override;
-
-    bool requestActivate() override;
-    void setXdgActivationToken(const QString &token) override;
-    void requestXdgActivationToken(quint32 serial) override;
 
 private:
     void zwlr_layer_surface_v1_configure(uint32_t serial, uint32_t width, uint32_t height) override;
     void zwlr_layer_surface_v1_closed() override;
 
-    QWaylandLayerShellIntegration *m_shell;
-    LayerShellQt::Window *m_interface;
     QSize m_pendingSize;
-    QString m_activationToken;
     bool m_configured = false;
 };
 

src/qwaylandxdgactivationv1.cpp

@@ -1,44 +0,0 @@
-/** Copyright (C) 2020 Aleix Pol Gonzalez <aleixpol@kde.org>
- *   SPDX-License-Identifier: LGPL-3.0-or-later
- */
-
-#include "qwaylandxdgactivationv1_p.h"
-#include <QtWaylandClient/private/qwaylanddisplay_p.h>
-#include <QtWaylandClient/private/qwaylandinputdevice_p.h>
-
-QWaylandXdgActivationV1::QWaylandXdgActivationV1()
-    : QWaylandClientExtensionTemplate<QWaylandXdgActivationV1>(1)
-{
-    initialize();
-}
-
-QWaylandXdgActivationV1::~QWaylandXdgActivationV1()
-{
-    if (isActive()) {
-        destroy();
-    }
-}
-
-QWaylandXdgActivationTokenV1 *QWaylandXdgActivationV1::requestXdgActivationToken(QtWaylandClient::QWaylandDisplay *display,
-                                                                                 struct ::wl_surface *surface,
-                                                                                 std::optional<uint32_t> serial,
-                                                                                 const QString &app_id)
-{
-    auto wl = get_activation_token();
-    auto provider = new QWaylandXdgActivationTokenV1;
-    provider->init(wl);
-
-    if (surface) {
-        provider->set_surface(surface);
-    }
-    if (!app_id.isEmpty()) {
-        provider->set_app_id(app_id);
-    }
-    if (serial && display->lastInputDevice()) {
-        provider->set_serial(*serial, display->lastInputDevice()->wl_seat());
-    }
-    provider->commit();
-    return provider;
-}
-
-#include "moc_qwaylandxdgactivationv1_p.cpp"

src/qwaylandxdgactivationv1_p.h

@@ -1,48 +0,0 @@
-/** Copyright (C) 2020 Aleix Pol Gonzalez <aleixpol@kde.org>
- *  SPDX-License-Identifier: LGPL-3.0-or-later
- */
-
-#ifndef QWAYLANDXDGACTIVATIONV1_P_H
-#define QWAYLANDXDGACTIVATIONV1_P_H
-
-#include "qwayland-xdg-activation-v1.h"
-#include <QObject>
-
-#include <QtWaylandClient/QWaylandClientExtension>
-
-namespace QtWaylandClient
-{
-class QWaylandDisplay;
-class QWaylandSurface;
-}
-
-class QWaylandXdgActivationTokenV1 : public QObject, public QtWayland::xdg_activation_token_v1
-{
-    Q_OBJECT
-public:
-    ~QWaylandXdgActivationTokenV1() override
-    {
-        destroy();
-    }
-
-protected:
-    void xdg_activation_token_v1_done(const QString &token) override
-    {
-        Q_EMIT done(token);
-    }
-
-Q_SIGNALS:
-    void done(const QString &token);
-};
-
-class QWaylandXdgActivationV1 : public QWaylandClientExtensionTemplate<QWaylandXdgActivationV1>, public QtWayland::xdg_activation_v1
-{
-public:
-    QWaylandXdgActivationV1();
-    ~QWaylandXdgActivationV1() override;
-
-    QWaylandXdgActivationTokenV1 *
-    requestXdgActivationToken(QtWaylandClient::QWaylandDisplay *display, struct ::wl_surface *surface, std::optional<uint32_t> serial, const QString &app_id);
-};
-
-#endif // QWAYLANDXDGACTIVATIONV1_P_H

tests/main.cpp

@@ -14,6 +14,7 @@
 
 #include <QMetaEnum>
 
+#include <interfaces/shell.h>
 #include <interfaces/window.h>
 
 using namespace LayerShellQt;
@@ -32,7 +33,7 @@ template<typename T>
 T stringToEnum(QMetaEnum metaEnum, const QString &str)
 {
     T ret = {};
-    const auto splitted = str.split(QLatin1Char('|'), Qt::SkipEmptyParts);
+    const auto splitted = str.split(QLatin1Char('|'));
     for (const auto &value : splitted) {
         ret |= T(metaEnum.keyToValue(qPrintable(value)));
     }
@@ -41,7 +42,7 @@ T stringToEnum(QMetaEnum metaEnum, const QString &str)
 
 class BasicWindow : public QRasterWindow
 {
-    void paintEvent(QPaintEvent *) override
+    void paintEvent(QPaintEvent *)
     {
         QPainter p(this);
         p.fillRect(QRect(0, 0, width(), height()), Qt::red);
@@ -50,6 +51,8 @@ class BasicWindow : public QRasterWindow
 
 int main(int argc, char **argv)
 {
+    Shell::useLayerShell();
+
     QGuiApplication app(argc, argv);
 
     const auto layerMetaEnum = QMetaEnum::fromType<Window::Layer>();
@@ -76,8 +79,6 @@ int main(int argc, char **argv)
     BasicWindow window;
 
     LayerShellQt::Window *layerShell = LayerShellQt::Window::get(&window);
-    layerShell->setLayer(Window::LayerBottom);
-
     if (parser.isSet(marginsOption)) {
         int margins = parser.value(marginsOption).toInt();
         layerShell->setMargins({margins, margins, margins, margins});
@@ -101,10 +102,6 @@ int main(int argc, char **argv)
 
     window.show();
 
-    BasicWindow window2;
-    window2.resize(400, 400);
-    window2.show();
-
     // just so you don't block yourself out whilst testing
     QTimer::singleShot(5000, &app, &QGuiApplication::quit);
     return app.exec();

tests/quicktest.qml

@@ -1,110 +0,0 @@
-/*
- *   SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleix.pol_gonzalez@mercedes-benz.com>
- *
- *   SPDX-License-Identifier: LGPL-3.0-or-later
- */
-
-import QtQuick 2.15
-import org.kde.layershell 1.0 as LayerShell
-
-Item
-{
-    Text {
-        text: "A normal Window"
-        anchors.centerIn: parent
-    }
-
-    Window {
-        LayerShell.Window.anchors: LayerShell.Window.AnchorLeft
-        LayerShell.Window.layer: LayerShell.Window.LayerBackground
-        LayerShell.Window.exclusionZone: -1
-
-        width: 200
-        height: 150
-        Rectangle {
-            anchors.fill: parent
-            color: "green"
-
-            Text {
-                anchors.centerIn: parent
-                text: "left bg"
-            }
-        }
-        visible: true
-    }
-
-
-    Window {
-        LayerShell.Window.scope: "dock"
-        LayerShell.Window.anchors: LayerShell.Window.AnchorLeft
-        LayerShell.Window.layer: LayerShell.Window.LayerTop
-        LayerShell.Window.exclusionZone: width
-
-        width: 100
-        height: 100
-        Rectangle {
-            anchors.fill: parent
-            color: "red"
-
-            Text {
-                anchors.centerIn: parent
-                text: "left"
-            }
-        }
-        visible: true
-    }
-
-    Window {
-        LayerShell.Window.scope: "normal"
-        LayerShell.Window.anchors: LayerShell.Window.AnchorRight
-
-        width: 100
-        height: 100
-        Rectangle {
-            anchors.fill: parent
-            color: "red"
-
-            Text {
-                anchors.centerIn: parent
-                text: "right"
-            }
-        }
-        visible: true
-    }
-
-    Window {
-        LayerShell.Window.scope: "normal"
-        LayerShell.Window.anchors: LayerShell.Window.AnchorTop
-
-        width: 100
-        height: 100
-        Rectangle {
-            anchors.fill: parent
-            color: "red"
-
-            Text {
-                anchors.centerIn: parent
-                text: "top"
-            }
-        }
-        visible: true
-    }
-
-    Window {
-        LayerShell.Window.scope: "normal"
-        LayerShell.Window.anchors: LayerShell.Window.AnchorBottom
-
-        width: 100
-        height: 100
-        Rectangle {
-            anchors.fill: parent
-            color: "red"
-
-            Text {
-                anchors.centerIn: parent
-                text: "bottom"
-            }
-        }
-        visible: true
-    }
-}