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

backends/virtual-input: Get ClutterSeat from the virtual input

Browse Source 
Instead of using the default one from the ClutterBackend.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4201>
This commit is contained in:
Bilal Elmoussaoui 2025-01-10 15:03:22 +01:00 committed by Marge Bot
parent 98e887df48
commit 358d554a32
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backends/native/meta-virtual-input-device-native.c
View File

@ -450,15 +450,15 @@ pick_keycode_for_keyval_in_current_group_in_impl (ClutterVirtualInputDevice *vir
{ {
MetaVirtualInputDeviceNative *virtual_native = MetaVirtualInputDeviceNative *virtual_native =
META_VIRTUAL_INPUT_DEVICE_NATIVE (virtual_device); META_VIRTUAL_INPUT_DEVICE_NATIVE (virtual_device);
ClutterBackend *backend; ClutterSeat *seat;
ClutterKeymap *keymap; ClutterKeymap *keymap;
struct xkb_keymap *xkb_keymap; struct xkb_keymap *xkb_keymap;
struct xkb_state *state; struct xkb_state *state;
guint keycode, layout; guint keycode, layout;
xkb_keycode_t min_keycode, max_keycode; xkb_keycode_t min_keycode, max_keycode;
backend = clutter_get_default_backend (); seat = clutter_virtual_input_device_get_seat (virtual_device);
keymap = clutter_seat_get_keymap (clutter_backend_get_default_seat (backend)); keymap = clutter_seat_get_keymap (seat);
xkb_keymap = meta_keymap_native_get_keyboard_map_in_impl (META_KEYMAP_NATIVE (keymap)); 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); state = meta_seat_impl_get_xkb_state_in_impl (virtual_native->seat->impl);

3
src/backends/x11/meta-virtual-input-device-x11.c
View File

@ -192,8 +192,7 @@ meta_virtual_input_device_x11_notify_keyval (ClutterVirtualInputDevice *virtual_
uint32_t keyval, uint32_t keyval,
ClutterKeyState key_state) ClutterKeyState key_state)
{ {
ClutterBackend *backend = clutter_get_default_backend (); ClutterSeat *seat = clutter_virtual_input_device_get_seat (virtual_device);
ClutterSeat *seat = clutter_backend_get_default_seat (backend);
MetaKeymapX11 *keymap = META_KEYMAP_X11 (clutter_seat_get_keymap (seat)); MetaKeymapX11 *keymap = META_KEYMAP_X11 (clutter_seat_get_keymap (seat));
Display *xdisplay = xdisplay_from_virtual_input_device (virtual_device); Display *xdisplay = xdisplay_from_virtual_input_device (virtual_device);
uint32_t keycode, level; uint32_t keycode, level;