summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJames Legg <lankyleggy@gmail.com>2021-06-03 00:10:22 +0100
committerPekka Paalanen <pq@iki.fi>2021-07-07 12:11:42 +0000
commitb7153f2273d076adfdaaf6717cde1aca69da5f04 (patch)
treee6037659faed8d80c266b44fa75325e284dd608a /tests
parent51d336ec140a8e44b74a5f3b3fcdf6e0038f9c86 (diff)
downloadwayland-b7153f2273d076adfdaaf6717cde1aca69da5f04.tar.gz
tests: Test wayland-scanner with a description in an entry
This previously would have caused a memory leak and incorrect comments. Signed-off-by: James Legg <lankyleggy@gmail.com> Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/data/example-client.h20
-rw-r--r--tests/data/example-server.h20
-rw-r--r--tests/data/example.xml26
3 files changed, 34 insertions, 32 deletions
diff --git a/tests/data/example-client.h b/tests/data/example-client.h
index d421af9..9a2200a 100644
--- a/tests/data/example-client.h
+++ b/tests/data/example-client.h
@@ -4095,16 +4095,6 @@ enum wl_pointer_axis {
* from a "finger" source may be in a smooth coordinate space with
* kinetic scrolling whereas a "wheel" source may be in discrete steps
* of a number of lines.
- *
- * The "continuous" axis source is a device generating events in a
- * continuous coordinate space, but using something other than a
- * finger. One example for this source is button-based scrolling where
- * the vertical motion of a device is converted to scroll events while
- * a button is held down.
- *
- * The "wheel tilt" axis source indicates that the actual device is a
- * wheel but the scroll event is not caused by a rotation but a
- * (usually sideways) tilt of the wheel.
*/
enum wl_pointer_axis_source {
/**
@@ -4117,10 +4107,20 @@ enum wl_pointer_axis_source {
WL_POINTER_AXIS_SOURCE_FINGER = 1,
/**
* continuous coordinate space
+ *
+ * A device generating events in a continuous coordinate space,
+ * but using something other than a finger. One example for this
+ * source is button-based scrolling where the vertical motion of a
+ * device is converted to scroll events while a button is held
+ * down.
*/
WL_POINTER_AXIS_SOURCE_CONTINUOUS = 2,
/**
* a physical wheel tilt
+ *
+ * Indicates that the actual device is a wheel but the scroll
+ * event is not caused by a rotation but a (usually sideways) tilt
+ * of the wheel.
* @since 6
*/
WL_POINTER_AXIS_SOURCE_WHEEL_TILT = 3,
diff --git a/tests/data/example-server.h b/tests/data/example-server.h
index 3311c5d..7cfa4e7 100644
--- a/tests/data/example-server.h
+++ b/tests/data/example-server.h
@@ -3304,16 +3304,6 @@ enum wl_pointer_axis {
* from a "finger" source may be in a smooth coordinate space with
* kinetic scrolling whereas a "wheel" source may be in discrete steps
* of a number of lines.
- *
- * The "continuous" axis source is a device generating events in a
- * continuous coordinate space, but using something other than a
- * finger. One example for this source is button-based scrolling where
- * the vertical motion of a device is converted to scroll events while
- * a button is held down.
- *
- * The "wheel tilt" axis source indicates that the actual device is a
- * wheel but the scroll event is not caused by a rotation but a
- * (usually sideways) tilt of the wheel.
*/
enum wl_pointer_axis_source {
/**
@@ -3326,10 +3316,20 @@ enum wl_pointer_axis_source {
WL_POINTER_AXIS_SOURCE_FINGER = 1,
/**
* continuous coordinate space
+ *
+ * A device generating events in a continuous coordinate space,
+ * but using something other than a finger. One example for this
+ * source is button-based scrolling where the vertical motion of a
+ * device is converted to scroll events while a button is held
+ * down.
*/
WL_POINTER_AXIS_SOURCE_CONTINUOUS = 2,
/**
* a physical wheel tilt
+ *
+ * Indicates that the actual device is a wheel but the scroll
+ * event is not caused by a rotation but a (usually sideways) tilt
+ * of the wheel.
* @since 6
*/
WL_POINTER_AXIS_SOURCE_WHEEL_TILT = 3,
diff --git a/tests/data/example.xml b/tests/data/example.xml
index 29b63be..38feec3 100644
--- a/tests/data/example.xml
+++ b/tests/data/example.xml
@@ -1980,21 +1980,23 @@
from a "finger" source may be in a smooth coordinate space with
kinetic scrolling whereas a "wheel" source may be in discrete steps
of a number of lines.
-
- The "continuous" axis source is a device generating events in a
- continuous coordinate space, but using something other than a
- finger. One example for this source is button-based scrolling where
- the vertical motion of a device is converted to scroll events while
- a button is held down.
-
- The "wheel tilt" axis source indicates that the actual device is a
- wheel but the scroll event is not caused by a rotation but a
- (usually sideways) tilt of the wheel.
</description>
<entry name="wheel" value="0" summary="a physical wheel rotation" />
<entry name="finger" value="1" summary="finger on a touch surface" />
- <entry name="continuous" value="2" summary="continuous coordinate space"/>
- <entry name="wheel_tilt" value="3" summary="a physical wheel tilt" since="6"/>
+ <entry name="continuous" value="2">
+ <description summary="continuous coordinate space">
+ A device generating events in a continuous coordinate space, but
+ using something other than a finger. One example for this source
+ is button-based scrolling where the vertical motion of a device
+ is converted to scroll events while a button is held down.
+ </description>
+ </entry>
+ <entry name="wheel_tilt" value="3" since="6">
+ <description summary="a physical wheel tilt">
+ Indicates that the actual device is a wheel but the scroll event is
+ not caused by a rotation but a (usually sideways) tilt of the wheel.
+ </description>
+ </entry>
</enum>
<event name="axis_source" since="5">