diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2019-10-01 17:27:23 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2020-01-30 17:59:47 +0100 |
| commit | 9be4f98c73b147b41d869ed0cb4131589ec7184f (patch) | |
| tree | 3f563fe151fe3279ae5a772d181fe6729ac45ffd /src/wayland/meta-wayland-keyboard.c | |
| parent | 1fc021c3c662f6df9e999eaa9a439ae42b2688d2 (diff) | |
| download | mutter-9be4f98c73b147b41d869ed0cb4131589ec7184f.tar.gz | |
clutter: Move keymap from ClutterBackend to ClutterSeat
Keymaps are a per-seat feature, so move it there.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/852
Diffstat (limited to 'src/wayland/meta-wayland-keyboard.c')
| -rw-r--r-- | src/wayland/meta-wayland-keyboard.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/wayland/meta-wayland-keyboard.c b/src/wayland/meta-wayland-keyboard.c index d74ef0dfa..552e9707a 100644 --- a/src/wayland/meta-wayland-keyboard.c +++ b/src/wayland/meta-wayland-keyboard.c @@ -404,6 +404,7 @@ meta_wayland_keyboard_update_xkb_state (MetaWaylandKeyboard *keyboard) MetaBackend *backend = meta_get_backend (); xkb_layout_index_t layout_idx; ClutterKeymap *keymap; + ClutterSeat *seat; /* Preserve latched/locked modifiers state */ if (xkb_info->state) @@ -417,7 +418,8 @@ meta_wayland_keyboard_update_xkb_state (MetaWaylandKeyboard *keyboard) latched = locked = 0; } - keymap = clutter_backend_get_keymap (clutter_get_default_backend ()); + seat = clutter_backend_get_default_seat (clutter_get_default_backend ()); + keymap = clutter_seat_get_keymap (seat); numlock = (1 << xkb_keymap_mod_get_index (xkb_info->keymap, "Mod2")); if (clutter_keymap_get_num_lock_state (keymap)) |