From 84d48254d78c12d4f2ad17fe1ceee63ea8afbe42 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 27 Feb 2024 12:53:46 +0100
Subject: [PATCH] wayland: Make MetaWaylandKeyboard struct private

Move it out of the header and into the C code.

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

diff --git a/src/wayland/meta-wayland-keyboard.c b/src/wayland/meta-wayland-keyboard.c
index e98831947..1c3b8cf52 100644
--- a/src/wayland/meta-wayland-keyboard.c
+++ b/src/wayland/meta-wayland-keyboard.c
@@ -56,6 +56,40 @@
 #include "core/meta-anonymous-file.h"
 #include "wayland/meta-wayland-private.h"
 
+typedef struct
+{
+  struct xkb_keymap *keymap;
+  struct xkb_state *state;
+  MetaAnonymousFile *keymap_rofile;
+} MetaWaylandXkbInfo;
+
+struct _MetaWaylandKeyboard
+{
+  MetaWaylandInputDevice parent;
+
+  struct wl_list resource_list;
+  struct wl_list focus_resource_list;
+
+  MetaWaylandSurface *focus_surface;
+  struct wl_listener focus_surface_listener;
+  uint32_t focus_serial;
+
+  uint32_t key_down_keycode;
+  uint32_t key_down_serial;
+
+  uint32_t key_up_keycode;
+  uint32_t key_up_serial;
+
+  struct wl_array pressed_keys;
+
+  MetaWaylandXkbInfo xkb_info;
+  enum xkb_state_component mods_changed;
+  xkb_mod_mask_t kbd_a11y_latched_mods;
+  xkb_mod_mask_t kbd_a11y_locked_mods;
+
+  GSettings *settings;
+};
+
 G_DEFINE_TYPE (MetaWaylandKeyboard, meta_wayland_keyboard,
                META_TYPE_WAYLAND_INPUT_DEVICE)
 
diff --git a/src/wayland/meta-wayland-keyboard.h b/src/wayland/meta-wayland-keyboard.h
index 885d67b38..99863f883 100644
--- a/src/wayland/meta-wayland-keyboard.h
+++ b/src/wayland/meta-wayland-keyboard.h
@@ -54,40 +54,6 @@ G_DECLARE_FINAL_TYPE (MetaWaylandKeyboard, meta_wayland_keyboard,
                       META, WAYLAND_KEYBOARD,
                       MetaWaylandInputDevice)
 
-typedef struct
-{
-  struct xkb_keymap *keymap;
-  struct xkb_state *state;
-  MetaAnonymousFile *keymap_rofile;
-} MetaWaylandXkbInfo;
-
-struct _MetaWaylandKeyboard
-{
-  MetaWaylandInputDevice parent;
-
-  struct wl_list resource_list;
-  struct wl_list focus_resource_list;
-
-  MetaWaylandSurface *focus_surface;
-  struct wl_listener focus_surface_listener;
-  uint32_t focus_serial;
-
-  uint32_t key_down_keycode;
-  uint32_t key_down_serial;
-
-  uint32_t key_up_keycode;
-  uint32_t key_up_serial;
-
-  struct wl_array pressed_keys;
-
-  MetaWaylandXkbInfo xkb_info;
-  enum xkb_state_component mods_changed;
-  xkb_mod_mask_t kbd_a11y_latched_mods;
-  xkb_mod_mask_t kbd_a11y_locked_mods;
-
-  GSettings *settings;
-};
-
 void meta_wayland_keyboard_enable (MetaWaylandKeyboard *keyboard);
 
 void meta_wayland_keyboard_disable (MetaWaylandKeyboard *keyboard);