Merge branch 'wip/tablet-tool-name' into 'main'

tablet: send the tool name along in the intial burst of events

See merge request wayland/wayland-protocols!480

stable/tablet/tablet-v2.xml

@@ -106,7 +106,7 @@
     tool was used on are removed.
   </description>
 
-  <interface name="zwp_tablet_manager_v2" version="2">
+  <interface name="zwp_tablet_manager_v2" version="3">
     <description summary="controller object for graphic tablet devices">
       An object that provides access to the graphics tablets available on this
       system. All tablets are associated with a seat, to get access to the
@@ -130,7 +130,7 @@
     </request>
   </interface>
 
-  <interface name="zwp_tablet_seat_v2" version="2">
+  <interface name="zwp_tablet_seat_v2" version="3">
     <description summary="controller object for graphic tablet devices of a seat">
       An object that provides access to the graphics tablets available on this
       seat. After binding to this interface, the compositor sends a set of
@@ -181,7 +181,7 @@
     </event>
   </interface>
 
-  <interface name="zwp_tablet_tool_v2" version="2">
+  <interface name="zwp_tablet_tool_v2" version="3">
     <description summary="a physical tablet tool">
       An object that represents a physical tool that has been, or is
       currently in use with a tablet in this seat. Each zwp_tablet_tool_v2
@@ -565,9 +565,23 @@
     <enum name="error">
       <entry name="role" value="0" summary="given wl_surface has another role"/>
     </enum>
+
+    <!-- Version 3 additions -->
+
+    <event name="name">
+      <description summary="tool name">
+	Notifies the client that the tool has a model-specific
+	name (e.g. "Wacom Pro Pen"). If the tool has no name, this event
+	is omitted.
+	
+	This event is sent in the initial burst of events before the
+	zwp_tablet_tool_v2.done event.
+      </description>
+      <arg name="name" type="string" summary="the device name"/>
+    </event>
   </interface>
 
-  <interface name="zwp_tablet_v2" version="2">
+  <interface name="zwp_tablet_v2" version="3">
     <description summary="graphics tablet device">
       The zwp_tablet_v2 interface represents one graphics tablet device. The
       tablet interface itself does not generate events; all events are
@@ -683,7 +697,7 @@
     </event>
   </interface>
 
-  <interface name="zwp_tablet_pad_ring_v2" version="2">
+  <interface name="zwp_tablet_pad_ring_v2" version="3">
     <description summary="pad ring">
       A circular interaction area, such as the touch ring on the Wacom Intuos
       Pro series tablets.
@@ -797,7 +811,7 @@
     </event>
   </interface>
 
-  <interface name="zwp_tablet_pad_strip_v2" version="2">
+  <interface name="zwp_tablet_pad_strip_v2" version="3">
     <description summary="pad strip">
       A linear interaction area, such as the strips found in Wacom Cintiq
       models.
@@ -913,7 +927,7 @@
     </event>
   </interface>
 
-  <interface name="zwp_tablet_pad_group_v2" version="2">
+  <interface name="zwp_tablet_pad_group_v2" version="3">
     <description summary="a set of buttons, rings and strips">
       A pad group describes a distinct (sub)set of buttons, rings and strips
       present in the tablet. The criteria of this grouping is usually positional,
@@ -1061,7 +1075,7 @@
     </event>
   </interface>
 
-  <interface name="zwp_tablet_pad_v2" version="2">
+  <interface name="zwp_tablet_pad_v2" version="3">
     <description summary="a set of buttons, rings, strips and dials">
       A pad device is a set of buttons, rings, strips and dials
       usually physically present on the tablet device itself. Some
@@ -1219,9 +1233,42 @@
 	the pad itself.
       </description>
     </event>
+
+    <!-- Version 3 additions -->
+
+    <event name="bustype" since="3">
+      <description summary="pad bus type">
+	The bustype argument is one of the BUS_ defines in the Linux kernel's
+	linux/input.h
+
+	If the pad has no known bustype or the bustype cannot be
+	queried, this event is not sent.
+
+	This event is sent in the initial burst of events before the
+	zwp_tablet_pad_v2.done event.
+      </description>
+      <arg name="bustype" type="uint" enum="zwp_tablet_v2.bustype" summary="bus type"/>
+    </event>
+
+    <event name="id" since="3">
+      <description summary="pad vendor/product id">
+	The vendor and product IDs for the tablet pad device.
+
+	The interpretation of the id depends on the zwp_tablet_pad_v2.bustype.
+
+	If the device has no vendor/product ID, this event is not sent.
+	This can happen for virtual devices or non-USB devices, for instance.
+
+	This event is sent in the initial burst of events before the
+	zwp_tablet_pad_v2.done event.
+      </description>
+      <arg name="vid" type="uint" summary="vendor id"/>
+      <arg name="pid" type="uint" summary="product id"/>
+    </event>
+
   </interface>
 
-  <interface name="zwp_tablet_pad_dial_v2" version="2">
+  <interface name="zwp_tablet_pad_dial_v2" version="3">
     <description summary="pad dial">
       A rotary control, e.g. a dial or a wheel.