hacks

.gitlab-ci.yml

@@ -2,8 +2,5 @@
 # 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/linux.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.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,26 +4,26 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(layershellqt)
-set(PROJECT_VERSION "5.90.0")
+set(PROJECT_VERSION "6.0.0")
 set(PROJECT_VERSION_MAJOR 6)
 
 set(CMAKE_C_STANDARD 99)
 
-set(QT_MIN_VERSION "6.5.0")
-set(KF6_MIN_VERSION "5.240.0")
+set(QT_MIN_VERSION "6.2.0")
+set(KF5_MIN_VERSION "5.86")
 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(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
+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)
@@ -31,15 +31,12 @@ include(GenerateExportHeader)
 include(KDEClangFormat)
 include(ECMQtDeclareLoggingCategory)
 
-
-find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
-find_package(WaylandScanner REQUIRED)
+find_package(WaylandScanner)
+find_package(QtWaylandScanner)
 find_package(Wayland 1.3 COMPONENTS Client Server)
-find_package(WaylandProtocols REQUIRED)
+find_package(WaylandProtocols)
 find_package(PkgConfig REQUIRED)
 
-pkg_check_modules(XKBCOMMON xkbcommon REQUIRED IMPORTED_TARGET)
-
 set_package_properties(Wayland PROPERTIES
                        TYPE REQUIRED)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90")
@@ -47,19 +44,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}

metainfo.yaml

@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: None
-# SPDX-License-Identifier: CC0-1.0
-
-maintainer:
-- vladz
-description: Layer Shell Qt
-platforms:
-    - name: Linux
-    - name: FreeBSD
-portingAid: false
-deprecated: false
-release: true
-
-group: Plasma
-public_lib: true
-public_source_dirs:
-    - src/interfaces

src/CMakeLists.txt

@@ -3,14 +3,10 @@
 
 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
-)
+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)
 
