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

backends: Drop extra layer of touch info handling

Browse Source 
We have a hashtable in the device that does not add much on top
to the seat handling. Make all the places rely on the seat accounting
instead.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1486
This commit is contained in:
Carlos Garnacho
2020-05-06 14:12:55 +02:00
committed by Jonas Ådahl
parent c9a405ff9e
commit e28007edb9
3 changed files with 6 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -546,8 +546,6 @@ meta_virtual_input_device_native_notify_touch_down (ClutterVirtualInputDevice *v
{
MetaVirtualInputDeviceNative *virtual_evdev =
META_VIRTUAL_INPUT_DEVICE_NATIVE (virtual_device);
MetaInputDeviceNative *device_evdev =
META_INPUT_DEVICE_NATIVE (virtual_evdev->device);
MetaTouchState *touch_state;
guint seat_slot;
@ -557,8 +555,8 @@ meta_virtual_input_device_native_notify_touch_down (ClutterVirtualInputDevice *v
time_us = g_get_monotonic_time ();
seat_slot = virtual_evdev->slot_base + (guint) device_slot;
touch_state = meta_input_device_native_acquire_touch_state (device_evdev,
seat_slot);
touch_state = meta_seat_native_acquire_touch_state (virtual_evdev->seat,
seat_slot);
if (!touch_state)
return;
@ -583,8 +581,6 @@ meta_virtual_input_device_native_notify_touch_motion (ClutterVirtualInputDevice
{
MetaVirtualInputDeviceNative *virtual_evdev =
META_VIRTUAL_INPUT_DEVICE_NATIVE (virtual_device);
MetaInputDeviceNative *device_evdev =
META_INPUT_DEVICE_NATIVE (virtual_evdev->device);
MetaTouchState *touch_state;
guint seat_slot;
@ -594,8 +590,8 @@ meta_virtual_input_device_native_notify_touch_motion (ClutterVirtualInputDevice
time_us = g_get_monotonic_time ();
seat_slot = virtual_evdev->slot_base + (guint) device_slot;
touch_state = meta_input_device_native_lookup_touch_state (device_evdev,
seat_slot);
touch_state = meta_seat_native_lookup_touch_state (virtual_evdev->seat,
seat_slot);
if (!touch_state)
return;
@ -618,8 +614,6 @@ meta_virtual_input_device_native_notify_touch_up (ClutterVirtualInputDevice *vir
{
MetaVirtualInputDeviceNative *virtual_evdev =
META_VIRTUAL_INPUT_DEVICE_NATIVE (virtual_device);
MetaInputDeviceNative *device_evdev =
META_INPUT_DEVICE_NATIVE (virtual_evdev->device);
MetaTouchState *touch_state;
guint seat_slot;
@ -629,8 +623,8 @@ meta_virtual_input_device_native_notify_touch_up (ClutterVirtualInputDevice *vir
time_us = g_get_monotonic_time ();
seat_slot = virtual_evdev->slot_base + (guint) device_slot;
touch_state = meta_input_device_native_lookup_touch_state (device_evdev,
seat_slot);
touch_state = meta_seat_native_lookup_touch_state (virtual_evdev->seat,
seat_slot);
if (!touch_state)
return;