diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2014-05-09 18:10:32 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-05-09 14:30:14 -0700 |
| commit | 3ed76204a9bb5dfe652113ea2e494ad688e22cea (patch) | |
| tree | 7a729ab1864fa9b936a91dc8bcd7967758e9143e | |
| parent | 6b660342687c61a0ec0ec0a48c07897780c1eed7 (diff) | |
protocol: Fix order of wl_pointer, wl_keyboard and wl_touch messages
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>
| -rw-r--r-- | protocol/wayland.xml | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/protocol/wayland.xml b/protocol/wayland.xml index 330f8ab..22eb6e7 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -1384,10 +1384,6 @@ <arg name="hotspot_y" type="int" summary="y coordinate in surface-relative coordinates"/> </request> - <request name="release" type="destructor" since="3"> - <description summary="release the pointer object"/> - </request> - <event name="enter"> <description summary="enter event"> Notification that this seat's pointer is focused on a certain @@ -1485,6 +1481,13 @@ <arg name="axis" type="uint"/> <arg name="value" type="fixed"/> </event> + + <!-- Version 3 additions --> + + <request name="release" type="destructor" since="3"> + <description summary="release the pointer object"/> + </request> + </interface> <interface name="wl_keyboard" version="3"> @@ -1493,10 +1496,6 @@ associated with a seat. </description> - <request name="release" type="destructor" since="3"> - <description summary="release the keyboard object"/> - </request> - <enum name="keymap_format"> <description summary="keyboard mapping format"> This specifies the format of the keymap provided to the @@ -1573,6 +1572,12 @@ <arg name="mods_locked" type="uint"/> <arg name="group" type="uint"/> </event> + + <!-- Version 3 additions --> + + <request name="release" type="destructor" since="3"> + <description summary="release the keyboard object"/> + </request> </interface> <interface name="wl_touch" version="3"> @@ -1587,10 +1592,6 @@ contact point can be identified by the ID of the sequence. </description> - <request name="release" type="destructor" since="3"> - <description summary="release the touch object"/> - </request> - <event name="down"> <description summary="touch down event and beginning of a touch sequence"> 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. </description> </event> + + <!-- Version 3 additions --> + + <request name="release" type="destructor" since="3"> + <description summary="release the touch object"/> + </request> </interface> <interface name="wl_output" version="2"> |