isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-19 22:15:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

backends/native: Pass xkb_state directly when updating MetaKeymapNative

Browse Source 
Figuring out the MetaSeatImpl this much indirectly is fairly awkward when
the keymap is only updated from the MetaSeatImpl, pass instead the seat
impl's xkb_state, as we have it handy in all the places this is called.

This will not break on NULL seats during initialization, should the numlock
state be restored from previous sessions.

Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1556
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1612>
This commit is contained in:
Carlos Garnacho 2020-11-27 18:11:02 +01:00 committed by Marge Bot
parent f5949af0bb
commit 13202f4e45
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,14 +124,9 @@ meta_keymap_native_get_keyboard_map_in_impl (MetaKeymapNative *keymap)
} }
void void
meta_keymap_native_update_in_impl (MetaKeymapNative *keymap) meta_keymap_native_update_in_impl (MetaKeymapNative *keymap,
struct xkb_state *xkb_state)
{ {
struct xkb_state *xkb_state;
ClutterSeat *seat;
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
xkb_state = meta_seat_impl_get_xkb_state_in_impl (META_SEAT_NATIVE (seat)->impl);
keymap->num_lock = keymap->num_lock =
xkb_state_mod_name_is_active (xkb_state, xkb_state_mod_name_is_active (xkb_state,
XKB_MOD_NAME_NUM, XKB_MOD_NAME_NUM,

3
src/backends/native/meta-keymap-native.h
View File

@ -36,6 +36,7 @@ G_DECLARE_FINAL_TYPE (MetaKeymapNative, meta_keymap_native,
void meta_keymap_native_set_keyboard_map_in_impl (MetaKeymapNative *keymap, void meta_keymap_native_set_keyboard_map_in_impl (MetaKeymapNative *keymap,
struct xkb_keymap *xkb_keymap); struct xkb_keymap *xkb_keymap);
struct xkb_keymap * meta_keymap_native_get_keyboard_map_in_impl (MetaKeymapNative *keymap); struct xkb_keymap * meta_keymap_native_get_keyboard_map_in_impl (MetaKeymapNative *keymap);
void meta_keymap_native_update_in_impl (MetaKeymapNative *keymap); void meta_keymap_native_update_in_impl (MetaKeymapNative *keymap,
struct xkb_state *xkb_state);
#endif /* META_KEYMAP_NATIVE_H */ #endif /* META_KEYMAP_NATIVE_H */

6
src/backends/native/meta-seat-impl.c
View File

@ -2574,7 +2574,7 @@ meta_seat_impl_set_keyboard_numlock_in_impl (MetaSeatImpl *seat_impl,
group_mods); group_mods);
meta_seat_impl_sync_leds_in_impl (seat_impl); meta_seat_impl_sync_leds_in_impl (seat_impl);
meta_keymap_native_update_in_impl (seat_impl->keymap); meta_keymap_native_update_in_impl (seat_impl->keymap, seat_impl->xkb);
} }
static gpointer static gpointer
@ -3078,7 +3078,7 @@ meta_seat_impl_update_xkb_state_in_impl (MetaSeatImpl *seat_impl)
xkb_keymap_led_get_index (xkb_keymap, XKB_LED_NAME_SCROLL); xkb_keymap_led_get_index (xkb_keymap, XKB_LED_NAME_SCROLL);
meta_seat_impl_sync_leds_in_impl (seat_impl); meta_seat_impl_sync_leds_in_impl (seat_impl);
meta_keymap_native_update_in_impl (seat_impl->keymap); meta_keymap_native_update_in_impl (seat_impl->keymap, seat_impl->xkb);
g_rw_lock_writer_unlock (&seat_impl->state_lock); g_rw_lock_writer_unlock (&seat_impl->state_lock);
} }
@ -3239,7 +3239,7 @@ set_keyboard_layout_index (GTask *task)
locked_mods = xkb_state_serialize_mods (state, XKB_STATE_MODS_LOCKED); locked_mods = xkb_state_serialize_mods (state, XKB_STATE_MODS_LOCKED);
xkb_state_update_mask (state, depressed_mods, latched_mods, locked_mods, 0, 0, idx); xkb_state_update_mask (state, depressed_mods, latched_mods, locked_mods, 0, 0, idx);
meta_keymap_native_update_in_impl (seat_impl->keymap); meta_keymap_native_update_in_impl (seat_impl->keymap, seat_impl->xkb);
seat_impl->layout_idx = idx; seat_impl->layout_idx = idx;