Merge branch 'grammar-fixes' into 'main'

protocol: Documentation fixes in wayland.xml

See merge request wayland/wayland!543
This commit is contained in:
Robert Ancell 2026-04-28 22:20:47 +00:00
commit 07032836ef

View file

@ -140,7 +140,7 @@
specified name as the identifier. specified name as the identifier.
</description> </description>
<arg name="name" type="uint" summary="unique numeric name of the object"/> <arg name="name" type="uint" summary="unique numeric name of the object"/>
<arg name="id" type="new_id" summary="bounded object"/> <arg name="id" type="new_id" summary="bound object"/>
</request> </request>
<event name="global"> <event name="global">
@ -847,8 +847,8 @@
acceptance, wl_data_source.cancelled may still be emitted afterwards acceptance, wl_data_source.cancelled may still be emitted afterwards
if the drop destination does not accept any mime type. if the drop destination does not accept any mime type.
However, this event might however not be received if the compositor However, this event might not be received if the compositor cancelled
cancelled the drag-and-drop operation before this event could happen. the drag-and-drop operation before this event could happen.
Note that the data_source may still be used in the future and should Note that the data_source may still be used in the future and should
not be destroyed here. not be destroyed here.
@ -889,7 +889,7 @@
The most recent action received is always the valid one. The chosen The most recent action received is always the valid one. The chosen
action may change alongside negotiation (e.g. an "ask" action can turn action may change alongside negotiation (e.g. an "ask" action can turn
into a "move" operation), so the effects of the final action must into a "move" operation), so the effects of the final action must
always be applied in wl_data_offer.dnd_finished. always be applied in wl_data_source.dnd_finished.
Clients can trigger cursor surface changes from this point, so Clients can trigger cursor surface changes from this point, so
they reflect the current action. they reflect the current action.
@ -2098,7 +2098,7 @@
shared across processes to refer to a specific wl_seat global. shared across processes to refer to a specific wl_seat global.
The name event is sent after binding to the seat global, and should be sent The name event is sent after binding to the seat global, and should be sent
before announcing capabilities. This event only sent once per seat object, before announcing capabilities. This event is only sent once per seat object,
and the name does not change over the lifetime of the wl_seat global. and the name does not change over the lifetime of the wl_seat global.
Compositors may re-use the same seat name if the wl_seat global is Compositors may re-use the same seat name if the wl_seat global is
@ -2816,7 +2816,7 @@
of the ellipse, while the minor axis length describes the shorter of the ellipse, while the minor axis length describes the shorter
diameter. Major and minor are orthogonal and both are specified in diameter. Major and minor are orthogonal and both are specified in
surface-local coordinates. The center of the ellipse is always at the surface-local coordinates. The center of the ellipse is always at the
touchpoint location as reported by wl_touch.down or wl_touch.move. touchpoint location as reported by wl_touch.down or wl_touch.motion.
This event is only sent by the compositor if the touch device supports This event is only sent by the compositor if the touch device supports
shape reports. The client has to make reasonable assumptions about the shape reports. The client has to make reasonable assumptions about the