From da2eb1586ca9838cad1018eb42dc6ec66b58a1a6 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Fri, 25 Apr 2025 17:32:51 +0300 Subject: [PATCH] fofofofo --- src/qwaylandlayershellintegration.cpp | 2 +- src/qwaylandlayersurface.cpp | 26 +++++++- src/qwaylandlayersurface_p.h | 8 +-- src/wlr-layer-shell-unstable-v1.xml | 91 +++++---------------------- 4 files changed, 47 insertions(+), 80 deletions(-) diff --git a/src/qwaylandlayershellintegration.cpp b/src/qwaylandlayershellintegration.cpp index 2ae367e..b772cc9 100644 --- a/src/qwaylandlayershellintegration.cpp +++ b/src/qwaylandlayershellintegration.cpp @@ -15,7 +15,7 @@ namespace LayerShellQt { QWaylandLayerShellIntegration::QWaylandLayerShellIntegration() - : QWaylandShellIntegrationTemplate(5) + : QWaylandShellIntegrationTemplate(6) , m_xdgActivation(new QWaylandXdgActivationV1) { } diff --git a/src/qwaylandlayersurface.cpp b/src/qwaylandlayersurface.cpp index c03de35..593efb2 100644 --- a/src/qwaylandlayersurface.cpp +++ b/src/qwaylandlayersurface.cpp @@ -74,6 +74,11 @@ QWaylandLayerSurface::~QWaylandLayerSurface() destroy(); } +bool QWaylandLayerSurface::isExposed() const +{ + return m_configured && !m_waitingForRearrange; +} + void QWaylandLayerSurface::zwlr_layer_surface_v1_closed() { if (m_interface->closeOnDismissed()) { @@ -81,6 +86,15 @@ void QWaylandLayerSurface::zwlr_layer_surface_v1_closed() } } +void QWaylandLayerSurface::zwlr_layer_surface_v1_rearranged(uint32_t serial) +{ + qDebug() << serial << m_arrangeSerial; + if (m_arrangeSerial == serial) { + qDebug() << "unset rearrange"; + m_waitingForRearrange = false; + } +} + void QWaylandLayerSurface::zwlr_layer_surface_v1_configure(uint32_t serial, uint32_t width, uint32_t height) { ack_configure(serial); @@ -89,7 +103,6 @@ void QWaylandLayerSurface::zwlr_layer_surface_v1_configure(uint32_t serial, uint if (!m_configured) { m_configured = true; applyConfigure(); - sendExpose(); } else { // Later configures are resizes, so we have to queue them up for a time when we // are not painting to the window. @@ -117,6 +130,7 @@ void QWaylandLayerSurface::applyConfigure() #if QT_VERSION < QT_VERSION_CHECK(6, 9, 0) m_configuring = false; #endif + window()->updateExposure(); } void QWaylandLayerSurface::setDesiredSize(const QSize &size) @@ -132,6 +146,16 @@ void QWaylandLayerSurface::setDesiredSize(const QSize &size) effectiveSize.setHeight(0); } set_size(effectiveSize.width(), effectiveSize.height()); + + static quint32 token = 0; + m_waitingForRearrange = true; + m_arrangeSerial = ++token; + set_arrange_token(m_arrangeSerial); + window()->updateExposure(); + if (!window()->isExposed()) { + window()->commit(); // FIXME: ugly + } + qDebug() << "request reposition" << m_arrangeSerial; } void QWaylandLayerSurface::setAnchor(uint anchor) diff --git a/src/qwaylandlayersurface_p.h b/src/qwaylandlayersurface_p.h index 079a295..633bb81 100644 --- a/src/qwaylandlayersurface_p.h +++ b/src/qwaylandlayersurface_p.h @@ -28,10 +28,7 @@ public: QWaylandLayerSurface(QWaylandLayerShellIntegration *shell, QtWaylandClient::QWaylandWindow *window); ~QWaylandLayerSurface() override; - bool isExposed() const override - { - return m_configured; - } + bool isExposed() const override; void attachPopup(QtWaylandClient::QWaylandShellSurface *popup) override; void setDesiredSize(const QSize &size); @@ -57,6 +54,7 @@ private: void sendExpose(); void zwlr_layer_surface_v1_configure(uint32_t serial, uint32_t width, uint32_t height) override; void zwlr_layer_surface_v1_closed() override; + void zwlr_layer_surface_v1_rearranged(uint32_t token) override; QWaylandLayerShellIntegration *m_shell; LayerShellQt::Window *m_interface; @@ -68,6 +66,8 @@ private: #if QT_VERSION < QT_VERSION_CHECK(6, 9, 0) bool m_configuring = false; #endif + quint32 m_arrangeSerial = 0; + bool m_waitingForRearrange = false; }; } diff --git a/src/wlr-layer-shell-unstable-v1.xml b/src/wlr-layer-shell-unstable-v1.xml index ba4bb61..b6ac1ae 100644 --- a/src/wlr-layer-shell-unstable-v1.xml +++ b/src/wlr-layer-shell-unstable-v1.xml @@ -25,7 +25,7 @@ THIS SOFTWARE. - + Clients can use this interface to assign the surface_layer role to wl_surfaces. Such surfaces are assigned to a "layer" of the output and @@ -100,7 +100,7 @@ - + An interface that may be implemented by a wl_surface, for surfaces that are designed to be rendered as a layer of a stacked desktop-like @@ -203,85 +203,21 @@ - - - Types of keyboard interaction possible for layer shell surfaces. The - rationale for this is twofold: (1) some applications are not interested - in keyboard events and not allowing them to be focused can improve the - desktop experience; (2) some applications will want to take exclusive - keyboard focus. - - - - - This value indicates that this surface is not interested in keyboard - events and the compositor should never assign it the keyboard focus. - - This is the default value, set for newly created layer shell surfaces. - - This is useful for e.g. desktop widgets that display information or - only have interaction with non-keyboard input devices. - - - - - Request exclusive keyboard focus if this surface is above the shell surface layer. - - For the top and overlay layers, the seat will always give - exclusive keyboard focus to the top-most layer which has keyboard - interactivity set to exclusive. If this layer contains multiple - surfaces with keyboard interactivity set to exclusive, the compositor - determines the one receiving keyboard events in an implementation- - defined manner. In this case, no guarantee is made when this surface - will receive keyboard focus (if ever). - - For the bottom and background layers, the compositor is allowed to use - normal focus semantics. - - This setting is mainly intended for applications that need to ensure - they receive all keyboard events, such as a lock screen or a password - prompt. - - - - - This requests the compositor to allow this surface to be focused and - unfocused by the user in an implementation-defined manner. The user - should be able to unfocus this surface even regardless of the layer - it is on. - - Typically, the compositor will want to use its normal mechanism to - manage keyboard focus between layer shell surfaces with this setting - and regular toplevels on the desktop layer (e.g. click to focus). - Nevertheless, it is possible for a compositor to require a special - interaction to focus or unfocus layer shell surfaces (e.g. requiring - a click even if focus follows the mouse normally, or providing a - keybinding to switch focus between layers). - - This setting is mainly intended for desktop shell components (e.g. - panels) that allow keyboard interaction. Using this option can allow - implementing a desktop shell that can be fully usable without the - mouse. - - - - - Set how keyboard events are delivered to this surface. By default, - layer shell surfaces do not receive keyboard events; this request can - be used to change this. - - This setting is inherited by child surfaces set by the get_popup - request. + Set to 1 to request that the seat send keyboard events to this layer + surface. For layers below the shell surface layer, the seat will use + normal focus semantics. For layers above the shell surface layers, the + seat will always give exclusive keyboard focus to the top-most layer + which has keyboard interactivity set to true. Layer surfaces receive pointer, touch, and tablet events normally. If you do not want to receive them, set the input region on your surface to an empty region. - Keyboard interactivity is double-buffered, see wl_surface.commit. + Events is double-buffered, see wl_surface.commit. - + @@ -366,7 +302,6 @@ - @@ -403,5 +338,13 @@ + + + + + + + +