From 8519a31e8f22011e467e2b13653e67adeea41cbf Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 27 Feb 2024 23:09:54 +0100
Subject: [PATCH] wayland: Make MetaWaylandTabletTool struct private

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3627>
---
 src/wayland/meta-wayland-tablet-tool.c | 29 ++++++++++++++++++++++++++
 src/wayland/meta-wayland-tablet-tool.h | 29 --------------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/wayland/meta-wayland-tablet-tool.c b/src/wayland/meta-wayland-tablet-tool.c
index 1033364a1..ea5b1a178 100644
--- a/src/wayland/meta-wayland-tablet-tool.c
+++ b/src/wayland/meta-wayland-tablet-tool.c
@@ -38,6 +38,35 @@
 
 #define TABLET_AXIS_MAX 65535
 
+struct _MetaWaylandTabletTool
+{
+  MetaWaylandTabletSeat *seat;
+  ClutterInputDevice *device;
+  ClutterInputDeviceTool *device_tool;
+  struct wl_list resource_list;
+  struct wl_list focus_resource_list;
+
+  MetaWaylandSurface *focus_surface;
+  struct wl_listener focus_surface_destroy_listener;
+
+  MetaWaylandSurface *cursor_surface;
+  struct wl_listener cursor_surface_destroy_listener;
+  MetaCursorRenderer *cursor_renderer;
+  MetaCursorSpriteXcursor *default_sprite;
+
+  MetaWaylandSurface *current;
+  guint32 pressed_buttons;
+  guint32 button_count;
+
+  guint32 proximity_serial;
+  guint32 down_serial;
+  guint32 button_serial;
+
+  float grab_x, grab_y;
+
+  MetaWaylandTablet *current_tablet;
+};
+
 static MetaBackend *
 backend_from_tool (MetaWaylandTabletTool *tool)
 {
diff --git a/src/wayland/meta-wayland-tablet-tool.h b/src/wayland/meta-wayland-tablet-tool.h
index 88fce9b7b..d7c0cb6b8 100644
--- a/src/wayland/meta-wayland-tablet-tool.h
+++ b/src/wayland/meta-wayland-tablet-tool.h
@@ -28,35 +28,6 @@
 #include "backends/meta-cursor-sprite-xcursor.h"
 #include "wayland/meta-wayland-types.h"
 
-struct _MetaWaylandTabletTool
-{
-  MetaWaylandTabletSeat *seat;
-  ClutterInputDevice *device;
-  ClutterInputDeviceTool *device_tool;
-  struct wl_list resource_list;
-  struct wl_list focus_resource_list;
-
-  MetaWaylandSurface *focus_surface;
-  struct wl_listener focus_surface_destroy_listener;
-
-  MetaWaylandSurface *cursor_surface;
-  struct wl_listener cursor_surface_destroy_listener;
-  MetaCursorRenderer *cursor_renderer;
-  MetaCursorSpriteXcursor *default_sprite;
-
-  MetaWaylandSurface *current;
-  guint32 pressed_buttons;
-  guint32 button_count;
-
-  guint32 proximity_serial;
-  guint32 down_serial;
-  guint32 button_serial;
-
-  float grab_x, grab_y;
-
-  MetaWaylandTablet *current_tablet;
-};
-
 MetaWaylandTabletTool * meta_wayland_tablet_tool_new  (MetaWaylandTabletSeat  *seat,
                                                        ClutterInputDevice     *device,
                                                        ClutterInputDeviceTool *device_tool);