mirror of
https://invent.kde.org/plasma/layer-shell-qt.git
synced 2025-05-28 02:50:21 -04:00
fofofofo
This commit is contained in:
parent
b37ac92e9f
commit
da2eb1586c
@ -15,7 +15,7 @@
|
|||||||
namespace LayerShellQt
|
namespace LayerShellQt
|
||||||
{
|
{
|
||||||
QWaylandLayerShellIntegration::QWaylandLayerShellIntegration()
|
QWaylandLayerShellIntegration::QWaylandLayerShellIntegration()
|
||||||
: QWaylandShellIntegrationTemplate<QWaylandLayerShellIntegration>(5)
|
: QWaylandShellIntegrationTemplate<QWaylandLayerShellIntegration>(6)
|
||||||
, m_xdgActivation(new QWaylandXdgActivationV1)
|
, m_xdgActivation(new QWaylandXdgActivationV1)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -74,6 +74,11 @@ QWaylandLayerSurface::~QWaylandLayerSurface()
|
|||||||
destroy();
|
destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool QWaylandLayerSurface::isExposed() const
|
||||||
|
{
|
||||||
|
return m_configured && !m_waitingForRearrange;
|
||||||
|
}
|
||||||
|
|
||||||
void QWaylandLayerSurface::zwlr_layer_surface_v1_closed()
|
void QWaylandLayerSurface::zwlr_layer_surface_v1_closed()
|
||||||
{
|
{
|
||||||
if (m_interface->closeOnDismissed()) {
|
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)
|
void QWaylandLayerSurface::zwlr_layer_surface_v1_configure(uint32_t serial, uint32_t width, uint32_t height)
|
||||||
{
|
{
|
||||||
ack_configure(serial);
|
ack_configure(serial);
|
||||||
@ -89,7 +103,6 @@ void QWaylandLayerSurface::zwlr_layer_surface_v1_configure(uint32_t serial, uint
|
|||||||
if (!m_configured) {
|
if (!m_configured) {
|
||||||
m_configured = true;
|
m_configured = true;
|
||||||
applyConfigure();
|
applyConfigure();
|
||||||
sendExpose();
|
|
||||||
} 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.
|
||||||
@ -117,6 +130,7 @@ void QWaylandLayerSurface::applyConfigure()
|
|||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
|
||||||
m_configuring = false;
|
m_configuring = false;
|
||||||
#endif
|
#endif
|
||||||
|
window()->updateExposure();
|
||||||
}
|
}
|
||||||
|
|
||||||
void QWaylandLayerSurface::setDesiredSize(const QSize &size)
|
void QWaylandLayerSurface::setDesiredSize(const QSize &size)
|
||||||
@ -132,6 +146,16 @@ void QWaylandLayerSurface::setDesiredSize(const QSize &size)
|
|||||||
effectiveSize.setHeight(0);
|
effectiveSize.setHeight(0);
|
||||||
}
|
}
|
||||||
set_size(effectiveSize.width(), effectiveSize.height());
|
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)
|
void QWaylandLayerSurface::setAnchor(uint anchor)
|
||||||
|
@ -28,10 +28,7 @@ public:
|
|||||||
QWaylandLayerSurface(QWaylandLayerShellIntegration *shell, QtWaylandClient::QWaylandWindow *window);
|
QWaylandLayerSurface(QWaylandLayerShellIntegration *shell, QtWaylandClient::QWaylandWindow *window);
|
||||||
~QWaylandLayerSurface() override;
|
~QWaylandLayerSurface() override;
|
||||||
|
|
||||||
bool isExposed() const override
|
bool isExposed() const override;
|
||||||
{
|
|
||||||
return m_configured;
|
|
||||||
}
|
|
||||||
void attachPopup(QtWaylandClient::QWaylandShellSurface *popup) override;
|
void attachPopup(QtWaylandClient::QWaylandShellSurface *popup) override;
|
||||||
|
|
||||||
void setDesiredSize(const QSize &size);
|
void setDesiredSize(const QSize &size);
|
||||||
@ -57,6 +54,7 @@ private:
|
|||||||
void sendExpose();
|
void sendExpose();
|
||||||
void zwlr_layer_surface_v1_configure(uint32_t serial, uint32_t width, uint32_t height) override;
|
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_closed() override;
|
||||||
|
void zwlr_layer_surface_v1_rearranged(uint32_t token) override;
|
||||||
|
|
||||||
QWaylandLayerShellIntegration *m_shell;
|
QWaylandLayerShellIntegration *m_shell;
|
||||||
LayerShellQt::Window *m_interface;
|
LayerShellQt::Window *m_interface;
|
||||||
@ -68,6 +66,8 @@ private:
|
|||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
|
||||||
bool m_configuring = false;
|
bool m_configuring = false;
|
||||||
#endif
|
#endif
|
||||||
|
quint32 m_arrangeSerial = 0;
|
||||||
|
bool m_waitingForRearrange = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
THIS SOFTWARE.
|
THIS SOFTWARE.
|
||||||
</copyright>
|
</copyright>
|
||||||
|
|
||||||
<interface name="zwlr_layer_shell_v1" version="5">
|
<interface name="zwlr_layer_shell_v1" version="6">
|
||||||
<description summary="create surfaces that are layers of the desktop">
|
<description summary="create surfaces that are layers of the desktop">
|
||||||
Clients can use this interface to assign the surface_layer role to
|
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
|
wl_surfaces. Such surfaces are assigned to a "layer" of the output and
|
||||||
@ -100,7 +100,7 @@
|
|||||||
</request>
|
</request>
|
||||||
</interface>
|
</interface>
|
||||||
|
|
||||||
<interface name="zwlr_layer_surface_v1" version="5">
|
<interface name="zwlr_layer_surface_v1" version="6">
|
||||||
<description summary="layer metadata interface">
|
<description summary="layer metadata interface">
|
||||||
An interface that may be implemented by a wl_surface, for surfaces that
|
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
|
are designed to be rendered as a layer of a stacked desktop-like
|
||||||
@ -203,85 +203,21 @@
|
|||||||
<arg name="left" type="int"/>
|
<arg name="left" type="int"/>
|
||||||
</request>
|
</request>
|
||||||
|
|
||||||
<enum name="keyboard_interactivity">
|
|
||||||
<description summary="types of keyboard interaction possible for a layer shell surface">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<entry name="none" value="0">
|
|
||||||
<description summary="no keyboard focus is possible">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</entry>
|
|
||||||
<entry name="exclusive" value="1">
|
|
||||||
<description summary="request exclusive keyboard focus">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</entry>
|
|
||||||
<entry name="on_demand" value="2" since="4">
|
|
||||||
<description summary="request regular keyboard focus semantics">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
</entry>
|
|
||||||
</enum>
|
|
||||||
|
|
||||||
<request name="set_keyboard_interactivity">
|
<request name="set_keyboard_interactivity">
|
||||||
<description summary="requests keyboard events">
|
<description summary="requests keyboard events">
|
||||||
Set how keyboard events are delivered to this surface. By default,
|
Set to 1 to request that the seat send keyboard events to this layer
|
||||||
layer shell surfaces do not receive keyboard events; this request can
|
surface. For layers below the shell surface layer, the seat will use
|
||||||
be used to change this.
|
normal focus semantics. For layers above the shell surface layers, the
|
||||||
|
seat will always give exclusive keyboard focus to the top-most layer
|
||||||
This setting is inherited by child surfaces set by the get_popup
|
which has keyboard interactivity set to true.
|
||||||
request.
|
|
||||||
|
|
||||||
Layer surfaces receive pointer, touch, and tablet events normally. If
|
Layer surfaces receive pointer, touch, and tablet events normally. If
|
||||||
you do not want to receive them, set the input region on your surface
|
you do not want to receive them, set the input region on your surface
|
||||||
to an empty region.
|
to an empty region.
|
||||||
|
|
||||||
Keyboard interactivity is double-buffered, see wl_surface.commit.
|
Events is double-buffered, see wl_surface.commit.
|
||||||
</description>
|
</description>
|
||||||
<arg name="keyboard_interactivity" type="uint" enum="keyboard_interactivity"/>
|
<arg name="keyboard_interactivity" type="uint"/>
|
||||||
</request>
|
</request>
|
||||||
|
|
||||||
<request name="get_popup">
|
<request name="get_popup">
|
||||||
@ -366,7 +302,6 @@
|
|||||||
<entry name="invalid_surface_state" value="0" summary="provided surface state is invalid"/>
|
<entry name="invalid_surface_state" value="0" summary="provided surface state is invalid"/>
|
||||||
<entry name="invalid_size" value="1" summary="size is invalid"/>
|
<entry name="invalid_size" value="1" summary="size is invalid"/>
|
||||||
<entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>
|
<entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>
|
||||||
<entry name="invalid_keyboard_interactivity" value="3" summary="keyboard interactivity is invalid"/>
|
|
||||||
<entry name="invalid_exclusive_edge" value="4" summary="exclusive edge is invalid given the surface anchors"/>
|
<entry name="invalid_exclusive_edge" value="4" summary="exclusive edge is invalid given the surface anchors"/>
|
||||||
</enum>
|
</enum>
|
||||||
|
|
||||||
@ -403,5 +338,13 @@
|
|||||||
</description>
|
</description>
|
||||||
<arg name="edge" type="uint"/>
|
<arg name="edge" type="uint"/>
|
||||||
</request>
|
</request>
|
||||||
|
|
||||||
|
<request name="set_arrange_token" since="6">
|
||||||
|
<arg name="token" type="uint"/>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<event name="rearranged" since="6">
|
||||||
|
<arg name="token" type="uint"/>
|
||||||
|
</event>
|
||||||
</interface>
|
</interface>
|
||||||
</protocol>
|
</protocol>
|
||||||
|
Loading…
Reference in New Issue
Block a user