From 358d554a32b4fcb85d44d11560c25b2dd712e1b0 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Fri, 10 Jan 2025 15:03:22 +0100 Subject: [PATCH] backends/virtual-input: Get ClutterSeat from the virtual input Instead of using the default one from the ClutterBackend. Part-of: --- src/backends/native/meta-virtual-input-device-native.c | 6 +++--- src/backends/x11/meta-virtual-input-device-x11.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/backends/native/meta-virtual-input-device-native.c b/src/backends/native/meta-virtual-input-device-native.c index a28d19bcc..c5f34b569 100644 --- a/src/backends/native/meta-virtual-input-device-native.c +++ b/src/backends/native/meta-virtual-input-device-native.c @@ -450,15 +450,15 @@ pick_keycode_for_keyval_in_current_group_in_impl (ClutterVirtualInputDevice *vir { MetaVirtualInputDeviceNative *virtual_native = META_VIRTUAL_INPUT_DEVICE_NATIVE (virtual_device); - ClutterBackend *backend; + ClutterSeat *seat; ClutterKeymap *keymap; struct xkb_keymap *xkb_keymap; struct xkb_state *state; guint keycode, layout; xkb_keycode_t min_keycode, max_keycode; - backend = clutter_get_default_backend (); - keymap = clutter_seat_get_keymap (clutter_backend_get_default_seat (backend)); + seat = clutter_virtual_input_device_get_seat (virtual_device); + keymap = clutter_seat_get_keymap (seat); xkb_keymap = meta_keymap_native_get_keyboard_map_in_impl (META_KEYMAP_NATIVE (keymap)); state = meta_seat_impl_get_xkb_state_in_impl (virtual_native->seat->impl); diff --git a/src/backends/x11/meta-virtual-input-device-x11.c b/src/backends/x11/meta-virtual-input-device-x11.c index 403b0fb62..ac14cb857 100644 --- a/src/backends/x11/meta-virtual-input-device-x11.c +++ b/src/backends/x11/meta-virtual-input-device-x11.c @@ -192,8 +192,7 @@ meta_virtual_input_device_x11_notify_keyval (ClutterVirtualInputDevice *virtual_ uint32_t keyval, ClutterKeyState key_state) { - ClutterBackend *backend = clutter_get_default_backend (); - ClutterSeat *seat = clutter_backend_get_default_seat (backend); + ClutterSeat *seat = clutter_virtual_input_device_get_seat (virtual_device); MetaKeymapX11 *keymap = META_KEYMAP_X11 (clutter_seat_get_keymap (seat)); Display *xdisplay = xdisplay_from_virtual_input_device (virtual_device); uint32_t keycode, level;