mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol: Fix order of wl_pointer, wl_keyboard and wl_touch messages

Browse source 
The "release" message of wl_pointer, wl_keyboard and wl_touch introduced
in version 3 was placed first in the respective interface XML element,
causing wayland-scanner to misbehave and set the version number of the
"release" message to all subsequent messages with no explicitly specified
"since" version.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
This commit is contained in:
Jonas Ådahl 2014-05-09 18:10:32 +02:00 • committed by Kristian Høgsberg
parent 6b66034268
commit 3ed76204a9
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
protocol/wayland.xml
View file

@ -1384,10 +1384,6 @@
<arg name="hotspot_y" type="int" summary="y coordinate in surface-relative coordinates"/> <arg name="hotspot_y" type="int" summary="y coordinate in surface-relative coordinates"/>
</request> </request>
<request name="release" type="destructor" since="3">
<description summary="release the pointer object"/>
</request>
<event name="enter"> <event name="enter">
<description summary="enter event"> <description summary="enter event">
Notification that this seat's pointer is focused on a certain Notification that this seat's pointer is focused on a certain
@ -1485,6 +1481,13 @@
<arg name="axis" type="uint"/> <arg name="axis" type="uint"/>
<arg name="value" type="fixed"/> <arg name="value" type="fixed"/>
</event> </event>
<!-- Version 3 additions -->
<request name="release" type="destructor" since="3">
<description summary="release the pointer object"/>
</request>
</interface> </interface>
<interface name="wl_keyboard" version="3"> <interface name="wl_keyboard" version="3">
@ -1493,10 +1496,6 @@
associated with a seat. associated with a seat.
</description> </description>
<request name="release" type="destructor" since="3">
<description summary="release the keyboard object"/>
</request>
<enum name="keymap_format"> <enum name="keymap_format">
<description summary="keyboard mapping format"> <description summary="keyboard mapping format">
This specifies the format of the keymap provided to the This specifies the format of the keymap provided to the
@ -1573,6 +1572,12 @@
<arg name="mods_locked" type="uint"/> <arg name="mods_locked" type="uint"/>
<arg name="group" type="uint"/> <arg name="group" type="uint"/>
</event> </event>
<!-- Version 3 additions -->
<request name="release" type="destructor" since="3">
<description summary="release the keyboard object"/>
</request>
</interface> </interface>
<interface name="wl_touch" version="3"> <interface name="wl_touch" version="3">
@ -1587,10 +1592,6 @@
contact point can be identified by the ID of the sequence. contact point can be identified by the ID of the sequence.
</description> </description>
<request name="release" type="destructor" since="3">
<description summary="release the touch object"/>
</request>
<event name="down"> <event name="down">
<description summary="touch down event and beginning of a touch sequence"> <description summary="touch down event and beginning of a touch sequence">
A new touch point has appeared on the surface. This touch point is A new touch point has appeared on the surface. This touch point is
@ -1643,6 +1644,12 @@
this surface may re-use the touch point ID. this surface may re-use the touch point ID.
</description> </description>
</event> </event>
<!-- Version 3 additions -->
<request name="release" type="destructor" since="3">
<description summary="release the touch object"/>
</request>
</interface> </interface>
<interface name="wl_output" version="2"> <interface name="wl_output" version="2">