per window API

src/CMakeLists.txt

@@ -15,7 +15,7 @@ ecm_qt_declare_logging_category(LAYER_SHELL_SOURCES
         layershellqt
 )
 
-add_library(LayerShellQtInterface SHARED qwaylandlayersurface.cpp interfaces/window.cpp interfaces/shell.cpp qwaylandlayershellintegration.cpp qwaylandlayershell.cpp ${LAYER_SHELL_SOURCES})
+add_library(LayerShellQtInterface SHARED qwaylandlayersurface.cpp interfaces/window.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}/>"
@@ -26,12 +26,8 @@ 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)
-
 ecm_generate_headers(LayerShellQt_HEADERS
     HEADER_NAMES
-        Shell
         Window
     RELATIVE interfaces/
     REQUIRED_HEADERS LayerShellQt_HEADERS
@@ -44,9 +40,6 @@ generate_export_header(LayerShellQtInterface
     EXPORT_FILE_NAME LayerShellQt/layershellqt_export.h
 )
 
-install(TARGETS layer-shell
-        LIBRARY DESTINATION ${QT_PLUGIN_INSTALL_DIR}/wayland-shell-integration)
-
 install(TARGETS LayerShellQtInterface EXPORT LayerShellQtTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES

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,42 +5,45 @@
  */
 
 #include "window.h"
+#include "../qwaylandlayershell_p.h"
 #include "../qwaylandlayersurface_p.h"
 #include <layershellqt_logging.h>
+#include <private/qwaylandwindowshellintegration_p.h>
 #include <private/qwaylandshellsurface_p.h>
 #include <private/qwaylandwindow_p.h>
 
 using namespace LayerShellQt;
 
-class LayerShellQt::WindowPrivate
+
+class LayerShellQt::WindowPrivate : public QtWaylandClient::QWaylandWindowShellIntegration
 {
 public:
-    WindowPrivate(QWindow *window)
+    WindowPrivate(Window *_q, QWindow *window)
-        : parentWindow(window)
+        : QtWaylandClient::QWaylandWindowShellIntegration(window)
+        , q(_q)
     {
     }
 
-    QWindow *parentWindow;
+    Window *q;
     QString scope = QStringLiteral("window");
     Window::Anchors anchors = {Window::AnchorTop | Window::AnchorBottom | Window::AnchorLeft | Window::AnchorRight};
     int32_t exclusionZone = 0;
     Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityExclusive;
     Window::Layer layer = Window::LayerTop;
     QMargins margins;
-    QWaylandLayerSurface *getSurface() const;
+    QPointer<QWaylandLayerSurface> surface;
-};
 
-static QMap<QWindow *, Window *> s_map;
+    QtWaylandClient::QWaylandShellSurface *createShellSurface(QtWaylandClient::QWaylandWindow *window) override;
+};
 
 Window::~Window()
 {
-    s_map.remove(d->parentWindow);
 }
 
 void Window::setAnchors(Anchors anchors)
 {
     d->anchors = anchors;
-    if (auto surface = d->getSurface()) {
+    if (auto surface = d->surface) {
         surface->setAnchor(anchors);
     }
 }
@@ -53,7 +56,7 @@ Window::Anchors Window::anchors() const
 void Window::setExclusiveZone(int32_t zone)
 {
     d->exclusionZone = zone;
-    if (auto surface = d->getSurface()) {
+    if (auto surface = d->surface) {
         surface->setExclusiveZone(zone);
     }
 }
@@ -66,7 +69,7 @@ int32_t Window::exclusionZone() const
 void Window::setMargins(const QMargins &margins)
 {
     d->margins = margins;
-    if (auto surface = d->getSurface()) {
+    if (auto surface = d->surface) {
         surface->setMargins(margins);
     }
 }
@@ -79,7 +82,7 @@ QMargins Window::margins() const
 void Window::setKeyboardInteractivity(KeyboardInteractivity interactivity)
 {
     d->keyboardInteractivity = interactivity;
-    if (auto surface = d->getSurface()) {
+    if (auto surface = d->surface) {
         surface->setKeyboardInteractivity(interactivity);
     }
 }
@@ -92,7 +95,7 @@ Window::KeyboardInteractivity Window::keyboardInteractivity() const
 void Window::setLayer(Layer layer)
 {
     d->layer = layer;
-    if (auto surface = d->getSurface()) {
+    if (auto surface = d->surface) {
         surface->setLayer(layer);
     }
 }
@@ -115,34 +118,16 @@ Window::Layer Window::layer() const
 
 Window::Window(QWindow *window)
     : QObject(window)
-    , d(new WindowPrivate(window))
+    , d(new WindowPrivate(this, window))
 {
-    s_map.insert(d->parentWindow, this);
 }
 
-Window *Window::get(QWindow *window)
+static LayerShellQt::QWaylandLayerShell *s_shell = nullptr;
-{
-    auto layerShellWindow = s_map.value(window);
-    if (layerShellWindow) {
-        return layerShellWindow;
-    }
-    return new Window(window);
-}
 
-QWaylandLayerSurface *WindowPrivate::getSurface() const
+QtWaylandClient::QWaylandShellSurface *WindowPrivate::createShellSurface(QtWaylandClient::QWaylandWindow *window)
 {
-    if (!parentWindow) {
+    if (!s_shell) {
-        return nullptr;
+        s_shell = new LayerShellQt::QWaylandLayerShell;
     }
-    auto ww = dynamic_cast<QtWaylandClient::QWaylandWindow *>(parentWindow->handle());
+    return new QWaylandLayerSurface(s_shell, window, q);
-    if (!ww) {
-        qCDebug(LAYERSHELLQT) << "window not a wayland window" << parentWindow;
-        return nullptr;
-    }
-    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

@@ -78,14 +78,8 @@ public:
     void setScope(const QString &scope);
     QString scope() const;
 
-    /**
-     * Gets the LayerShell Window for a given Qt Window
-     * Ownership is not transferred
-     */
-    static Window *get(QWindow *window);
-
-private:
     Window(QWindow *window);
+private:
     QScopedPointer<WindowPrivate> d;
 };
 

src/qwaylandlayershell.cpp

@@ -10,9 +10,11 @@
 
 namespace LayerShellQt
 {
-QWaylandLayerShell::QWaylandLayerShell(::wl_registry *registry, uint32_t id, uint32_t version)
+QWaylandLayerShell::QWaylandLayerShell()
-    : QtWayland::zwlr_layer_shell_v1(registry, id, version)
+    : QWaylandClientExtensionTemplate<QWaylandLayerShell>(2)
+    , QtWayland::zwlr_layer_shell_v1()
 {
+    initialize();
 }
 
 QWaylandLayerShell::~QWaylandLayerShell()
@@ -21,9 +23,4 @@ QWaylandLayerShell::~QWaylandLayerShell()
         zwlr_layer_shell_v1_destroy(object());
 }
 
-QWaylandLayerSurface *QWaylandLayerShell::createLayerSurface(QtWaylandClient::QWaylandWindow *window)
-{
-    return new QWaylandLayerSurface(this, window);
-}
-
 }

src/qwaylandlayershell_p.h

@@ -10,6 +10,7 @@
 
 #include <wayland-client.h>
 
+#include <QtWaylandClient/QWaylandClientExtensionTemplate>
 #include <QtWaylandClient/private/qwaylandshellintegration_p.h>
 #include <qwayland-wlr-layer-shell-unstable-v1.h>
 
@@ -17,14 +18,12 @@
 
 namespace LayerShellQt
 {
-class LAYERSHELLQT_EXPORT QWaylandLayerShell : public QtWayland::zwlr_layer_shell_v1
+class QWaylandLayerShell : public QWaylandClientExtensionTemplate<QWaylandLayerShell>, public QtWayland::zwlr_layer_shell_v1
 {
 public:
-    QWaylandLayerShell(::wl_registry *registry, uint32_t id, uint32_t version);
+    QWaylandLayerShell();
     ~QWaylandLayerShell() override;
 
-    QWaylandLayerSurface *createLayerSurface(QtWaylandClient::QWaylandWindow *window);
-    // TODO: Popups
 };
 
 }

src/qwaylandlayershellintegration.cpp

@@ -1,47 +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 "qwaylandlayershell_p.h"
-#include "qwaylandlayershellintegration_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()
-{
-}
-
-QWaylandLayerShellIntegration::~QWaylandLayerShellIntegration()
-{
-}
-
-bool QWaylandLayerShellIntegration::initialize(QtWaylandClient::QWaylandDisplay *display)
-{
-    QWaylandShellIntegration::initialize(display);
-    display->addRegistryListener(registryLayer, this);
-    return m_layerShell != nullptr;
-}
-
-QtWaylandClient::QWaylandShellSurface *QWaylandLayerShellIntegration::createShellSurface(QtWaylandClient::QWaylandWindow *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

@@ -1,37 +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
- */
-
-#ifndef _LAYERSHELLINTEGRATION_P_H
-#define _LAYERSHELLINTEGRATION_P_H
-
-#include <wayland-client.h>
-
-#include "layershellqt_export.h"
-#include <QtWaylandClient/private/qwaylandshellintegration_p.h>
-
-namespace LayerShellQt
-{
-class QWaylandLayerShell;
-
-class LAYERSHELLQT_EXPORT QWaylandLayerShellIntegration : public QtWaylandClient::QWaylandShellIntegration
-{
-public:
-    QWaylandLayerShellIntegration();
-    ~QWaylandLayerShellIntegration() override;
-
-    bool initialize(QtWaylandClient::QWaylandDisplay *display) override;
-    QtWaylandClient::QWaylandShellSurface *createShellSurface(QtWaylandClient::QWaylandWindow *window) override;
-
-private:
-    static void registryLayer(void *data, struct wl_registry *registry, uint32_t id, const QString &interface, uint32_t version);
-
-    QScopedPointer<QWaylandLayerShell> m_layerShell;
-};
-
-}
-
-#endif

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,7 +5,7 @@
  *   SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-#include "interfaces/shell.h"
+#include "interfaces/window.h"
 #include "qwaylandlayershell_p.h"
 #include "qwaylandlayersurface_p.h"
 #include "layershellqt_logging.h"
@@ -16,12 +16,10 @@
 
 namespace LayerShellQt
 {
-QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShell *shell, QtWaylandClient::QWaylandWindow *window)
+QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShell *shell, QtWaylandClient::QWaylandWindow *window, LayerShellQt::Window *interface )
     : QtWaylandClient::QWaylandShellSurface(window)
     , QtWayland::zwlr_layer_surface_v1()
 {
-    LayerShellQt::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

src/qwaylandlayersurface_p.h

@@ -17,12 +17,13 @@
 namespace LayerShellQt
 {
 class QWaylandLayerShell;
+class Window;
 
 class LAYERSHELLQT_EXPORT QWaylandLayerSurface : public QtWaylandClient::QWaylandShellSurface, public QtWayland::zwlr_layer_surface_v1
 {
     Q_OBJECT
 public:
-    QWaylandLayerSurface(QWaylandLayerShell *shell, QtWaylandClient::QWaylandWindow *window);
+    QWaylandLayerSurface(QWaylandLayerShell *shell, QtWaylandClient::QWaylandWindow *window, LayerShellQt::Window *interface);
     ~QWaylandLayerSurface() override;
 
     bool isExposed() const override

tests/main.cpp

@@ -14,7 +14,6 @@
 
 #include <QMetaEnum>
 
-#include <interfaces/shell.h>
 #include <interfaces/window.h>
 
 using namespace LayerShellQt;
@@ -51,8 +50,6 @@ class BasicWindow : public QRasterWindow
 
 int main(int argc, char **argv)
 {
-    Shell::useLayerShell();
-
     QGuiApplication app(argc, argv);
 
     const auto layerMetaEnum = QMetaEnum::fromType<Window::Layer>();
@@ -78,7 +75,7 @@ int main(int argc, char **argv)
 
     BasicWindow window;
 
-    LayerShellQt::Window *layerShell = LayerShellQt::Window::get(&window);
+    LayerShellQt::Window *layerShell = new LayerShellQt::Window(&window);
     if (parser.isSet(marginsOption)) {
         int margins = parser.value(marginsOption).toInt();
         layerShell->setMargins({margins, margins, margins, margins});
@@ -102,6 +99,10 @@ 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();