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

backends: Move native keymap manipulation functions to MetaSeatNative

Browse Source 
Since the ClutterKeymap is obtained through the ClutterSeat, it makes
sense to have these manipulation functions in the ClutterSeat impl.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/852
This commit is contained in:
Carlos Garnacho
2019-10-04 15:44:27 +02:00
parent 7644ddeddc
commit 4761c4ee1c
7 changed files with 204 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/backends/native/meta-keymap-native.c
View File

@ -53,12 +53,11 @@ meta_keymap_native_finalize (GObject *object)
static gboolean
meta_keymap_native_get_num_lock_state (ClutterKeymap *keymap)
{
MetaDeviceManagerNative *device_manager;
struct xkb_state *xkb_state;
ClutterSeat *seat;
device_manager =
META_DEVICE_MANAGER_NATIVE (clutter_device_manager_get_default ());
xkb_state = meta_device_manager_native_get_xkb_state (device_manager);
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
xkb_state = meta_seat_native_get_xkb_state (META_SEAT_NATIVE (seat));
return xkb_state_mod_name_is_active (xkb_state,
XKB_MOD_NAME_NUM,
@ -69,12 +68,11 @@ meta_keymap_native_get_num_lock_state (ClutterKeymap *keymap)
static gboolean
meta_keymap_native_get_caps_lock_state (ClutterKeymap *keymap)
{
MetaDeviceManagerNative *device_manager;
struct xkb_state *xkb_state;
ClutterSeat *seat;
device_manager =
META_DEVICE_MANAGER_NATIVE (clutter_device_manager_get_default ());
xkb_state = meta_device_manager_native_get_xkb_state (device_manager);
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
xkb_state = meta_seat_native_get_xkb_state (META_SEAT_NATIVE (seat));
return xkb_state_mod_name_is_active (xkb_state,
XKB_MOD_NAME_CAPS,