mirror/layer-shell-qt
1
0
Fork 0
mirror of https://invent.kde.org/plasma/layer-shell-qt.git synced 2026-02-12 16:42:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

try to not use private API

Browse Source
This commit is contained in:
David Redondo
2026-02-05 15:13:39 +01:00
parent dd76feea81
commit 6a0c6c6f7f
6 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/interfaces/window.cpp
View File

@ -7,6 +7,7 @@
#include "window.h" #include "window.h"
#include "../qwaylandlayershellintegration_p.h" #include "../qwaylandlayershellintegration_p.h"
#include <QtWaylandClient/private/qwaylandclientshellapi_p.h>
#include <layershellqt_logging.h> #include <layershellqt_logging.h>
#include <QPlatformSurfaceEvent> #include <QPlatformSurfaceEvent>
@ -14,8 +15,6 @@
#include <mutex> #include <mutex>
#include <optional> #include <optional>
#include <QtWaylandClient/private/qwaylandwindow_p.h>
using namespace LayerShellQt; using namespace LayerShellQt;
class LayerShellQt::WindowPrivate class LayerShellQt::WindowPrivate
@ -274,23 +273,27 @@ bool Window::eventFilter(QObject *watched, QEvent *event)
void Window::initializeShell() void Window::initializeShell()
{ {
auto waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(d->parentWindow->handle()); // FIXME
if (!waylandWindow) { // auto waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(d->parentWindow->handle());
qCWarning(LAYERSHELLQT) << d->parentWindow << "is not a wayland window. Not creating zwlr_layer_surface"; // if (!waylandWindow) {
return; // qCWarning(LAYERSHELLQT) << d->parentWindow << "is not a wayland window. Not creating zwlr_layer_surface";
} // return;
// }
static QWaylandLayerShellIntegration *shellIntegration = nullptr; static QWaylandLayerShellIntegration *shellIntegration = nullptr;
if (!shellIntegration) { if (!shellIntegration) {
shellIntegration = new QWaylandLayerShellIntegration(); shellIntegration = new QWaylandLayerShellIntegration();
if (!shellIntegration->initialize(waylandWindow->display())) { // Why does it take a display that is unused
if (!shellIntegration->initialize(nullptr)) {
delete shellIntegration; delete shellIntegration;
shellIntegration = nullptr; shellIntegration = nullptr;
qCWarning(LAYERSHELLQT) << "Failed to initialize layer-shell integration, possibly because compositor does not support the layer-shell protocol"; qCWarning(LAYERSHELLQT) << "Failed to initialize layer-shell integration, possibly because compositor does not support the layer-shell protocol";
return; return;
} }
} }
waylandWindow->setShellIntegration(shellIntegration); // FIXME this is relevant when the plugin is not the default shell integration
// Something like QWaylandShellIntegration::assignToWindow(QPlatformWindow *)?
// waylandWindow->setShellIntegration(shellIntegration);
} }
Window *Window::get(QWindow *window) Window *Window::get(QWindow *window)

3
src/qwaylandlayershellintegration.cpp
View File

