wayland: Update current tablet support to using v2

Only update to using v2 headers/structs. The incompatible changes
to tool events are dealt with in the next commit. Pads aren't handled
in this commit either.

configure.ac

@@ -60,7 +60,7 @@ m4_define([cairo_required_version], [1.14.0])
 m4_define([gdk_pixbuf_required_version], [2.30.0])
 m4_define([introspection_required_version], [1.39.0])
 m4_define([wayland_required_version], [1.9.91])
-m4_define([wayland_protocols_required_version], [1.3])
+m4_define([wayland_protocols_required_version], [1.5])
 m4_define([mirclient_required_version], [0.11.0])
 m4_define([mircookie_required_version], [0.17.0])
 m4_define([epoxy_required_version], [1.0])

gdk/wayland/Makefile.am

@@ -26,8 +26,8 @@ BUILT_SOURCES = 				\
 	xdg-shell-unstable-v5-protocol.c			\
 	gtk-primary-selection-client-protocol.h			\
 	gtk-primary-selection-protocol.c			\
-	tablet-unstable-v1-client-protocol.h	\
-	tablet-unstable-v1-protocol.c		\
+	tablet-unstable-v2-client-protocol.h	\
+	tablet-unstable-v2-protocol.c		\
 	gtk-shell-client-protocol.h		\
 	gtk-shell-protocol.c
 

gdk/wayland/gdkdisplay-wayland.c

@@ -43,7 +43,7 @@
 #include "gdkglcontext-wayland.h"
 #include "gdkwaylandmonitor.h"
 #include "pointer-gestures-unstable-v1-client-protocol.h"
-#include "tablet-unstable-v1-client-protocol.h"
+#include "tablet-unstable-v2-client-protocol.h"
 
 /**
  * SECTION:wayland_interaction
@@ -424,11 +424,11 @@ gdk_registry_handle_global (void               *data,
         wl_registry_bind(display_wayland->wl_registry, id,
                          &gtk_primary_selection_device_manager_interface, 1);
     }
-  else if (strcmp (interface, "zwp_tablet_manager_v1") == 0)
+  else if (strcmp (interface, "zwp_tablet_manager_v2") == 0)
     {
       display_wayland->tablet_manager =
         wl_registry_bind(display_wayland->wl_registry, id,
-                         &zwp_tablet_manager_v1_interface, 1);
+                         &zwp_tablet_manager_v2_interface, 1);
     }
   else
     handled = FALSE;

gdk/wayland/gdkdisplay-wayland.h

@@ -73,7 +73,7 @@ struct _GdkWaylandDisplay
   struct wl_subcompositor *subcompositor;
   struct zwp_pointer_gestures_v1 *pointer_gestures;
   struct gtk_primary_selection_device_manager *primary_selection_manager;
-  struct zwp_tablet_manager_v1 *tablet_manager;
+  struct zwp_tablet_manager_v2 *tablet_manager;
 
   GList *async_roundtrips;