-ecm_qt_declare_logging_category(LayerShellQtInterface
+ecm_qt_declare_logging_category(LAYER_SHELL_SOURCES
     HEADER
         layershellqt_logging.h
     IDENTIFIER
@@ -19,19 +15,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)
-if (TARGET Qt::XkbCommonSupportPrivate)
-    target_link_libraries(LayerShellQtInterface PRIVATE Qt::XkbCommonSupportPrivate)
-endif()
+add_library(LayerShellQtInterface SHARED qwaylandlayersurface.cpp interfaces/window.cpp qwaylandlayershellintegration.cpp qwaylandlayershell.cpp ${LAYER_SHELL_SOURCES})
+target_link_libraries(LayerShellQtInterface PRIVATE Qt::Gui Qt::WaylandClientPrivate Wayland::Client)
 target_include_directories(LayerShellQtInterface PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/LayerShellQt>"
                                               INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/>"
 )
@@ -41,30 +26,19 @@ set_target_properties(LayerShellQtInterface PROPERTIES VERSION   ${LAYERSHELLQT_
                                                        EXPORT_NAME Interface
 )
 
-add_library(layer-shell SHARED qwaylandlayershellintegrationplugin.cpp)
-target_link_libraries(layer-shell LayerShellQtInterface Qt::WaylandClient Qt::WaylandClientPrivate Wayland::Client PkgConfig::XKBCOMMON)
-if (TARGET Qt::XkbCommonSupportPrivate)
-    target_link_libraries(layer-shell Qt::XkbCommonSupportPrivate)
-endif()
-
 ecm_generate_headers(LayerShellQt_HEADERS
     HEADER_NAMES
-        Shell
         Window
     RELATIVE interfaces/
     REQUIRED_HEADERS LayerShellQt_HEADERS
 )
 
-
 generate_export_header(LayerShellQtInterface
     BASE_NAME LayerShellQtInterface
     EXPORT_MACRO_NAME LAYERSHELLQT_EXPORT
     EXPORT_FILE_NAME LayerShellQt/layershellqt_export.h
 )
 
-install(TARGETS layer-shell
-        LIBRARY DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/wayland-shell-integration)
-
 install(TARGETS LayerShellQtInterface EXPORT LayerShellQtTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES
@@ -72,5 +46,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,9 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleix.pol_gonzalez@mercedes-benz.com>
-# SPDX-License-Identifier: BSD-3-Clause
-
-qt_add_qml_module(LayerShellQtQml
-                  URI "org.kde.layershell"
-                  VERSION 1.0
-                  SOURCES layershellqtplugin.cpp)
-target_link_libraries(LayerShellQtQml PRIVATE Qt::Qml LayerShellQtInterface)
-

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/shell.cpp

@@ -1,20 +0,0 @@
-/*
- *   SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
- *
- *   SPDX-License-Identifier: LGPL-3.0-or-later
- */
-
-#include "shell.h"
-#include <QByteArray>
-#include <layershellqt_logging.h>
-#include <qglobal.h>
-
-using namespace LayerShellQt;
-
-void Shell::useLayerShell()
-{
-    const bool ret = qputenv("QT_WAYLAND_SHELL_INTEGRATION", "layer-shell");
-    if (!ret) {
-        qCDebug(LAYERSHELLQT) << "Unable to set QT_WAYLAND_SHELL_INTEGRATION=layer-shell";
-    }
-}

src/interfaces/shell.h

@@ -1,27 +0,0 @@
-/*
- *   SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
- *
- *   SPDX-License-Identifier: LGPL-3.0-or-later
- */
-
-#ifndef LAYERSHELLQTSHELL_H
-#define LAYERSHELLQTSHELL_H
-
-#include "layershellqt_export.h"
-#include "window.h"
-#include <QString>
-
-namespace LayerShellQt
-{
-/**
- * Sets the right environment so the shells created from now on use wlr-layer-shell.
- */
-class LAYERSHELLQT_EXPORT Shell
-{
-public:
-    static void useLayerShell();
-};
-
-}
-
-#endif

src/interfaces/window.cpp

@@ -5,20 +5,16 @@
  */
 
 #include "window.h"
-#include "../qwaylandlayershellintegration_p.h"
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
 #include "../qwaylandlayersurface_p.h"
-#endif
-
+#include "../qwaylandlayershellintegration_p.h"
 #include <layershellqt_logging.h>
-
-#include <QPointer>
-#include <optional>
-
-#include <QtWaylandClient/private/qwaylandwindow_p.h>
+#include <private/qwaylandshellsurface_p.h>
+#include <private/qwaylandwindow_p.h>
 
 using namespace LayerShellQt;
 
+static const char *s_interfaceKey = "__kde_layer_window";
+
 class LayerShellQt::WindowPrivate
 {
 public:
@@ -31,25 +27,22 @@ public:
     QString scope = QStringLiteral("window");
     Window::Anchors anchors = {Window::AnchorTop | Window::AnchorBottom | Window::AnchorLeft | Window::AnchorRight};
     int32_t exclusionZone = 0;
-    Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityNone;
+    Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityExclusive;
     Window::Layer layer = Window::LayerTop;
     QMargins margins;
-    Window::ScreenConfiguration screenConfiguration = Window::ScreenFromQWindow;
-    bool closeOnDismissed = true;
+    QWaylandLayerSurface *getSurface() const;
 };
 
-static QMap<QWindow *, Window *> s_map;
-
 Window::~Window()
 {
-    s_map.remove(d->parentWindow);
+    d->parentWindow->setProperty(s_interfaceKey, QVariant());
 }
 
 void Window::setAnchors(Anchors anchors)
 {
-    if (d->anchors != anchors) {
-        d->anchors = anchors;
-        Q_EMIT anchorsChanged();
+    d->anchors = anchors;
+    if (auto surface = d->getSurface()) {
+        surface->setAnchor(anchors);
     }
 }
 
@@ -60,9 +53,9 @@ Window::Anchors Window::anchors() const
 
 void Window::setExclusiveZone(int32_t zone)
 {
-    if (d->exclusionZone != zone) {
-        d->exclusionZone = zone;
-        Q_EMIT exclusionZoneChanged();
+    d->exclusionZone = zone;
+    if (auto surface = d->getSurface()) {
+        surface->setExclusiveZone(zone);
     }
 }
 
@@ -73,9 +66,9 @@ int32_t Window::exclusionZone() const
 
 void Window::setMargins(const QMargins &margins)
 {
-    if (d->margins != margins) {
-        d->margins = margins;
-        Q_EMIT marginsChanged();
+    d->margins = margins;
+    if (auto surface = d->getSurface()) {
+        surface->setMargins(margins);
     }
 }
 
@@ -86,9 +79,9 @@ QMargins Window::margins() const
 
 void Window::setKeyboardInteractivity(KeyboardInteractivity interactivity)
 {
-    if (d->keyboardInteractivity != interactivity) {
-        d->keyboardInteractivity = interactivity;
-        Q_EMIT keyboardInteractivityChanged();
+    d->keyboardInteractivity = interactivity;
+    if (auto surface = d->getSurface()) {
+        surface->setKeyboardInteractivity(interactivity);
     }
 }
 
@@ -99,9 +92,9 @@ Window::KeyboardInteractivity Window::keyboardInteractivity() const
 
 void Window::setLayer(Layer layer)
 {
-    if (d->layer != layer) {
-        d->layer = layer;
-        Q_EMIT layerChanged();
+    d->layer = layer;
+    if (auto surface = d->getSurface()) {
+        surface->setLayer(layer);
     }
 }
 
@@ -121,83 +114,44 @@ Window::Layer Window::layer() const
     return d->layer;
 }
 
-Window::ScreenConfiguration Window::screenConfiguration() const
-{
-    return d->screenConfiguration;
-}
-
-void Window::setScreenConfiguration(Window::ScreenConfiguration screenConfiguration)
-{
-    d->screenConfiguration = screenConfiguration;
-}
-
-bool Window::closeOnDismissed() const
-{
-    return d->closeOnDismissed;
-}
-
-void Window::setCloseOnDismissed(bool close)
-{
-    d->closeOnDismissed = close;
-}
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-void Window::attachPopup(QWindow *window, xdg_popup *popup)
-{
-    auto waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
-    if (!waylandWindow) {
-        return;
-    }
-
-    auto shellSurface = dynamic_cast<QWaylandLayerSurface *>(waylandWindow->shellSurface());
-    if (shellSurface) {
-        shellSurface->get_popup(popup);
-    }
-}
-#endif
+static QWaylandLayerShellIntegration *s_integration = nullptr;
 
 Window::Window(QWindow *window)
     : QObject(window)
     , d(new WindowPrivate(window))
 {
-    s_map.insert(d->parentWindow, this);
+    Q_ASSERT(!Window::get(window));
+    window->winId(); // create platform window
 
-    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;
+    QtWaylandClient::QWaylandWindow *waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
+    if (waylandWindow) {
+        if (!s_integration) {
+            s_integration = new QWaylandLayerShellIntegration();
         }
+        waylandWindow->setShellIntegration(s_integration);
+        window->setProperty(s_interfaceKey, QVariant::fromValue<QObject *>(this));
     }
-
-    waylandWindow->setShellIntegration(shellIntegration);
 }
 
 Window *Window::get(QWindow *window)
 {
-    if (!window) {
+    return qobject_cast<Window *>(qvariant_cast<QObject *>(window->property(s_interfaceKey)));
+}
+
+QWaylandLayerSurface *WindowPrivate::getSurface() const
+{
+    if (!parentWindow) {
         return nullptr;
     }
-
-    auto layerShellWindow = s_map.value(window);
-    if (layerShellWindow) {
-        return layerShellWindow;
+    auto ww = dynamic_cast<QtWaylandClient::QWaylandWindow *>(parentWindow->handle());
+    if (!ww) {
+        qCDebug(LAYERSHELLQT) << "window not a wayland window" << parentWindow;
+        return nullptr;
     }
-    return new Window(window);
-}
-
-Window *Window::qmlAttachedProperties(QObject *object)
-{
-    return get(qobject_cast<QWindow *>(object));
+    QWaylandLayerSurface *s = qobject_cast<QWaylandLayerSurface *>(ww->shellSurface());
+    if (!s) {
+        qCDebug(LAYERSHELLQT) << "window not using wlr-layer-shell" << parentWindow << ww->shellSurface();
+        return nullptr;
+    }
+    return s;
 }

src/interfaces/window.h

@@ -9,15 +9,10 @@
 #define LAYERSHELLQTWINDOW_H
 
 #include <QObject>
-#include <QScreen>
 #include <QWindow>
 
 #include "layershellqt_export.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-struct xdg_popup;
-#endif
-
 namespace LayerShellQt
 {
 class WindowPrivate;
@@ -25,22 +20,15 @@ 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:
+    explicit Window(QWindow *window);
     ~Window() override;
 
     enum Anchor {
-        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
+        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)
@@ -66,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;
 
@@ -92,9 +69,6 @@ public:
     void setLayer(Layer layer);
     Layer layer() const;
 
-    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
@@ -105,36 +79,13 @@ 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);
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-    static void attachPopup(QWindow *window, xdg_popup *popup);
-#endif
-
-    static Window *qmlAttachedProperties(QObject *object);
-
-Q_SIGNALS:
-    void anchorsChanged();
-    void exclusionZoneChanged();
-    void marginsChanged();
-    void keyboardInteractivityChanged();
-    void layerChanged();
-
 private:
-    Window(QWindow *window);
     QScopedPointer<WindowPrivate> d;
 };
 

src/layer-shell.json

@@ -1,3 +0,0 @@
-{
-    "Keys": [ "layer-shell" ]
-}

src/layer-shell.json.license

@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleixpol@kde.org>
-SPDX-License-Identifier: CC0-1.0

src/qwaylandlayershell.cpp

@@ -0,0 +1,26 @@
+/*
+ *   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()
+    : QWaylandClientExtensionTemplate<QWaylandLayerShell>(2)
+    , QtWayland::zwlr_layer_shell_v1()
+{
+    initialize();
+}
+
+QWaylandLayerShell::~QWaylandLayerShell()
+{
+    if (zwlr_layer_shell_v1_get_version(object()) >= ZWLR_LAYER_SHELL_V1_DESTROY_SINCE_VERSION)
+        zwlr_layer_shell_v1_destroy(object());
+}
+
+}

src/qwaylandlayershell_p.h

@@ -0,0 +1,30 @@
+/*
+ *   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/QWaylandClientExtensionTemplate>
+#include <QtWaylandClient/private/qwaylandshellintegration_p.h>
+#include <qwayland-wlr-layer-shell-unstable-v1.h>
+
+#include "qwaylandlayersurface_p.h"
+
+namespace LayerShellQt
+{
+class QWaylandLayerShell : public QWaylandClientExtensionTemplate<QWaylandLayerShell>, public QtWayland::zwlr_layer_shell_v1
+{
+public:
+    QWaylandLayerShell();
+    ~QWaylandLayerShell() override;
+};
+
+}
+
+#endif

src/qwaylandlayershellintegration.cpp

@@ -5,32 +5,27 @@
  *   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)
+    : m_layerShell(new QWaylandLayerShell())
 {
 }
 
 QWaylandLayerShellIntegration::~QWaylandLayerShellIntegration()
 {
-    if (object() && zwlr_layer_shell_v1_get_version(object()) >= ZWLR_LAYER_SHELL_V1_DESTROY_SINCE_VERSION) {
-        zwlr_layer_shell_v1_destroy(object());
-    }
 }
 
 QtWaylandClient::QWaylandShellSurface *QWaylandLayerShellIntegration::createShellSurface(QtWaylandClient::QWaylandWindow *window)
 {
-    return new QWaylandLayerSurface(this, window);
+    return new QWaylandLayerSurface(m_layerShell.data(), window);
 }
 
-
 }

src/qwaylandlayershellintegration_p.h

@@ -9,25 +9,22 @@
 #define _LAYERSHELLINTEGRATION_P_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(); }
     QtWaylandClient::QWaylandShellSurface *createShellSurface(QtWaylandClient::QWaylandWindow *window) override;
+
 private:
-    QScopedPointer<QWaylandXdgActivationV1> m_xdgActivation;
+    QScopedPointer<QWaylandLayerShell> m_layerShell;
 };
 
 }

src/qwaylandlayershellintegrationplugin.cpp

@@ -1,33 +0,0 @@
-/*
- *   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 "qwaylandlayershellintegration_p.h"
-#include <QtWaylandClient/private/qwaylandshellintegrationplugin_p.h>
-
-using namespace LayerShellQt;
-
-class QWaylandLayerShellIntegrationPlugin : public QtWaylandClient::QWaylandShellIntegrationPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QWaylandShellIntegrationFactoryInterface_iid FILE "layer-shell.json")
-
-public:
-    QWaylandLayerShellIntegrationPlugin()
-    {
-    }
-
-    QtWaylandClient::QWaylandShellIntegration *create(const QString &key, const QStringList &paramList) override
-    {
-        Q_UNUSED(key);
-        Q_UNUSED(paramList);
-        return new QWaylandLayerShellIntegration();
-    }
-};
-
-// Q_IMPORT_PLUGIN(QWaylandLayerShellIntegrationPlugin);
-
-#include "qwaylandlayershellintegrationplugin.moc"

src/qwaylandlayersurface.cpp

@@ -5,62 +5,41 @@
  *   SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+#include "qwaylandlayershell_p.h"
+#include "qwaylandlayersurface_p.h"
 #include "interfaces/window.h"
 #include "layershellqt_logging.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()))
 {
-    wl_output *output = nullptr;
-    if (m_interface->screenConfiguration() == Window::ScreenFromQWindow) {
-        auto waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen *>(window->window()->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) {
-            qCWarning(LAYERSHELLQT) << "Creating a layer shell for placeholder screen. This will be positioned incorrectly";
-        } else {
-            output = waylandScreen->output();
-        }
+    Window *interface = Window::get(window->window());
+    Q_ASSERT(interface);
+
+    // 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
+    QtWaylandClient::QWaylandScreen *screen = window->waylandScreen();
+    if (screen->isPlaceholder()) {
+        qCWarning(LAYERSHELLQT) << "Creating a layer shell for placeholder screen. This will be positioned incorrectly";
     }
-    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());
-    });
 
-    set_anchor(m_interface->anchors());
-    connect(m_interface, &Window::anchorsChanged, this, [this]() {
-        set_anchor(m_interface->anchors());
-    });
-    setExclusiveZone(m_interface->exclusionZone());
-    connect(m_interface, &Window::exclusionZoneChanged, this, [this]() {
-        setExclusiveZone(m_interface->exclusionZone());
-    });
+    init(shell->get_layer_surface(window->waylandSurface()->object(), screen->isPlaceholder() ? nullptr : screen->output(), interface->layer(), interface->scope()));
 
-    setMargins(m_interface->margins());
-    connect(m_interface, &Window::marginsChanged, this, [this]() {
-        setMargins(m_interface->margins());
-    });
+    Window::Anchors anchors = interface->anchors();
 
-    setKeyboardInteractivity(m_interface->keyboardInteractivity());
-    connect(m_interface, &Window::keyboardInteractivityChanged, this, [this]() {
-        setKeyboardInteractivity(m_interface->keyboardInteractivity());
-    });
+    set_anchor(interface->anchors());
+    setMargins(interface->margins());
+    setKeyboardInteractivity(interface->keyboardInteractivity());
+    setExclusiveZone(interface->exclusionZone());
 
     QSize size = window->surfaceSize();
-    const Window::Anchors anchors = m_interface->anchors();
     if ((anchors & Window::AnchorLeft) && (anchors & Window::AnchorRight)) {
         size.setWidth(0);
     }
@@ -79,9 +58,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,19 +77,6 @@ void QWaylandLayerSurface::zwlr_layer_surface_v1_configure(uint32_t serial, uint
     }
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-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";
-    }
-}
-#endif
-
 void QWaylandLayerSurface::applyConfigure()
 {
     window()->resizeFromApplyConfigure(m_pendingSize);
@@ -144,69 +108,4 @@ void QWaylandLayerSurface::setLayer(uint32_t layer)
         set_layer(layer);
 }
 
-void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
-{
-    const bool horizontallyConstrained = m_interface->anchors() & (Window::AnchorLeft & Window::AnchorRight);
-    const bool verticallyConstrained = m_interface->anchors() & (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,31 +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;
     }
-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-    void attachPopup(QtWaylandClient::QWaylandShellSurface *popup) override;
-#endif
 
     void setAnchor(uint32_t anchor);
     void setExclusiveZone(int32_t zone);
@@ -43,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

@@ -32,7 +32,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 +41,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);
@@ -75,9 +75,7 @@ int main(int argc, char **argv)
 
     BasicWindow window;
 
-    LayerShellQt::Window *layerShell = LayerShellQt::Window::get(&window);
-    layerShell->setLayer(Window::LayerBottom);
-
+    LayerShellQt::Window *layerShell = new LayerShellQt::Window(&window);
     if (parser.isSet(marginsOption)) {
         int margins = parser.value(marginsOption).toInt();
         layerShell->setMargins({margins, margins, margins, margins});

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
-    }
-}