mirror of
https://gitlab.freedesktop.org/wayland/wayland.git
synced 2025-10-31 22:25:25 -04:00
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>
This commit is contained in:
parent
51d336ec14
commit
b7153f2273
3 changed files with 34 additions and 32 deletions
|
|
@ -4095,16 +4095,6 @@ enum wl_pointer_axis {
|
||||||
* from a "finger" source may be in a smooth coordinate space with
|
* from a "finger" source may be in a smooth coordinate space with
|
||||||
* kinetic scrolling whereas a "wheel" source may be in discrete steps
|
* kinetic scrolling whereas a "wheel" source may be in discrete steps
|
||||||
* of a number of lines.
|
* 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 {
|
enum wl_pointer_axis_source {
|
||||||
/**
|
/**
|
||||||
|
|
@ -4117,10 +4107,20 @@ enum wl_pointer_axis_source {
|
||||||
WL_POINTER_AXIS_SOURCE_FINGER = 1,
|
WL_POINTER_AXIS_SOURCE_FINGER = 1,
|
||||||
/**
|
/**
|
||||||
* continuous coordinate space
|
* 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,
|
WL_POINTER_AXIS_SOURCE_CONTINUOUS = 2,
|
||||||
/**
|
/**
|
||||||
* a physical wheel tilt
|
* 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
|
* @since 6
|
||||||
*/
|
*/
|
||||||
WL_POINTER_AXIS_SOURCE_WHEEL_TILT = 3,
|
WL_POINTER_AXIS_SOURCE_WHEEL_TILT = 3,
|
||||||
|
|
|
||||||
|
|
@ -3304,16 +3304,6 @@ enum wl_pointer_axis {
|
||||||
* from a "finger" source may be in a smooth coordinate space with
|
* from a "finger" source may be in a smooth coordinate space with
|
||||||
* kinetic scrolling whereas a "wheel" source may be in discrete steps
|
* kinetic scrolling whereas a "wheel" source may be in discrete steps
|
||||||
* of a number of lines.
|
* 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 {
|
enum wl_pointer_axis_source {
|
||||||
/**
|
/**
|
||||||
|
|
@ -3326,10 +3316,20 @@ enum wl_pointer_axis_source {
|
||||||
WL_POINTER_AXIS_SOURCE_FINGER = 1,
|
WL_POINTER_AXIS_SOURCE_FINGER = 1,
|
||||||
/**
|
/**
|
||||||
* continuous coordinate space
|
* 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,
|
WL_POINTER_AXIS_SOURCE_CONTINUOUS = 2,
|
||||||
/**
|
/**
|
||||||
* a physical wheel tilt
|
* 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
|
* @since 6
|
||||||
*/
|
*/
|
||||||
WL_POINTER_AXIS_SOURCE_WHEEL_TILT = 3,
|
WL_POINTER_AXIS_SOURCE_WHEEL_TILT = 3,
|
||||||
|
|
|
||||||
|
|
@ -1980,21 +1980,23 @@
|
||||||
from a "finger" source may be in a smooth coordinate space with
|
from a "finger" source may be in a smooth coordinate space with
|
||||||
kinetic scrolling whereas a "wheel" source may be in discrete steps
|
kinetic scrolling whereas a "wheel" source may be in discrete steps
|
||||||
of a number of lines.
|
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>
|
</description>
|
||||||
<entry name="wheel" value="0" summary="a physical wheel rotation" />
|
<entry name="wheel" value="0" summary="a physical wheel rotation" />
|
||||||
<entry name="finger" value="1" summary="finger on a touch surface" />
|
<entry name="finger" value="1" summary="finger on a touch surface" />
|
||||||
<entry name="continuous" value="2" summary="continuous coordinate space"/>
|
<entry name="continuous" value="2">
|
||||||
<entry name="wheel_tilt" value="3" summary="a physical wheel tilt" since="6"/>
|
<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>
|
</enum>
|
||||||
|
|
||||||
<event name="axis_source" since="5">
|
<event name="axis_source" since="5">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue