diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 176fa52..2ad95ea 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,7 @@ ecm_qt_declare_logging_category(LAYER_SHELL_SOURCES layershellqt ) -target_sources(LayerShellQtInterface PRIVATE qwaylandlayersurface.cpp interfaces/window.cpp interfaces/shell.cpp qwaylandlayershellintegration.cpp qwaylandlayershell.cpp ${LAYER_SHELL_SOURCES}) +target_sources(LayerShellQtInterface PRIVATE qwaylandlayersurface.cpp interfaces/window.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) @@ -37,30 +37,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 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 477b74e..f297043 100644 --- a/src/interfaces/window.cpp +++ b/src/interfaces/window.cpp @@ -5,12 +5,18 @@ */ #include "window.h" +#include "../qwaylandlayershellintegration_p.h" + #include #include +#include + using namespace LayerShellQt; +static QWaylandLayerShellIntegration *s_integration = nullptr; + class LayerShellQt::WindowPrivate { public: @@ -116,6 +122,21 @@ Window::Window(QWindow *window) , d(new WindowPrivate(window)) { s_map.insert(d->parentWindow, this); + + if (!s_integration) { + s_integration = new QWaylandLayerShellIntegration(); + } + + window->winId(); // ensure that the platform window is created + + auto waylandWindow = dynamic_cast(window->handle()); + if (!waylandWindow) { + return; + } + + if (waylandWindow->shellIntegration() != s_integration) { + waylandWindow->setShellIntegration(s_integration); + } } Window *Window::get(QWindow *window) 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..800e1bd 100644 --- a/src/qwaylandlayershell_p.h +++ b/src/qwaylandlayershell_p.h @@ -8,23 +8,20 @@ #ifndef _LAYERSHELL_H #define _LAYERSHELL_H +#include "layershellqt_export.h" + #include #include #include -#include "qwaylandlayersurface_p.h" - namespace LayerShellQt { -class LAYERSHELLQT_EXPORT QWaylandLayerShell : public QtWayland::zwlr_layer_shell_v1 +class LAYERSHELLQT_EXPORT 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 ada426f..58f4a50 100644 --- a/src/qwaylandlayershellintegration.cpp +++ b/src/qwaylandlayershellintegration.cpp @@ -7,6 +7,7 @@ #include "qwaylandlayershell_p.h" #include "qwaylandlayershellintegration_p.h" +#include "qwaylandlayersurface_p.h" #include #include @@ -15,6 +16,7 @@ namespace LayerShellQt { QWaylandLayerShellIntegration::QWaylandLayerShellIntegration() + : m_layerShell(new QWaylandLayerShell()) { } @@ -24,26 +26,14 @@ QWaylandLayerShellIntegration::~QWaylandLayerShellIntegration() 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; + Q_UNUSED(display) + return m_layerShell->isActive(); } QtWaylandClient::QWaylandShellSurface *QWaylandLayerShellIntegration::createShellSurface(QtWaylandClient::QWaylandWindow *window) { - return m_layerShell->createLayerSurface(window); + return new QWaylandLayerSurface(m_layerShell.get(), 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))); -} } - -//#include "qwaylandlayershellintegration.moc" diff --git a/src/qwaylandlayershellintegration_p.h b/src/qwaylandlayershellintegration_p.h index 2df4206..344be31 100644 --- a/src/qwaylandlayershellintegration_p.h +++ b/src/qwaylandlayershellintegration_p.h @@ -27,8 +27,6 @@ public: 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 dd17aa0..bc70445 100644 --- a/src/qwaylandlayersurface.cpp +++ b/src/qwaylandlayersurface.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ -#include "interfaces/shell.h" +#include "interfaces/window.h" #include "layershellqt_logging.h" #include "qwaylandlayershell_p.h" #include "qwaylandlayersurface_p.h" diff --git a/tests/main.cpp b/tests/main.cpp index d6a0517..6d90734 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(); @@ -79,6 +76,8 @@ 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}); @@ -102,6 +101,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();