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

wayland: Lock touch sequence info on first entered surface

Browse Source 
Even though the touch moved to being set up in CLUTTER_ENTER, it
is still meant to lock onto the pressed surface, we however will
receive crossing events if the touch moves between actors/surfaces,
triggering warnings when the touch info registration is attempted
on the already existing touch sequence.

The reasons to handle this in CLUTTER_ENTER still apply, so ensure
the touch info for the sequence does not previously exist to avoid
the warning.

Fixes: 2e82a2049f ("wayland: Register touchpoint info on CLUTTER_ENTER")
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4166>
This commit is contained in:
Carlos Garnacho 2024-12-05 10:42:14 +01:00 committed by Marge Bot
parent f637b8b12c
commit 18c8efcd42
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wayland/meta-wayland-touch.c
View File

@ -226,7 +226,11 @@ meta_wayland_touch_update (MetaWaylandTouch *touch,
sequence = clutter_event_get_event_sequence (event); sequence = clutter_event_get_event_sequence (event);
event_type = clutter_event_type (event); event_type = clutter_event_type (event);
if (event_type == CLUTTER_ENTER) touch_info = touch_get_info (touch, sequence, FALSE);
if (event_type == CLUTTER_ENTER &&
!touch_info &&
(clutter_event_get_flags (event) & CLUTTER_EVENT_FLAG_GRAB_NOTIFY) == 0)
{ {
MetaWaylandSurface *surface = NULL; MetaWaylandSurface *surface = NULL;
MetaBackend *backend; MetaBackend *backend;
@ -250,8 +254,6 @@ meta_wayland_touch_update (MetaWaylandTouch *touch,
touch_info->touch_surface = touch_surface_get (touch, surface); touch_info->touch_surface = touch_surface_get (touch, surface);
clutter_event_get_coords (event, &touch_info->start_x, &touch_info->start_y); clutter_event_get_coords (event, &touch_info->start_x, &touch_info->start_y);
} }
else
touch_info = touch_get_info (touch, sequence, FALSE);
if (!touch_info) if (!touch_info)
return; return;