@ -9,9 +9,6 @@
#include "qwaylandlayersurface_p.h" #include "qwaylandlayersurface_p.h"
#include "qwaylandxdgactivationv1_p.h" #include "qwaylandxdgactivationv1_p.h"
#include <QtWaylandClient/private/qwaylanddisplay_p.h>
#include <QtWaylandClient/private/qwaylandwindow_p.h>
namespace LayerShellQt namespace LayerShellQt
{ {
QWaylandLayerShellIntegration::QWaylandLayerShellIntegration() QWaylandLayerShellIntegration::QWaylandLayerShellIntegration()

64
src/qwaylandlayersurface.cpp
View File

@ -10,12 +10,10 @@
#include "qwaylandlayersurface_p.h" #include "qwaylandlayersurface_p.h"
#include "qwaylandxdgactivationv1_p.h" #include "qwaylandxdgactivationv1_p.h"
#include <QtWaylandClient/private/qwaylandinputdevice_p.h>
#include <QtWaylandClient/private/qwaylandscreen_p.h>
#include <QtWaylandClient/private/qwaylandsurface_p.h>
#include <QtWaylandClient/private/qwaylandwindow_p.h>
#include <QGuiApplication> #include <QGuiApplication>
#include <QScreen>
#include <qpa/qplatformwindow.h>
#include <qpa/qplatformwindow_p.h> // private native interface
namespace LayerShellQt namespace LayerShellQt
{ {
@ -23,17 +21,19 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
: QtWaylandClient::QWaylandShellSurface(window) : QtWaylandClient::QWaylandShellSurface(window)
, QtWayland::zwlr_layer_surface_v1() , QtWayland::zwlr_layer_surface_v1()
, m_shell(shell) , m_shell(shell)
, m_interface(Window::get(window->window())) // FIXME reverse lookup would a QWindow getter make sense, also below a bunch
// QWindow * QWaylandShellSurface::window
, m_interface(Window::get(platformWindow()->window()))
, m_window(window) , m_window(window)
{ {
wl_output *output = nullptr; wl_output *output = nullptr;
if (!m_interface->wantsToBeOnActiveScreen()) { if (!m_interface->wantsToBeOnActiveScreen()) {
QScreen *desiredScreen = m_interface->screen(); QScreen *desiredScreen = m_interface->screen();
if (!desiredScreen) { if (!desiredScreen) {
desiredScreen = window->window()->screen(); desiredScreen = platformWindow()->window()->screen();
} }
auto waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen *>(desiredScreen->handle()); auto waylandScreen = platformWindow()->window()->screen()->nativeInterface<QNativeInterface::QWaylandScreen>();
// Qt will always assign a screen to a window, but if the compositor has no screens available a dummy QScreen object is created // 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 // this will not cast to a QWaylandScreen
if (!waylandScreen) { if (!waylandScreen) {
@ -42,7 +42,7 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
output = waylandScreen->output(); output = waylandScreen->output();
} }
} }
init(shell->get_layer_surface(window->waylandSurface()->object(), output, m_interface->layer(), m_interface->scope())); init(shell->get_layer_surface(wlSurface(), output, m_interface->layer(), m_interface->scope()));
connect(m_interface, &Window::layerChanged, this, [this]() { connect(m_interface, &Window::layerChanged, this, [this]() {
setLayer(m_interface->layer()); setLayer(m_interface->layer());
}); });
@ -51,7 +51,7 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
connect(m_interface, &Window::anchorsChanged, this, [this]() { connect(m_interface, &Window::anchorsChanged, this, [this]() {
setAnchor(m_interface->anchors()); setAnchor(m_interface->anchors());
if (m_interface->desiredSize().isNull()) { if (m_interface->desiredSize().isNull()) {
setDesiredSize(m_window->windowContentGeometry().size()); setDesiredSize(m_lastContentGeometry.size());
} else { } else {
setDesiredSize(m_interface->desiredSize()); setDesiredSize(m_interface->desiredSize());
} }
@ -83,12 +83,22 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
}); });
if (m_interface->desiredSize().isNull()) { if (m_interface->desiredSize().isNull()) {
setDesiredSize(window->windowContentGeometry().size()); // FIXME QWaylandWindow should call setWindowContentGeometry when creating the shell surface
// / Does a setWindowContentGeometry call arrive early enough?
// setDesiredSize(window->windowContentGeometry().size());
} else { } else {
setDesiredSize(m_interface->desiredSize()); setDesiredSize(m_interface->desiredSize());
} }
} }
void QWaylandLayerSurface::setContentGeometry(const QRect &rect)
{
m_lastContentGeometry = rect;
if (m_interface->desiredSize().isNull()) {
setDesiredSize(rect.size());
}
}
QWaylandLayerSurface::~QWaylandLayerSurface() QWaylandLayerSurface::~QWaylandLayerSurface()
{ {
destroy(); destroy();
@ -97,7 +107,7 @@ QWaylandLayerSurface::~QWaylandLayerSurface()
void QWaylandLayerSurface::zwlr_layer_surface_v1_closed() void QWaylandLayerSurface::zwlr_layer_surface_v1_closed()
{ {
if (m_interface->closeOnDismissed()) { if (m_interface->closeOnDismissed()) {
window()->window()->close(); platformWindow()->close();
} }
} }
@ -113,7 +123,7 @@ void QWaylandLayerSurface::zwlr_layer_surface_v1_configure(uint32_t serial, uint
} else { } else {
// Later configures are resizes, so we have to queue them up for a time when we // Later configures are resizes, so we have to queue them up for a time when we
// are not painting to the window. // are not painting to the window.
window()->applyConfigureWhenPossible(); applyConfigureWhenPossible();
} }
} }
@ -130,7 +140,7 @@ void QWaylandLayerSurface::attachPopup(QtWaylandClient::QWaylandShellSurface *po
void QWaylandLayerSurface::applyConfigure() void QWaylandLayerSurface::applyConfigure()
{ {
window()->resizeFromApplyConfigure(m_pendingSize); resizeFromApplyConfigure(m_pendingSize);
} }
void QWaylandLayerSurface::setDesiredSize(const QSize &size) void QWaylandLayerSurface::setDesiredSize(const QSize &size)
@ -195,20 +205,21 @@ bool QWaylandLayerSurface::requestActivate()
return false; return false;
} }
if (!m_activationToken.isEmpty()) { if (!m_activationToken.isEmpty()) {
activation->activate(m_activationToken, window()->wlSurface()); activation->activate(m_activationToken, wlSurface());
m_activationToken = {}; m_activationToken = {};
return true; return true;
} else if (const auto token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN"); !token.isEmpty()) { } else if (const auto token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN"); !token.isEmpty()) {
activation->activate(token, window()->wlSurface()); activation->activate(token, wlSurface());
qunsetenv("XDG_ACTIVATION_TOKEN"); qunsetenv("XDG_ACTIVATION_TOKEN");
return true; return true;
} else { } else {
const auto focusWindow = QGuiApplication::focusWindow(); const auto focusWindow = QGuiApplication::focusWindow();
const auto wlWindow = focusWindow ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window(); const auto waylandApp = qGuiApp->nativeInterface<QNativeInterface::QWaylandApplication>();
if (const auto seat = wlWindow->display()->lastInputDevice()) { const auto surface = focusWindow ? focusWindow->nativeInterface<QNativeInterface::Private::QWaylandWindow>()->surface() : wlSurface();
const auto tokenProvider = activation->requestXdgActivationToken(wlWindow->display(), wlWindow->wlSurface(), seat->serial(), QString()); if (const auto seat = waylandApp->lastInputSeat()) {
const auto tokenProvider = activation->requestXdgActivationToken(seat, surface, waylandApp->lastInputSerial(), QString());
connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this, [this](const QString &token) { connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this, [this](const QString &token) {
m_shell->activation()->activate(token, window()->wlSurface()); m_shell->activation()->activate(token, wlSurface());
}); });
connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, tokenProvider, &QObject::deleteLater); connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, tokenProvider, &QObject::deleteLater);
return true; return true;
@ -227,7 +238,7 @@ bool QWaylandLayerSurface::requestActivateOnShow()
return false; return false;
} }
if (m_window->window()->property("_q_showWithoutActivating").toBool()) { if (platformWindow()->window()->property("_q_showWithoutActivating").toBool()) {
return false; return false;
} }
@ -245,16 +256,21 @@ void QWaylandLayerSurface::requestXdgActivationToken(quint32 serial)
if (!activation->isActive()) { if (!activation->isActive()) {
return; return;
} }
auto tokenProvider = activation->requestXdgActivationToken(window()->display(), window()->wlSurface(), serial, QString()); const auto waylandApp = qGuiApp->nativeInterface<QNativeInterface::QWaylandApplication>();
auto tokenProvider = activation->requestXdgActivationToken(waylandApp->lastInputSeat(), wlSurface(), serial, QString());
connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this, [this](const QString &token) { connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this, [this](const QString &token) {
Q_EMIT window()->xdgActivationTokenCreated(token); // FIXME No way to do this without knowing QWaylandWindow because QPlatofrmWindow is not QObject
// But we wanted to make a better API as well or alternatively the signal needs to be on QWaylandShellSurface as well
// Q_EMIT window()->xdgActivationTokenCreated(token);
// QMetaObject::invokeMethod(window(), "xdgActivationTokenCreated", token);
}); });
connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, tokenProvider, &QObject::deleteLater); connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, tokenProvider, &QObject::deleteLater);
} }
void QWaylandLayerSurface::sendExpose() void QWaylandLayerSurface::sendExpose()
{ {
window()->updateExposure(); // FIXME No way to call this, needs wrapper in QWaylandShellSurface
// window()->updateExposure();
} }
} }

