brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Make MetaWaylandKeyboard struct private

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

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3627>
This commit is contained in:
Carlos Garnacho 2024-02-27 12:53:46 +01:00 committed by Marge Bot
parent fb7cd18ebf
commit 84d48254d7
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/wayland/meta-wayland-keyboard.c
View File

@ -56,6 +56,40 @@
#include "core/meta-anonymous-file.h" #include "core/meta-anonymous-file.h"
#include "wayland/meta-wayland-private.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, G_DEFINE_TYPE (MetaWaylandKeyboard, meta_wayland_keyboard,
META_TYPE_WAYLAND_INPUT_DEVICE) META_TYPE_WAYLAND_INPUT_DEVICE)

34
src/wayland/meta-wayland-keyboard.h
View File

@ -54,40 +54,6 @@ G_DECLARE_FINAL_TYPE (MetaWaylandKeyboard, meta_wayland_keyboard,
META, WAYLAND_KEYBOARD, META, WAYLAND_KEYBOARD,
MetaWaylandInputDevice) 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_enable (MetaWaylandKeyboard *keyboard);
void meta_wayland_keyboard_disable (MetaWaylandKeyboard *keyboard); void meta_wayland_keyboard_disable (MetaWaylandKeyboard *keyboard);