From b6cb63adef8efd7bff192e44ec6aecb8ff682947 Mon Sep 17 00:00:00 2001
From: Frank Praznik <frank.praznik@gmail.com>
Date: Thu, 11 Apr 2024 18:31:48 -0400
Subject: [PATCH] wayland: Update tablet-v2 protocol file to stable version

No functional changes, just removes the 'unstable' wording from the header names and updates some documentation.
---
 src/video/wayland/SDL_waylandevents.c         |  2 +-
 src/video/wayland/SDL_waylandvideo.c          |  2 +-
 .../{tablet-unstable-v2.xml => tablet-v2.xml} | 26 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename wayland-protocols/{tablet-unstable-v2.xml => tablet-v2.xml} (98%)

diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c
index 04a9c9b8c..9f679ee82 100644
--- a/src/video/wayland/SDL_waylandevents.c
+++ b/src/video/wayland/SDL_waylandevents.c
@@ -39,7 +39,7 @@
 #include "xdg-shell-client-protocol.h"
 #include "keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h"
 #include "text-input-unstable-v3-client-protocol.h"
-#include "tablet-unstable-v2-client-protocol.h"
+#include "tablet-v2-client-protocol.h"
 #include "primary-selection-unstable-v1-client-protocol.h"
 #include "input-timestamps-unstable-v1-client-protocol.h"
 
diff --git a/src/video/wayland/SDL_waylandvideo.c b/src/video/wayland/SDL_waylandvideo.c
index 4b372efec..105ed67d9 100644
--- a/src/video/wayland/SDL_waylandvideo.c
+++ b/src/video/wayland/SDL_waylandvideo.c
@@ -52,7 +52,7 @@
 #include "pointer-constraints-unstable-v1-client-protocol.h"
 #include "primary-selection-unstable-v1-client-protocol.h"
 #include "relative-pointer-unstable-v1-client-protocol.h"
-#include "tablet-unstable-v2-client-protocol.h"
+#include "tablet-v2-client-protocol.h"
 #include "text-input-unstable-v3-client-protocol.h"
 #include "viewporter-client-protocol.h"
 #include "xdg-activation-v1-client-protocol.h"
diff --git a/wayland-protocols/tablet-unstable-v2.xml b/wayland-protocols/tablet-v2.xml
similarity index 98%
rename from wayland-protocols/tablet-unstable-v2.xml
rename to wayland-protocols/tablet-v2.xml
index b286d964a..55cd78e30 100644
--- a/wayland-protocols/tablet-unstable-v2.xml
+++ b/wayland-protocols/tablet-v2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<protocol name="tablet_unstable_v2">
+<protocol name="tablet_v2">
 
   <copyright>
     Copyright 2014 © Stephen "Lyude" Chandler Paul
@@ -104,15 +104,6 @@
     compositor-specific policy when a tool can be removed. Common approaches
     will likely include some form of removing a tool when all tablets the
     tool was used on are removed.
-
-    Warning! The protocol described in this file is experimental and
-    backward incompatible changes may be made. Backward compatible changes
-    may be added together with the corresponding interface version bump.
-    Backward incompatible changes are done by bumping the version number in
-    the protocol and interface names and resetting the interface version.
-    Once the protocol is to be declared stable, the 'z' prefix and the
-    version number in the protocol and interface names are removed and the
-    interface version number is reset.
   </description>
 
   <interface name="zwp_tablet_manager_v2" version="1">
@@ -247,7 +238,7 @@
 	previously been used as cursor surface for a different tool, a
 	protocol error is raised.
       </description>
-      <arg name="serial" type="uint" summary="serial of the enter event"/>
+      <arg name="serial" type="uint" summary="serial of the proximity_in event"/>
       <arg name="surface" type="object" interface="wl_surface" allow-null="true"/>
       <arg name="hotspot_x" type="int" summary="surface-local x coordinate"/>
       <arg name="hotspot_y" type="int" summary="surface-local y coordinate"/>
@@ -596,14 +587,23 @@
 
     <event name="name">
       <description summary="tablet device name">
+        A descriptive name for the tablet device.
+
+	If the device has no descriptive name, this event is not sent.
+
 	This event is sent in the initial burst of events before the
-	wp_tablet.done event.
+        wp_tablet.done event.
       </description>
       <arg name="name" type="string" summary="the device name"/>
     </event>
 
     <event name="id">
       <description summary="tablet device USB vendor/product id">
+	The USB vendor and product IDs for the tablet device.
+
+	If the device has no USB 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
 	wp_tablet.done event.
       </description>
@@ -1156,7 +1156,7 @@
     </event>
 
     <event name="leave">
-      <description summary="enter event">
+      <description summary="leave event">
 	Notification that this pad is no longer focused on the specified
 	surface.
       </description>