Re: [PATCH wayland-protocols v5 1/4] tablet: add v2 of the tablet protocol
All 4 patches merged, with the typo mentioned by Peter and wording change suggested by Jason, as well as with Bryce and my RBs: 2009a70..24eb670 master -> master Will let it brew over the night a and make release hopefully tomorrow. Jonas On Mon, Jul 11, 2016 at 05:13:33PM +0200, Carlos Garnacho wrote: > From: Peter Hutterer > > This is a straightforward copy/paste with a _v1 -> _v2 rename. No functional > changes otherwise. > > Signed-off-by: Peter Hutterer > Reviewed-by: Jason Gerecke > Reviewed-by: Carlos Garnacho > --- > Makefile.am| 1 + > unstable/tablet/tablet-unstable-v2.xml | 641 > + > 2 files changed, 642 insertions(+) > create mode 100644 unstable/tablet/tablet-unstable-v2.xml > > diff --git a/Makefile.am b/Makefile.am > index 71d2632..9e2a029 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -8,6 +8,7 @@ unstable_protocols = > \ > unstable/relative-pointer/relative-pointer-unstable-v1.xml > \ > unstable/pointer-constraints/pointer-constraints-unstable-v1.xml > \ > unstable/tablet/tablet-unstable-v1.xml > \ > + unstable/tablet/tablet-unstable-v2.xml > \ > $(NULL) > > stable_protocols = > \ > diff --git a/unstable/tablet/tablet-unstable-v2.xml > b/unstable/tablet/tablet-unstable-v2.xml > new file mode 100644 > index 000..81e9835 > --- /dev/null > +++ b/unstable/tablet/tablet-unstable-v2.xml > @@ -0,0 +1,641 @@ > + > + > + > + > +Copyright 2014 © Stephen "Lyude" Chandler Paul > +Copyright 2015-2016 © Red Hat, Inc. > + > +Permission is hereby granted, free of charge, to any person > +obtaining a copy of this software and associated documentation files > +(the "Software"), to deal in the Software without restriction, > +including without limitation the rights to use, copy, modify, merge, > +publish, distribute, sublicense, and/or sell copies of the Software, > +and to permit persons to whom the Software is furnished to do so, > +subject to the following conditions: > + > +The above copyright notice and this permission notice (including the > +next paragraph) shall be included in all copies or substantial > +portions of the Software. > + > +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS > +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN > +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN > +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > +SOFTWARE. > + > + > + > +This description provides a high-level overview of the interplay between > +the interfaces defined this protocol. For details, see the protocol > +specification. > + > +More than one tablet may exist, and device-specifics matter. Tablets are > +not represented by a single virtual device like wl_pointer. A client > +binds to the tablet manager object which is just a proxy object. From > +that, the client requests wp_tablet_manager.get_tablet_seat(wl_seat) > +and that returns the actual interface that has all the tablets. With > +this indirection, we can avoid merging wp_tablet into the actual Wayland > +protocol, a long-term benefit. > + > +The wp_tablet_seat sends a "tablet added" event for each tablet > +connected. That event is followed by descriptive events about the > +hardware; currently that includes events for name, vid/pid and > +a wp_tablet.path event that describes a local path. This path can be > +used to uniquely identify a tablet or get more information through > +libwacom. Emulated or nested tablets can skip any of those, e.g. a > +virtual tablet may not have a vid/pid. The sequence of descriptive > +events is terminated by a wp_tablet.done event to signal that a client > +may now finalize any initialization for that tablet. > + > +Events from tablets require a tool in proximity. Tools are also managed > +by the tablet seat; a "tool added" event is sent whenever a tool is new > +to the compositor. That event is followed by a number of descriptive > +events about the hardware; currently that includes capabilities, > +hardware id and serial number, and tool type. Similar to the tablet > +interface, a wp_tablet_tool.done event is sent to terminate that initial > +sequence. > + > +Any event from a tool happens on the wp_tablet_tool interface. When the > +tool gets into proximity of the tablet, a proximity_in event is sent on > +the wp_tablet_tool
Re: [PATCH wayland-protocols v5 1/4] tablet: add v2 of the tablet protocol
On Mon, Jul 11, 2016 at 05:13:33PM +0200, Carlos Garnacho wrote: > From: Peter Hutterer > > This is a straightforward copy/paste with a _v1 -> _v2 rename. No functional > changes otherwise. > > Signed-off-by: Peter Hutterer > Reviewed-by: Jason Gerecke > Reviewed-by: Carlos Garnacho Reviewed-by: Bryce Harrington > --- > Makefile.am| 1 + > unstable/tablet/tablet-unstable-v2.xml | 641 > + > 2 files changed, 642 insertions(+) > create mode 100644 unstable/tablet/tablet-unstable-v2.xml > > diff --git a/Makefile.am b/Makefile.am > index 71d2632..9e2a029 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -8,6 +8,7 @@ unstable_protocols = > \ > unstable/relative-pointer/relative-pointer-unstable-v1.xml > \ > unstable/pointer-constraints/pointer-constraints-unstable-v1.xml > \ > unstable/tablet/tablet-unstable-v1.xml > \ > + unstable/tablet/tablet-unstable-v2.xml > \ > $(NULL) > > stable_protocols = > \ > diff --git a/unstable/tablet/tablet-unstable-v2.xml > b/unstable/tablet/tablet-unstable-v2.xml > new file mode 100644 > index 000..81e9835 > --- /dev/null > +++ b/unstable/tablet/tablet-unstable-v2.xml > @@ -0,0 +1,641 @@ > + > + > + > + > +Copyright 2014 © Stephen "Lyude" Chandler Paul > +Copyright 2015-2016 © Red Hat, Inc. > + > +Permission is hereby granted, free of charge, to any person > +obtaining a copy of this software and associated documentation files > +(the "Software"), to deal in the Software without restriction, > +including without limitation the rights to use, copy, modify, merge, > +publish, distribute, sublicense, and/or sell copies of the Software, > +and to permit persons to whom the Software is furnished to do so, > +subject to the following conditions: > + > +The above copyright notice and this permission notice (including the > +next paragraph) shall be included in all copies or substantial > +portions of the Software. > + > +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS > +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN > +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN > +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > +SOFTWARE. > + > + > + > +This description provides a high-level overview of the interplay between > +the interfaces defined this protocol. For details, see the protocol > +specification. > + > +More than one tablet may exist, and device-specifics matter. Tablets are > +not represented by a single virtual device like wl_pointer. A client > +binds to the tablet manager object which is just a proxy object. From > +that, the client requests wp_tablet_manager.get_tablet_seat(wl_seat) > +and that returns the actual interface that has all the tablets. With > +this indirection, we can avoid merging wp_tablet into the actual Wayland > +protocol, a long-term benefit. > + > +The wp_tablet_seat sends a "tablet added" event for each tablet > +connected. That event is followed by descriptive events about the > +hardware; currently that includes events for name, vid/pid and > +a wp_tablet.path event that describes a local path. This path can be > +used to uniquely identify a tablet or get more information through > +libwacom. Emulated or nested tablets can skip any of those, e.g. a > +virtual tablet may not have a vid/pid. The sequence of descriptive > +events is terminated by a wp_tablet.done event to signal that a client > +may now finalize any initialization for that tablet. > + > +Events from tablets require a tool in proximity. Tools are also managed > +by the tablet seat; a "tool added" event is sent whenever a tool is new > +to the compositor. That event is followed by a number of descriptive > +events about the hardware; currently that includes capabilities, > +hardware id and serial number, and tool type. Similar to the tablet > +interface, a wp_tablet_tool.done event is sent to terminate that initial > +sequence. > + > +Any event from a tool happens on the wp_tablet_tool interface. When the > +tool gets into proximity of the tablet, a proximity_in event is sent on > +the wp_tablet_tool interface, listing the tablet and the surface. That > +event is followed by a motion event with the coordinates. After that, > +it's the usual motion, axis, button, etc. events. The protocol's > +seriali
[PATCH wayland-protocols v5 1/4] tablet: add v2 of the tablet protocol
From: Peter Hutterer This is a straightforward copy/paste with a _v1 -> _v2 rename. No functional changes otherwise. Signed-off-by: Peter Hutterer Reviewed-by: Jason Gerecke Reviewed-by: Carlos Garnacho --- Makefile.am| 1 + unstable/tablet/tablet-unstable-v2.xml | 641 + 2 files changed, 642 insertions(+) create mode 100644 unstable/tablet/tablet-unstable-v2.xml diff --git a/Makefile.am b/Makefile.am index 71d2632..9e2a029 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,7 @@ unstable_protocols = \ unstable/relative-pointer/relative-pointer-unstable-v1.xml \ unstable/pointer-constraints/pointer-constraints-unstable-v1.xml \ unstable/tablet/tablet-unstable-v1.xml \ + unstable/tablet/tablet-unstable-v2.xml \ $(NULL) stable_protocols = \ diff --git a/unstable/tablet/tablet-unstable-v2.xml b/unstable/tablet/tablet-unstable-v2.xml new file mode 100644 index 000..81e9835 --- /dev/null +++ b/unstable/tablet/tablet-unstable-v2.xml @@ -0,0 +1,641 @@ + + + + +Copyright 2014 © Stephen "Lyude" Chandler Paul +Copyright 2015-2016 © Red Hat, Inc. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation files +(the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + + +This description provides a high-level overview of the interplay between +the interfaces defined this protocol. For details, see the protocol +specification. + +More than one tablet may exist, and device-specifics matter. Tablets are +not represented by a single virtual device like wl_pointer. A client +binds to the tablet manager object which is just a proxy object. From +that, the client requests wp_tablet_manager.get_tablet_seat(wl_seat) +and that returns the actual interface that has all the tablets. With +this indirection, we can avoid merging wp_tablet into the actual Wayland +protocol, a long-term benefit. + +The wp_tablet_seat sends a "tablet added" event for each tablet +connected. That event is followed by descriptive events about the +hardware; currently that includes events for name, vid/pid and +a wp_tablet.path event that describes a local path. This path can be +used to uniquely identify a tablet or get more information through +libwacom. Emulated or nested tablets can skip any of those, e.g. a +virtual tablet may not have a vid/pid. The sequence of descriptive +events is terminated by a wp_tablet.done event to signal that a client +may now finalize any initialization for that tablet. + +Events from tablets require a tool in proximity. Tools are also managed +by the tablet seat; a "tool added" event is sent whenever a tool is new +to the compositor. That event is followed by a number of descriptive +events about the hardware; currently that includes capabilities, +hardware id and serial number, and tool type. Similar to the tablet +interface, a wp_tablet_tool.done event is sent to terminate that initial +sequence. + +Any event from a tool happens on the wp_tablet_tool interface. When the +tool gets into proximity of the tablet, a proximity_in event is sent on +the wp_tablet_tool interface, listing the tablet and the surface. That +event is followed by a motion event with the coordinates. After that, +it's the usual motion, axis, button, etc. events. The protocol's +serialisation means events are grouped by wp_tablet_tool.frame events. + +Two special events (that don't exist in X) are down and up. They signal +"tip touching the surface". For tablets without real proximity +detection, the sequence is: proximity_in, motion, down, frame. + +When the to