4
src/qwaylandlayersurface_p.h
View File

@ -8,6 +8,7 @@
#ifndef _LAYERSURFACE_H #ifndef _LAYERSURFACE_H
#define _LAYERSURFACE_H #define _LAYERSURFACE_H
#include <QRect>
#include <wayland-client.h> #include <wayland-client.h>
#include "qwaylandlayershellintegration_p.h" #include "qwaylandlayershellintegration_p.h"
@ -41,7 +42,7 @@ public:
void setMargins(const QMargins &margins); void setMargins(const QMargins &margins);
void setKeyboardInteractivity(uint32_t interactivity); void setKeyboardInteractivity(uint32_t interactivity);
void setLayer(uint32_t layer); void setLayer(uint32_t layer);
void setContentGeometry(const QRect &rect) override;
void applyConfigure() override; void applyConfigure() override;
void setWindowSize(const QSize &size) override; void setWindowSize(const QSize &size) override;
@ -60,6 +61,7 @@ private:
QtWaylandClient::QWaylandWindow *m_window; QtWaylandClient::QWaylandWindow *m_window;
QSize m_pendingSize; QSize m_pendingSize;
QString m_activationToken; QString m_activationToken;
QRect m_lastContentGeometry;
bool m_configured = false; bool m_configured = false;
}; };

