diff options
author | Kristian Høgsberg <krh@bitplanet.net> | 2012-05-10 12:09:56 -0400 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-05-10 12:09:56 -0400 |
commit | e8aa047259d4a17608f16359cdbef77f9d3c9668 (patch) | |
tree | 091b9ed863aa8a44dd2164551ba931b95a7e97e6 | |
parent | 0155c28e8cb24e6d4b6585321ea219752b62fdbc (diff) |
protocol: Back out accidentally committed wl_seat changes
-rw-r--r-- | protocol/wayland.xml | 100 |
1 files changed, 38 insertions, 62 deletions
diff --git a/protocol/wayland.xml b/protocol/wayland.xml index c52202b..67ece1b 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -696,29 +696,15 @@ </event> </interface> - <interface name="wl_seat" version="1"> - <description summary="seat"> - A group of keyboards, pointer (mice, for example) and touch - devices . This object is published as a global during start up, + <interface name="wl_input_device" version="1"> + <description summary="input device group"> + A group of keyboards and pointer devices (mice, for + example). This object is published as a global during start up, or when such a device is hot plugged. A input_device group typically has a pointer and maintains a keyboard_focus and a pointer_focus. </description> - <event name="pointer"> - <arg name="name" type="uint"/> - </event> - - <event name="keyboard"> - <arg name="name" type="uint"/> - </event> - - <event name="touch"> - <arg name="name" type="uint"/> - </event> - </interface> - - <interface name="wl_pointer"> <request name="attach"> <description summary="set the pointer image"> Set the pointer's image. This request only takes effect if @@ -732,27 +718,6 @@ <arg name="hotspot_y" type="int"/> </request> - <event name="enter"> - <description summary="enter event"> - Notification that this input device's pointer is focused on - certain surface. When an input_device enters a surface, the - pointer image is undefined and a client should respond to this - event by setting an appropriate pointer image. - </description> - - <arg name="serial" type="uint"/> - <arg name="surface" type="object" interface="wl_surface"/> - <arg name="surface_x" type="fixed"/> - <arg name="surface_y" type="fixed"/> - </event> - - <event name="leave"> - <description summary="leave event"> - </description> - <arg name="serial" type="uint"/> - <arg name="surface" type="object" interface="wl_surface"/> - </event> - <event name="motion"> <description summary="pointer motion event"> Notification of pointer location change. The arguments surface_[xy] @@ -791,40 +756,51 @@ <arg name="axis" type="uint"/> <arg name="value" type="int"/> </event> - </interface> - <interface name="wl_keyboard" version="1"> - <description summary="keyboard input device"> - </description> + <event name="key"> + <description summary="key event"> + A key was pressed or released. + </description> - <event name="enter"> <arg name="serial" type="uint"/> - <arg name="surface" type="object" interface="wl_surface"/> - <arg name="keys" type="array"/> + <arg name="time" type="uint"/> + <arg name="key" type="uint"/> + <arg name="state" type="uint"/> </event> - <event name="leave"> + <event name="pointer_enter"> + <description summary="pointer enter event"> + Notification that this input device's pointer is focused on + certain surface. When an input_device enters a surface, the + pointer image is undefined and a client should respond to this + event by setting an appropriate pointer image. + </description> + <arg name="serial" type="uint"/> <arg name="surface" type="object" interface="wl_surface"/> + <arg name="surface_x" type="fixed"/> + <arg name="surface_y" type="fixed"/> </event> - <event name="key"> - <description summary="key event"> - A key was pressed or released. + <event name="pointer_leave"> + <description summary="pointer leave event"> </description> + <arg name="serial" type="uint"/> + <arg name="surface" type="object" interface="wl_surface"/> + </event> + <event name="keyboard_enter"> <arg name="serial" type="uint"/> - <arg name="time" type="uint"/> - <arg name="key" type="uint"/> - <arg name="state" type="uint"/> + <arg name="surface" type="object" interface="wl_surface"/> + <arg name="keys" type="array"/> </event> - </interface> - <interface name="wl_touch" version="1"> - <description summary="touch screen input device"> - </description> + <event name="keyboard_leave"> + <arg name="serial" type="uint"/> + <arg name="surface" type="object" interface="wl_surface"/> + </event> - <event name="down"> + <event name="touch_down"> <arg name="serial" type="uint"/> <arg name="time" type="uint"/> <arg name="surface" type="object" interface="wl_surface"/> @@ -833,26 +809,26 @@ <arg name="y" type="fixed" /> </event> - <event name="up"> + <event name="touch_up"> <arg name="serial" type="uint"/> <arg name="time" type="uint"/> <arg name="id" type="int" /> </event> - <event name="motion"> + <event name="touch_motion"> <arg name="time" type="uint"/> <arg name="id" type="int" /> <arg name="x" type="fixed" /> <arg name="y" type="fixed" /> </event> - <event name="frame"> + <event name="touch_frame"> <description summary="end of touch frame event"> Indicates the end of a contact point list. </description> </event> - <event name="cancel"> + <event name="touch_cancel"> <description summary="touch session cancelled"> Sent if the compositor decides the touch stream is a global gesture. No further events are sent to the clients from that |