Commit 493eda33 authored by Peter Hutterer's avatar Peter Hutterer Committed by Pekka Paalanen

tests: sync example.xml with wayland.xml

These are the protocol.xml changes from:
66a26aeb: protocol: Remove inconsistent line breaks
a26ed094: protocol: indentation fixes
6a18a877: protocol: Extend wl_touch with touchpoint shape and orientation

and a few other, smaller ones.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone's avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: 's avatarYong Bakos <ybakos@humanoriented.com>
Tested-by: 's avatarYong Bakos <ybakos@humanoriented.com>
Reviewed-by: Pekka Paalanen's avatarPekka Paalanen <pekka.paalanen@collabora.co.uk>
parent 721e0b4a
...@@ -108,8 +108,8 @@ extern const struct wl_interface wl_display_interface; ...@@ -108,8 +108,8 @@ extern const struct wl_interface wl_display_interface;
* @page page_iface_wl_registry wl_registry * @page page_iface_wl_registry wl_registry
* @section page_iface_wl_registry_desc Description * @section page_iface_wl_registry_desc Description
* *
* The global registry object. The server has a number of global * The singleton global registry object. The server has a number of
* objects that are available to all clients. These objects * global objects that are available to all clients. These objects
* typically represent an actual object in the server (for example, * typically represent an actual object in the server (for example,
* an input device) or they are singleton objects that provide * an input device) or they are singleton objects that provide
* extension functionality. * extension functionality.
...@@ -134,8 +134,8 @@ extern const struct wl_interface wl_display_interface; ...@@ -134,8 +134,8 @@ extern const struct wl_interface wl_display_interface;
/** /**
* @defgroup iface_wl_registry The wl_registry interface * @defgroup iface_wl_registry The wl_registry interface
* *
* The global registry object. The server has a number of global * The singleton global registry object. The server has a number of
* objects that are available to all clients. These objects * global objects that are available to all clients. These objects
* typically represent an actual object in the server (for example, * typically represent an actual object in the server (for example,
* an input device) or they are singleton objects that provide * an input device) or they are singleton objects that provide
* extension functionality. * extension functionality.
...@@ -220,7 +220,7 @@ extern const struct wl_interface wl_shm_pool_interface; ...@@ -220,7 +220,7 @@ extern const struct wl_interface wl_shm_pool_interface;
* @page page_iface_wl_shm wl_shm * @page page_iface_wl_shm wl_shm
* @section page_iface_wl_shm_desc Description * @section page_iface_wl_shm_desc Description
* *
* A global singleton object that provides support for shared * A singleton global object that provides support for shared
* memory. * memory.
* *
* Clients can create wl_shm_pool objects using the create_pool * Clients can create wl_shm_pool objects using the create_pool
...@@ -235,7 +235,7 @@ extern const struct wl_interface wl_shm_pool_interface; ...@@ -235,7 +235,7 @@ extern const struct wl_interface wl_shm_pool_interface;
/** /**
* @defgroup iface_wl_shm The wl_shm interface * @defgroup iface_wl_shm The wl_shm interface
* *
* A global singleton object that provides support for shared * A singleton global object that provides support for shared
* memory. * memory.
* *
* Clients can create wl_shm_pool objects using the create_pool * Clients can create wl_shm_pool objects using the create_pool
...@@ -4038,7 +4038,7 @@ enum wl_pointer_axis { ...@@ -4038,7 +4038,7 @@ enum wl_pointer_axis {
*/ */
enum wl_pointer_axis_source { enum wl_pointer_axis_source {
/** /**
* a physical wheel * a physical wheel rotation
*/ */
WL_POINTER_AXIS_SOURCE_WHEEL = 0, WL_POINTER_AXIS_SOURCE_WHEEL = 0,
/** /**
...@@ -4115,6 +4115,14 @@ struct wl_pointer_listener { ...@@ -4115,6 +4115,14 @@ struct wl_pointer_listener {
* The location of the click is given by the last motion or enter * The location of the click is given by the last motion or enter
* event. The time argument is a timestamp with millisecond * event. The time argument is a timestamp with millisecond
* granularity, with an undefined base. * granularity, with an undefined base.
*
* The button is a button code as defined in the Linux kernel's
* linux/input-event-codes.h header file, e.g. BTN_LEFT.
*
* Any 16-bit button code value is reserved for future additions to
* the kernel's event code list. All other button codes above
* 0xFFFF are currently undefined but may be used in future
* versions of this protocol.
* @param serial serial number of the button event * @param serial serial number of the button event
* @param time timestamp with millisecond granularity * @param time timestamp with millisecond granularity
* @param button button that produced the event * @param button button that produced the event
...@@ -4731,7 +4739,14 @@ struct wl_touch_listener { ...@@ -4731,7 +4739,14 @@ struct wl_touch_listener {
/** /**
* end of touch frame event * end of touch frame event
* *
* Indicates the end of a contact point list. * Indicates the end of a set of events that logically belong
* together. A client is expected to accumulate the data in all
* events within the frame before proceeding.
*
* A wl_touch.frame terminates at least one event but otherwise no
* guarantee is provided about the set of events within a frame. A
* client must assume that any state not updated in a frame is
* unchanged from the previously known state.
*/ */
void (*frame)(void *data, void (*frame)(void *data,
struct wl_touch *wl_touch); struct wl_touch *wl_touch);
...@@ -4747,6 +4762,79 @@ struct wl_touch_listener { ...@@ -4747,6 +4762,79 @@ struct wl_touch_listener {
*/ */
void (*cancel)(void *data, void (*cancel)(void *data,
struct wl_touch *wl_touch); struct wl_touch *wl_touch);
/**
* update shape of touch point
*
* Sent when a touchpoint has changed its shape.
*
* This event does not occur on its own. It is sent before a
* wl_touch.frame event and carries the new shape information for
* any previously reported, or new touch points of that frame.
*
* Other events describing the touch point such as wl_touch.down,
* wl_touch.motion or wl_touch.orientation may be sent within the
* same wl_touch.frame. A client should treat these events as a
* single logical touch point update. The order of wl_touch.shape,
* wl_touch.orientation and wl_touch.motion is not guaranteed. A
* wl_touch.down event is guaranteed to occur before the first
* wl_touch.shape event for this touch ID but both events may occur
* within the same wl_touch.frame.
*
* A touchpoint shape is approximated by an ellipse through the
* major and minor axis length. The major axis length describes the
* longer diameter of the ellipse, while the minor axis length
* describes the shorter diameter. Major and minor are orthogonal
* and both are specified in surface-local coordinates. The center
* of the ellipse is always at the touchpoint location as reported
* by wl_touch.down or wl_touch.move.
*
* 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 if it did not receive this event.
* @param id the unique ID of this touch point
* @param major length of the major axis in surface-local coordinates
* @param minor length of the minor axis in surface-local coordinates
* @since 6
*/
void (*shape)(void *data,
struct wl_touch *wl_touch,
int32_t id,
wl_fixed_t major,
wl_fixed_t minor);
/**
* update orientation of touch point
*
* Sent when a touchpoint has changed its orientation.
*
* This event does not occur on its own. It is sent before a
* wl_touch.frame event and carries the new shape information for
* any previously reported, or new touch points of that frame.
*
* Other events describing the touch point such as wl_touch.down,
* wl_touch.motion or wl_touch.shape may be sent within the same
* wl_touch.frame. A client should treat these events as a single
* logical touch point update. The order of wl_touch.shape,
* wl_touch.orientation and wl_touch.motion is not guaranteed. A
* wl_touch.down event is guaranteed to occur before the first
* wl_touch.orientation event for this touch ID but both events may
* occur within the same wl_touch.frame.
*
* The orientation describes the clockwise angle of a touchpoint's
* major axis to the positive surface y-axis and is normalized to
* the -180 to +180 degree range. The granularity of orientation
* depends on the touch device, some devices only support binary
* rotation values between 0 and 90 degrees.
*
* This event is only sent by the compositor if the touch device
* supports orientation reports.
* @param id the unique ID of this touch point
* @param orientation angle between major axis and positive surface y-axis in degrees
* @since 6
*/
void (*orientation)(void *data,
struct wl_touch *wl_touch,
int32_t id,
wl_fixed_t orientation);
}; };
/** /**
...@@ -4782,6 +4870,14 @@ wl_touch_add_listener(struct wl_touch *wl_touch, ...@@ -4782,6 +4870,14 @@ wl_touch_add_listener(struct wl_touch *wl_touch,
* @ingroup iface_wl_touch * @ingroup iface_wl_touch
*/ */
#define WL_TOUCH_CANCEL_SINCE_VERSION 1 #define WL_TOUCH_CANCEL_SINCE_VERSION 1
/**
* @ingroup iface_wl_touch
*/
#define WL_TOUCH_SHAPE_SINCE_VERSION 6
/**
* @ingroup iface_wl_touch
*/
#define WL_TOUCH_ORIENTATION_SINCE_VERSION 6
/** /**
* @ingroup iface_wl_touch * @ingroup iface_wl_touch
......
...@@ -383,7 +383,7 @@ static const struct wl_message wl_seat_events[] = { ...@@ -383,7 +383,7 @@ static const struct wl_message wl_seat_events[] = {
}; };
WL_EXPORT const struct wl_interface wl_seat_interface = { WL_EXPORT const struct wl_interface wl_seat_interface = {
"wl_seat", 5, "wl_seat", 6,
4, wl_seat_requests, 4, wl_seat_requests,
2, wl_seat_events, 2, wl_seat_events,
}; };
...@@ -406,7 +406,7 @@ static const struct wl_message wl_pointer_events[] = { ...@@ -406,7 +406,7 @@ static const struct wl_message wl_pointer_events[] = {
}; };
WL_EXPORT const struct wl_interface wl_pointer_interface = { WL_EXPORT const struct wl_interface wl_pointer_interface = {
"wl_pointer", 5, "wl_pointer", 6,
2, wl_pointer_requests, 2, wl_pointer_requests,
9, wl_pointer_events, 9, wl_pointer_events,
}; };
...@@ -425,7 +425,7 @@ static const struct wl_message wl_keyboard_events[] = { ...@@ -425,7 +425,7 @@ static const struct wl_message wl_keyboard_events[] = {
}; };
WL_EXPORT const struct wl_interface wl_keyboard_interface = { WL_EXPORT const struct wl_interface wl_keyboard_interface = {
"wl_keyboard", 5, "wl_keyboard", 6,
1, wl_keyboard_requests, 1, wl_keyboard_requests,
6, wl_keyboard_events, 6, wl_keyboard_events,
}; };
...@@ -440,12 +440,14 @@ static const struct wl_message wl_touch_events[] = { ...@@ -440,12 +440,14 @@ static const struct wl_message wl_touch_events[] = {
{ "motion", "uiff", types + 0 }, { "motion", "uiff", types + 0 },
{ "frame", "", types + 0 }, { "frame", "", types + 0 },
{ "cancel", "", types + 0 }, { "cancel", "", types + 0 },
{ "shape", "6iff", types + 0 },
{ "orientation", "6if", types + 0 },
}; };
WL_EXPORT const struct wl_interface wl_touch_interface = { WL_EXPORT const struct wl_interface wl_touch_interface = {
"wl_touch", 5, "wl_touch", 6,
1, wl_touch_requests, 1, wl_touch_requests,
5, wl_touch_events, 7, wl_touch_events,
}; };
static const struct wl_message wl_output_requests[] = { static const struct wl_message wl_output_requests[] = {
......
...@@ -111,8 +111,8 @@ extern const struct wl_interface wl_display_interface; ...@@ -111,8 +111,8 @@ extern const struct wl_interface wl_display_interface;
* @page page_iface_wl_registry wl_registry * @page page_iface_wl_registry wl_registry
* @section page_iface_wl_registry_desc Description * @section page_iface_wl_registry_desc Description
* *
* The global registry object. The server has a number of global * The singleton global registry object. The server has a number of
* objects that are available to all clients. These objects * global objects that are available to all clients. These objects
* typically represent an actual object in the server (for example, * typically represent an actual object in the server (for example,
* an input device) or they are singleton objects that provide * an input device) or they are singleton objects that provide
* extension functionality. * extension functionality.
...@@ -137,8 +137,8 @@ extern const struct wl_interface wl_display_interface; ...@@ -137,8 +137,8 @@ extern const struct wl_interface wl_display_interface;
/** /**
* @defgroup iface_wl_registry The wl_registry interface * @defgroup iface_wl_registry The wl_registry interface
* *
* The global registry object. The server has a number of global * The singleton global registry object. The server has a number of
* objects that are available to all clients. These objects * global objects that are available to all clients. These objects
* typically represent an actual object in the server (for example, * typically represent an actual object in the server (for example,
* an input device) or they are singleton objects that provide * an input device) or they are singleton objects that provide
* extension functionality. * extension functionality.
...@@ -223,7 +223,7 @@ extern const struct wl_interface wl_shm_pool_interface; ...@@ -223,7 +223,7 @@ extern const struct wl_interface wl_shm_pool_interface;
* @page page_iface_wl_shm wl_shm * @page page_iface_wl_shm wl_shm
* @section page_iface_wl_shm_desc Description * @section page_iface_wl_shm_desc Description
* *
* A global singleton object that provides support for shared * A singleton global object that provides support for shared
* memory. * memory.
* *
* Clients can create wl_shm_pool objects using the create_pool * Clients can create wl_shm_pool objects using the create_pool
...@@ -238,7 +238,7 @@ extern const struct wl_interface wl_shm_pool_interface; ...@@ -238,7 +238,7 @@ extern const struct wl_interface wl_shm_pool_interface;
/** /**
* @defgroup iface_wl_shm The wl_shm interface * @defgroup iface_wl_shm The wl_shm interface
* *
* A global singleton object that provides support for shared * A singleton global object that provides support for shared
* memory. * memory.
* *
* Clients can create wl_shm_pool objects using the create_pool * Clients can create wl_shm_pool objects using the create_pool
...@@ -3247,7 +3247,7 @@ enum wl_pointer_axis { ...@@ -3247,7 +3247,7 @@ enum wl_pointer_axis {
*/ */
enum wl_pointer_axis_source { enum wl_pointer_axis_source {
/** /**
* a physical wheel * a physical wheel rotation
*/ */
WL_POINTER_AXIS_SOURCE_WHEEL = 0, WL_POINTER_AXIS_SOURCE_WHEEL = 0,
/** /**
...@@ -3699,6 +3699,8 @@ struct wl_touch_interface { ...@@ -3699,6 +3699,8 @@ struct wl_touch_interface {
#define WL_TOUCH_MOTION 2 #define WL_TOUCH_MOTION 2
#define WL_TOUCH_FRAME 3 #define WL_TOUCH_FRAME 3
#define WL_TOUCH_CANCEL 4 #define WL_TOUCH_CANCEL 4
#define WL_TOUCH_SHAPE 5
#define WL_TOUCH_ORIENTATION 6
/** /**
* @ingroup iface_wl_touch * @ingroup iface_wl_touch
...@@ -3720,6 +3722,14 @@ struct wl_touch_interface { ...@@ -3720,6 +3722,14 @@ struct wl_touch_interface {
* @ingroup iface_wl_touch * @ingroup iface_wl_touch
*/ */
#define WL_TOUCH_CANCEL_SINCE_VERSION 1 #define WL_TOUCH_CANCEL_SINCE_VERSION 1
/**
* @ingroup iface_wl_touch
*/
#define WL_TOUCH_SHAPE_SINCE_VERSION 6
/**
* @ingroup iface_wl_touch
*/
#define WL_TOUCH_ORIENTATION_SINCE_VERSION 6
/** /**
* @ingroup iface_wl_touch * @ingroup iface_wl_touch
...@@ -3794,6 +3804,33 @@ wl_touch_send_cancel(struct wl_resource *resource_) ...@@ -3794,6 +3804,33 @@ wl_touch_send_cancel(struct wl_resource *resource_)
wl_resource_post_event(resource_, WL_TOUCH_CANCEL); wl_resource_post_event(resource_, WL_TOUCH_CANCEL);
} }
/**
* @ingroup iface_wl_touch
* Sends an shape event to the client owning the resource.
* @param resource_ The client's resource
* @param id the unique ID of this touch point
* @param major length of the major axis in surface-local coordinates
* @param minor length of the minor axis in surface-local coordinates
*/
static inline void
wl_touch_send_shape(struct wl_resource *resource_, int32_t id, wl_fixed_t major, wl_fixed_t minor)
{
wl_resource_post_event(resource_, WL_TOUCH_SHAPE, id, major, minor);
}
/**
* @ingroup iface_wl_touch
* Sends an orientation event to the client owning the resource.
* @param resource_ The client's resource
* @param id the unique ID of this touch point
* @param orientation angle between major axis and positive surface y-axis in degrees
*/
static inline void
wl_touch_send_orientation(struct wl_resource *resource_, int32_t id, wl_fixed_t orientation)
{
wl_resource_post_event(resource_, WL_TOUCH_ORIENTATION, id, orientation);
}
#ifndef WL_OUTPUT_SUBPIXEL_ENUM #ifndef WL_OUTPUT_SUBPIXEL_ENUM
#define WL_OUTPUT_SUBPIXEL_ENUM #define WL_OUTPUT_SUBPIXEL_ENUM
/** /**
......
...@@ -104,8 +104,8 @@ ...@@ -104,8 +104,8 @@
<interface name="wl_registry" version="1"> <interface name="wl_registry" version="1">
<description summary="global registry object"> <description summary="global registry object">
The global registry object. The server has a number of global The singleton global registry object. The server has a number of
objects that are available to all clients. These objects global objects that are available to all clients. These objects
typically represent an actual object in the server (for example, typically represent an actual object in the server (for example,
an input device) or they are singleton objects that provide an input device) or they are singleton objects that provide
extension functionality. extension functionality.
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<request name="bind"> <request name="bind">
<description summary="bind an object to the display"> <description summary="bind an object to the display">
Binds a new, client-created object to the server using the Binds a new, client-created object to the server using the
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="bounded object"/>
...@@ -139,9 +139,9 @@ ...@@ -139,9 +139,9 @@
<description summary="announce global object"> <description summary="announce global object">
Notify the client of global objects. Notify the client of global objects.
The event notifies the client that a global object with The event notifies the client that a global object with
the given name is now available, and it implements the the given name is now available, and it implements the
given version of the given interface. given version of the given interface.
</description> </description>
<arg name="name" type="uint" summary="numeric name of the global object"/> <arg name="name" type="uint" summary="numeric name of the global object"/>
<arg name="interface" type="string" summary="interface implemented by the object"/> <arg name="interface" type="string" summary="interface implemented by the object"/>
...@@ -152,10 +152,10 @@ ...@@ -152,10 +152,10 @@
<description summary="announce removal of global object"> <description summary="announce removal of global object">
Notify the client of removed global objects. Notify the client of removed global objects.
This event notifies the client that the global identified This event notifies the client that the global identified
by name is no longer available. If the client bound to by name is no longer available. If the client bound to
the global using the bind request, the client should now the global using the bind request, the client should now
destroy that object. destroy that object.
The object remains valid and requests to the object will be The object remains valid and requests to the object will be
ignored until the client destroys it, to avoid races between ignored until the client destroys it, to avoid races between
...@@ -226,7 +226,6 @@ ...@@ -226,7 +226,6 @@
so it is valid to destroy the pool immediately after creating so it is valid to destroy the pool immediately after creating
a buffer from it. a buffer from it.
</description> </description>
<arg name="id" type="new_id" interface="wl_buffer" summary="buffer to create"/> <arg name="id" type="new_id" interface="wl_buffer" summary="buffer to create"/>
<arg name="offset" type="int" summary="buffer byte offset within the pool"/> <arg name="offset" type="int" summary="buffer byte offset within the pool"/>
<arg name="width" type="int" summary="buffer width, in pixels"/> <arg name="width" type="int" summary="buffer width, in pixels"/>
...@@ -252,14 +251,13 @@ ...@@ -252,14 +251,13 @@
created, but using the new size. This request can only be created, but using the new size. This request can only be
used to make the pool bigger. used to make the pool bigger.
</description> </description>
<arg name="size" type="int" summary="new size of the pool, in bytes"/> <arg name="size" type="int" summary="new size of the pool, in bytes"/>
</request> </request>
</interface> </interface>
<interface name="wl_shm" version="1"> <interface name="wl_shm" version="1">
<description summary="shared memory support"> <description summary="shared memory support">
A global singleton object that provides support for shared A singleton global object that provides support for shared
memory. memory.
Clients can create wl_shm_pool objects using the create_pool Clients can create wl_shm_pool objects using the create_pool
...@@ -357,9 +355,8 @@ ...@@ -357,9 +355,8 @@
The pool can be used to create shared memory based buffer The pool can be used to create shared memory based buffer
objects. The server will mmap size bytes of the passed file objects. The server will mmap size bytes of the passed file
descriptor, to use as backing memory for the pool. descriptor, to use as backing memory for the pool.
</description> </description>
<arg name="id" type="new_id" interface="wl_shm_pool" summary="pool to create"/> <arg name="id" type="new_id" interface="wl_shm_pool" summary="pool to create"/>
<arg name="fd" type="fd" summary="file descriptor for the pool"/> <arg name="fd" type="fd" summary="file descriptor for the pool"/>
<arg name="size" type="int" summary="pool size, in bytes"/> <arg name="size" type="int" summary="pool size, in bytes"/>
...@@ -449,7 +446,6 @@ ...@@ -449,7 +446,6 @@
wl_data_source.cancelled. Clients may still use this event in wl_data_source.cancelled. Clients may still use this event in
conjunction with wl_data_source.action for feedback. conjunction with wl_data_source.action for feedback.
</description> </description>
<arg name="serial" type="uint" summary="serial number of the accept request"/> <arg name="serial" type="uint" summary="serial number of the accept request"/>
<arg name="mime_type" type="string" allow-null="true" summary="mime type accepted by the client"/> <arg name="mime_type" type="string" allow-null="true" summary="mime type accepted by the client"/>
</request> </request>
...@@ -487,7 +483,6 @@ ...@@ -487,7 +483,6 @@
Sent immediately after creating the wl_data_offer object. One Sent immediately after creating the wl_data_offer object. One
event per offered mime type. event per offered mime type.
</description> </description>
<arg name="mime_type" type="string" summary="offered mime type"/> <arg name="mime_type" type="string" summary="offered mime type"/>
</event> </event>
...@@ -635,7 +630,6 @@ ...@@ -635,7 +630,6 @@
Used for feedback during drag-and-drop. Used for feedback during drag-and-drop.
</description> </description>
<arg name="mime_type" type="string" allow-null="true" summary="mime type accepted by the target"/> <arg name="mime_type" type="string" allow-null="true" summary="mime type accepted by the target"/>
</event> </event>
...@@ -645,7 +639,6 @@ ...@@ -645,7 +639,6 @@
specified mime type over the passed file descriptor, then specified mime type over the passed file descriptor, then
close it. close it.
</description> </description>
<arg name="mime_type" type="string" summary="mime type for the data"/> <arg name="mime_type" type="string" summary="mime type for the data"/>
<arg name="fd" type="fd" summary="file descriptor for the data"/> <arg name="fd" type="fd" summary="file descriptor for the data"/>
</event> </event>
...@@ -823,7 +816,6 @@ ...@@ -823,7 +816,6 @@
object will send out data_offer.offer events to describe the object will send out data_offer.offer events to describe the
mime types it offers. mime types it offers.
</description> </description>
<arg name="id" type="new_id" interface="wl_data_offer" summary="the new data_offer object"/> <arg name="id" type="new_id" interface="wl_data_offer" summary="the new data_offer object"/>
</event> </event>
...@@ -834,7 +826,6 @@ ...@@ -834,7 +826,6 @@
enter time is provided by the x and y arguments, in surface-local enter time is provided by the x and y arguments, in surface-local
coordinates. coordinates.
</description> </description>
<arg name="serial" type="uint" summary="serial number of the enter event"/> <arg name="serial" type="uint" summary="serial number of the enter event"/>
<arg name="surface" type="object" interface="wl_surface" summary="client surface entered"/> <arg name="surface" type="object" interface="wl_surface" summary="client surface entered"/>
<arg name="x" type="fixed" summary="surface-local x coordinate"/> <arg name="x" type="fixed" summary="surface-local x coordinate"/>
...@@ -924,14 +915,14 @@ ...@@ -924,14 +915,14 @@
<request name="create_data_source"> <request name="create_data_source">
<description summary="create a new data source"> <description summary="create a new data source">
Create a new data source. Create a new data source.
</description> </description>
<arg name="id" type="new_id" interface="wl_data_source" summary="data source to create"/> <arg name="id" type="new_id" interface="wl_data_source" summary="data source to create"/>
</request> </request>
<request name="get_data_device"> <request name="get_data_device">
<description summary="create a new data device"> <description summary="create a new data device">
Create a new data device for a given seat. Create a new data device for a given seat.
</description> </description>
<arg name="id" type="new_id" interface="wl_data_device" summary="data device to create"/> <arg name="id" type="new_id" interface="wl_data_device" summary="data device to create"/>
<arg name="seat" type="object" interface="wl_seat" summary="seat associated with the data device"/> <arg name="seat" type="object" interface="wl_seat" summary="seat associated with the data device"/>
...@@ -1090,7 +1081,6 @@ ...@@ -1090,7 +1081,6 @@
The flags argument controls details of the transient behaviour. The flags argument controls details of the transient behaviour.
</description> </description>
<arg name="parent" type="object" interface="wl_surface" summary="parent surface"/> <arg name="parent" type="object" interface="wl_surface" summary="parent surface"/>
<arg name="x" type="int" summary="surface-local x coordinate"/> <arg name="x" type="int" summary="surface-local x coordinate"/>
<arg name="y" type="int" summary="surface-local y coordinate"/> <arg name="y" type="int" summary="surface-local y coordinate"/>
...@@ -1173,7 +1163,6 @@ ...@@ -1173,7 +1163,6 @@
corner of the surface relative to the upper left corner of the corner of the surface relative to the upper left corner of the
parent surface, in surface-local coordinates. parent surface, in surface-local coordinates.
</description> </description>
<arg name="seat" type="object" interface="wl_seat" summary="seat whose pointer is used"/> <arg name="seat" type="object" interface="wl_seat" summary="seat whose pointer is used"/>
<arg name="serial" type="uint" summary="serial number of the implicit grab on the pointer"/> <arg name="serial" type="uint" summary="serial number of the implicit grab on the pointer"/>
<arg name="parent" type="object" interface="wl_surface" summary="parent surface"/> <arg name="parent" type="object" interface="wl_surface" summary="parent surface"/>
...@@ -1260,7 +1249,6 @@ ...@@ -1260,7 +1249,6 @@
The width and height arguments specify the size of the window The width and height arguments specify the size of the window
in surface-local coordinates. in surface-local coordinates.
</description> </description>
<arg name="edges" type="uint" enum="resize" summary="how the surface was resized"/> <arg name="edges" type="uint" enum="resize" summary="how the surface was resized"/>
<arg name="width" type="int" summary="new width of the surface"/> <arg name="width" type="int" summary="new width of the surface"/>
<arg name="height" type="int" summary="new height of the surface"/> <arg name="height" type="int" summary="new height of the surface"/>
...@@ -1320,7 +1308,7 @@ ...@@ -1320,7 +1308,7 @@
<enum name="error"> <enum name="error">
<description summary="wl_surface error values"> <description summary="wl_surface error values">
These errors can be emitted in response to wl_surface requests. These errors can be emitted in response to wl_surface requests.
</description> </description>
<entry name="invalid_scale" value="0" summary="buffer scale value is invalid"/> <entry name="invalid_scale" value="0" summary="buffer scale value is invalid"/>
<entry name="invalid_transform" value="1" summary="buffer transform value is invalid"/> <entry name="invalid_transform" value="1" summary="buffer transform value is invalid"/>
...@@ -1374,7 +1362,6 @@ ...@@ -1374,7 +1362,6 @@
If wl_surface.attach is sent with a NULL wl_buffer, the If wl_surface.attach is sent with a NULL wl_buffer, the
following wl_surface.commit will remove the surface content. following wl_surface.commit will remove the surface content.
</description> </description>
<arg name="buffer" type="object" interface="wl_buffer" allow-null="true" <arg name="buffer" type="object" interface="wl_buffer" allow-null="true"
summary="buffer of surface contents"/> summary="buffer of surface contents"/>
<arg name="x" type="int" summary="surface-local x coordinate"/> <arg name="x" type="int" summary="surface-local x coordinate"/>
...@@ -1405,7 +1392,6 @@ ...@@ -1405,7 +1392,6 @@
which uses buffer coordinates instead of surface coordinates, which uses buffer coordinates instead of surface coordinates,
and is probably the preferred and intuitive way of doing this. and is probably the preferred and intuitive way of doing this.
</description> </description>
<arg name="x" type="int" summary="surface-local x coordinate"/> <arg name="x" type="int" summary="surface-local x coordinate"/>
<arg name="y" type="int" summary="surface-local y coordinate"/> <arg name="y" type="int" summary="surface-local y coordinate"/>
<arg name="width" type="int" summary="width of damage rectangle"/> <arg name="width" type="int" summary="width of damage rectangle"/>
...@@ -1447,7 +1433,6 @@ ...@@ -1447,7 +1433,6 @@
The callback_data passed in the callback is the current time, in The callback_data passed in the callback is the current time, in
milliseconds, with an undefined base. milliseconds, with an undefined base.
</description> </description>
<arg name="callback" type="new_id" interface="wl_callback" summary="callback object for the frame request"/> <arg name="callback" type="new_id" interface="wl_callback" summary="callback object for the frame request"/>
</request> </request>
...@@ -1478,7 +1463,6 @@ ...@@ -1478,7 +1463,6 @@
destroyed immediately. A NULL wl_region causes the pending opaque destroyed immediately. A NULL wl_region causes the pending opaque
region to be set to empty. region to be set to empty.
</description> </description>
<arg name="region" type="object" interface="wl_region" allow-null="true" <arg name="region" type="object" interface="wl_region" allow-null="true"
summary="opaque region of the surface"/> summary="opaque region of the surface"/>
</request> </request>
...@@ -1508,7 +1492,6 @@ ...@@ -1508,7 +1492,6 @@
immediately. A NULL wl_region causes the input region to be set immediately. A NULL wl_region causes the input region to be set
to infinite. to infinite.
</description> </description>
<arg name="region" type="object" interface="wl_region" allow-null="true" <arg name="region" type="object" interface="wl_region" allow-null="true"
summary="input region of the surface"/> summary="input region of the surface"/>
</request> </request>
...@@ -1661,7 +1644,6 @@ ...@@ -1661,7 +1644,6 @@
two requests separately and only transform from one to the other two requests separately and only transform from one to the other
after receiving the wl_surface.commit. after receiving the wl_surface.commit.
</description> </description>
<arg name="x" type="int" summary="buffer-local x coordinate"/> <arg name="x" type="int" summary="buffer-local x coordinate"/>
<arg name="y" type="int" summary="buffer-local y coordinate"/> <arg name="y" type="int" summary="buffer-local y coordinate"/>
<arg name="width" type="int" summary="width of damage rectangle"/> <arg name="width" type="int" summary="width of damage rectangle"/>
...@@ -1669,7 +1651,7 @@ ...@@ -1669,7 +1651,7 @@
</request> </request>
</interface> </interface>