12
src/qwaylandxdgactivationv1.cpp
View File

@ -3,8 +3,6 @@
*/ */
#include "qwaylandxdgactivationv1_p.h" #include "qwaylandxdgactivationv1_p.h"
#include <QtWaylandClient/private/qwaylanddisplay_p.h>
#include <QtWaylandClient/private/qwaylandinputdevice_p.h>
QWaylandXdgActivationV1::QWaylandXdgActivationV1() QWaylandXdgActivationV1::QWaylandXdgActivationV1()
: QWaylandClientExtensionTemplate<QWaylandXdgActivationV1>(1) : QWaylandClientExtensionTemplate<QWaylandXdgActivationV1>(1)
@ -19,10 +17,8 @@ QWaylandXdgActivationV1::~QWaylandXdgActivationV1()
} }
} }
QWaylandXdgActivationTokenV1 *QWaylandXdgActivationV1::requestXdgActivationToken(QtWaylandClient::QWaylandDisplay *display, QWaylandXdgActivationTokenV1 *
struct ::wl_surface *surface, QWaylandXdgActivationV1::requestXdgActivationToken(::wl_seat *seat, struct ::wl_surface *surface, std::optional<uint32_t> serial, const QString &app_id)
std::optional<uint32_t> serial,
const QString &app_id)
{ {
auto wl = get_activation_token(); auto wl = get_activation_token();
auto provider = new QWaylandXdgActivationTokenV1; auto provider = new QWaylandXdgActivationTokenV1;
@ -34,8 +30,8 @@ QWaylandXdgActivationTokenV1 *QWaylandXdgActivationV1::requestXdgActivationToken
if (!app_id.isEmpty()) { if (!app_id.isEmpty()) {
provider->set_app_id(app_id); provider->set_app_id(app_id);
} }
if (serial && display->lastInputDevice()) { if (serial && seat) {
provider->set_serial(*serial, display->lastInputDevice()->wl_seat()); provider->set_serial(*serial, seat);
} }
provider->commit(); provider->commit();
return provider; return provider;

2
src/qwaylandxdgactivationv1_p.h
View File

@ -42,7 +42,7 @@ public:
~QWaylandXdgActivationV1() override; ~QWaylandXdgActivationV1() override;
QWaylandXdgActivationTokenV1 * QWaylandXdgActivationTokenV1 *
requestXdgActivationToken(QtWaylandClient::QWaylandDisplay *display, struct ::wl_surface *surface, std::optional<uint32_t> serial, const QString &app_id); requestXdgActivationToken(::wl_seat *seat, struct ::wl_surface *surface, std::optional<uint32_t> serial, const QString &app_id);
}; };
#endif // QWAYLANDXDGACTIVATIONV1_P_H #endif // QWAYLANDXDGACTIVATIONV1_P_H