fix and update input calibration code

calibration.c

@@ -231,6 +231,7 @@ static void manager_send_device(struct input_calibration_manager_v1 *manager,
   ext_input_calibration_manager_v1_send_add(manager_resource, device_resource);
 
   ext_input_device_v1_send_name(device_resource, input_device->device->name);
+  ext_input_device_v1_send_product(device_resource, input_device->device->product);
   ext_input_device_v1_send_vendor(device_resource, input_device->device->vendor);
   ext_input_device_v1_send_type(device_resource, input_device->device->type);
 

protocol/input_calibration.c

@@ -72,12 +72,13 @@ static const struct wl_message ext_input_device_v1_events[] = {
 	{ "removed", "", ext_input_device_calibration_unstable_v1_types + 0 },
 	{ "name", "s", ext_input_device_calibration_unstable_v1_types + 0 },
 	{ "vendor", "u", ext_input_device_calibration_unstable_v1_types + 0 },
+	{ "product", "u", ext_input_device_calibration_unstable_v1_types + 0 },
 	{ "type", "i", ext_input_device_calibration_unstable_v1_types + 0 },
 };
 
 WL_PRIVATE const struct wl_interface ext_input_device_v1_interface = {
 	"ext_input_device_v1", 1,
 	3, ext_input_device_v1_requests,
-	4, ext_input_device_v1_events,
+	5, ext_input_device_v1_events,
 };
 

protocol/input_calibration.h

@@ -248,7 +248,8 @@ struct ext_input_device_v1_interface {
 #define EXT_INPUT_DEVICE_V1_REMOVED 0
 #define EXT_INPUT_DEVICE_V1_NAME 1
 #define EXT_INPUT_DEVICE_V1_VENDOR 2
-#define EXT_INPUT_DEVICE_V1_TYPE 3
+#define EXT_INPUT_DEVICE_V1_PRODUCT 3
+#define EXT_INPUT_DEVICE_V1_TYPE 4
 
 /**
  * @ingroup iface_ext_input_device_v1
@@ -262,6 +263,10 @@ struct ext_input_device_v1_interface {
  * @ingroup iface_ext_input_device_v1
  */
 #define EXT_INPUT_DEVICE_V1_VENDOR_SINCE_VERSION 1
+/**
+ * @ingroup iface_ext_input_device_v1
+ */
+#define EXT_INPUT_DEVICE_V1_PRODUCT_SINCE_VERSION 1
 /**
  * @ingroup iface_ext_input_device_v1
  */
@@ -315,6 +320,18 @@ ext_input_device_v1_send_vendor(struct wl_resource *resource_, uint32_t vendor)
 	wl_resource_post_event(resource_, EXT_INPUT_DEVICE_V1_VENDOR, vendor);
 }
 
+/**
+ * @ingroup iface_ext_input_device_v1
+ * Sends an product event to the client owning the resource.
+ * @param resource_ The client's resource
+ * @param vendor input product
+ */
+static inline void
+ext_input_device_v1_send_product(struct wl_resource *resource_, uint32_t vendor)
+{
+	wl_resource_post_event(resource_, EXT_INPUT_DEVICE_V1_PRODUCT, vendor);
+}
+
 /**
  * @ingroup iface_ext_input_device_v1
  * Sends an type event to the client owning the resource.

protocol/input_calibration.xml

@@ -147,6 +147,13 @@
       <arg name="vendor" type="uint" summary="input vendor"/>
     </event>
 
+    <event name="product">
+      <description summary="The input device product identifier">
+        An input device will have a USB Bus product ID.
+      </description>
+      <arg name="vendor" type="uint" summary="input product"/>
+    </event>
+
     <event name="type">
       <description summary="The input device's type">
         An input device will have a type, such as "touch" or "pointer"