From 2502a4a6dd703529c75749661dd1cc2e467671f7 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Fri, 26 Nov 2021 21:16:54 +0200 Subject: [PATCH] hacks --- src/CMakeLists.txt | 10 +------ src/interfaces/shell.cpp | 20 ------------- src/interfaces/shell.h | 27 ----------------- src/interfaces/window.cpp | 27 +++++++++++------ src/interfaces/window.h | 2 +- src/layer-shell.json | 3 -- src/layer-shell.json.license | 2 -- src/qwaylandlayershell.cpp | 11 +++---- src/qwaylandlayershell_p.h | 8 ++--- src/qwaylandlayershellintegration.cpp | 20 ++----------- src/qwaylandlayershellintegration_p.h | 5 ---- src/qwaylandlayershellintegrationplugin.cpp | 33 --------------------- src/qwaylandlayersurface.cpp | 4 +-- tests/main.cpp | 9 +++--- 14 files changed, 36 insertions(+), 145 deletions(-) delete mode 100644 src/interfaces/shell.cpp delete mode 100644 src/interfaces/shell.h delete mode 100644 src/layer-shell.json delete mode 100644 src/layer-shell.json.license delete mode 100644 src/qwaylandlayershellintegrationplugin.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8284497..3b5bc08 100644 --- a/src/CMakeLists.txt +++ b/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 qwaylandlayershellintegration.cpp qwaylandlayershell.cpp ${LAYER_SHELL_SOURCES}) target_link_libraries(LayerShellQtInterface PRIVATE Qt::Gui Qt::WaylandClientPrivate Wayland::Client) target_include_directories(LayerShellQtInterface PUBLIC "$" INTERFACE "$" @@ -26,27 +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) - 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 ${QT_PLUGIN_INSTALL_DIR}/wayland-shell-integration) - install(TARGETS LayerShellQtInterface EXPORT LayerShellQtTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES diff --git a/src/interfaces/shell.cpp b/src/interfaces/shell.cpp deleted file mode 100644 index 89b42d7..0000000 --- a/src/interfaces/shell.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez - * - * SPDX-License-Identifier: LGPL-3.0-or-later - */ - -#include "shell.h" -#include -#include -#include - -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"; - } -} diff --git a/src/interfaces/shell.h b/src/interfaces/shell.h deleted file mode 100644 index c68017a..0000000 --- a/src/interfaces/shell.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez - * - * SPDX-License-Identifier: LGPL-3.0-or-later - */ - -#ifndef LAYERSHELLQTSHELL_H -#define LAYERSHELLQTSHELL_H - -#include "layershellqt_export.h" -#include "window.h" -#include - -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 diff --git a/src/interfaces/window.cpp b/src/interfaces/window.cpp index 81e0d39..fe84df3 100644 --- a/src/interfaces/window.cpp +++ b/src/interfaces/window.cpp @@ -6,12 +6,15 @@ #include "window.h" #include "../qwaylandlayersurface_p.h" +#include "../qwaylandlayershellintegration_p.h" #include #include #include using namespace LayerShellQt; +static const char *s_interfaceKey = "__kde_layer_window"; + class LayerShellQt::WindowPrivate { public: @@ -30,11 +33,9 @@ public: QWaylandLayerSurface *getSurface() const; }; -static QMap s_map; - Window::~Window() { - s_map.remove(d->parentWindow); + d->parentWindow->setProperty(s_interfaceKey, QVariant()); } void Window::setAnchors(Anchors anchors) @@ -113,20 +114,28 @@ Window::Layer Window::layer() const return d->layer; } +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 + + QtWaylandClient::QWaylandWindow *waylandWindow = dynamic_cast(window->handle()); + if (waylandWindow) { + if (!s_integration) { + s_integration = new QWaylandLayerShellIntegration(); + } + waylandWindow->setShellIntegration(s_integration); + window->setProperty(s_interfaceKey, QVariant::fromValue(this)); + } } Window *Window::get(QWindow *window) { - auto layerShellWindow = s_map.value(window); - if (layerShellWindow) { - return layerShellWindow; - } - return new Window(window); + return qobject_cast(qvariant_cast(window->property(s_interfaceKey))); } QWaylandLayerSurface *WindowPrivate::getSurface() const diff --git a/src/interfaces/window.h b/src/interfaces/window.h index 33c46b0..0ccd5b7 100644 --- a/src/interfaces/window.h +++ b/src/interfaces/window.h @@ -21,6 +21,7 @@ class LAYERSHELLQT_EXPORT Window : public QObject { Q_OBJECT public: + explicit Window(QWindow *window); ~Window() override; enum Anchor { @@ -85,7 +86,6 @@ public: static Window *get(QWindow *window); private: - Window(QWindow *window); QScopedPointer d; }; diff --git a/src/layer-shell.json b/src/layer-shell.json deleted file mode 100644 index c96e97c..0000000 --- a/src/layer-shell.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "layer-shell" ] -} diff --git a/src/layer-shell.json.license b/src/layer-shell.json.license deleted file mode 100644 index 5fc657d..0000000 --- a/src/layer-shell.json.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez -SPDX-License-Identifier: CC0-1.0 diff --git a/src/qwaylandlayershell.cpp b/src/qwaylandlayershell.cpp index 9c54abb..c7e70f1 100644 --- a/src/qwaylandlayershell.cpp +++ b/src/qwaylandlayershell.cpp @@ -10,9 +10,11 @@ namespace LayerShellQt { -QWaylandLayerShell::QWaylandLayerShell(::wl_registry *registry, uint32_t id, uint32_t version) - : QtWayland::zwlr_layer_shell_v1(registry, id, version) +QWaylandLayerShell::QWaylandLayerShell() + : QWaylandClientExtensionTemplate(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); -} - } diff --git a/src/qwaylandlayershell_p.h b/src/qwaylandlayershell_p.h index 135b388..f87dd2c 100644 --- a/src/qwaylandlayershell_p.h +++ b/src/qwaylandlayershell_p.h @@ -10,6 +10,7 @@ #include +#include #include #include @@ -17,14 +18,11 @@ namespace LayerShellQt { -class LAYERSHELLQT_EXPORT QWaylandLayerShell : public QtWayland::zwlr_layer_shell_v1 +class QWaylandLayerShell : public QWaylandClientExtensionTemplate, 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 }; } diff --git a/src/qwaylandlayershellintegration.cpp b/src/qwaylandlayershellintegration.cpp index 230f3be..ec17577 100644 --- a/src/qwaylandlayershellintegration.cpp +++ b/src/qwaylandlayershellintegration.cpp @@ -15,6 +15,7 @@ namespace LayerShellQt { QWaylandLayerShellIntegration::QWaylandLayerShellIntegration() + : m_layerShell(new QWaylandLayerShell()) { } @@ -22,26 +23,9 @@ 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(data); - - if (interface == zwlr_layer_shell_v1_interface.name) - shell->m_layerShell.reset(new QWaylandLayerShell(registry, id, std::min(version, 4u))); + return new QWaylandLayerSurface(m_layerShell.data(), window); } } - -//#include "qwaylandlayershellintegration.moc" diff --git a/src/qwaylandlayershellintegration_p.h b/src/qwaylandlayershellintegration_p.h index 2df4206..fd3010a 100644 --- a/src/qwaylandlayershellintegration_p.h +++ b/src/qwaylandlayershellintegration_p.h @@ -8,8 +8,6 @@ #ifndef _LAYERSHELLINTEGRATION_P_H #define _LAYERSHELLINTEGRATION_P_H -#include - #include "layershellqt_export.h" #include @@ -23,12 +21,9 @@ 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 m_layerShell; }; diff --git a/src/qwaylandlayershellintegrationplugin.cpp b/src/qwaylandlayershellintegrationplugin.cpp deleted file mode 100644 index 7b61935..0000000 --- a/src/qwaylandlayershellintegrationplugin.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez - * SPDX-FileCopyrightText: 2018 Drew DeVault - * - * SPDX-License-Identifier: LGPL-3.0-or-later - */ - -#include "qwaylandlayershellintegration_p.h" -#include - -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 ¶mList) override - { - Q_UNUSED(key); - Q_UNUSED(paramList); - return new QWaylandLayerShellIntegration(); - } -}; - -// Q_IMPORT_PLUGIN(QWaylandLayerShellIntegrationPlugin); - -#include "qwaylandlayershellintegrationplugin.moc" diff --git a/src/qwaylandlayersurface.cpp b/src/qwaylandlayersurface.cpp index 5a95d74..d3f42ca 100644 --- a/src/qwaylandlayersurface.cpp +++ b/src/qwaylandlayersurface.cpp @@ -5,9 +5,9 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ -#include "interfaces/shell.h" #include "qwaylandlayershell_p.h" #include "qwaylandlayersurface_p.h" +#include "interfaces/window.h" #include "layershellqt_logging.h" #include @@ -20,7 +20,7 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShell *shell, QtWaylandC : QtWaylandClient::QWaylandShellSurface(window) , QtWayland::zwlr_layer_surface_v1() { - LayerShellQt::Window *interface = Window::get(window->window()); + 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 diff --git a/tests/main.cpp b/tests/main.cpp index d6a0517..a18e478 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -14,7 +14,6 @@ #include -#include #include 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(); @@ -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();