isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-17 21:54:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Use Clutter event to handle touch cancel

Browse Source 
The semantics for libinput events are not as expected here. Besides
it's pointless, as those should arrive per-slot in a burst, and we
cancel on the first event.

We can simply use the Clutter event for this.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403
This commit is contained in:
Carlos Garnacho 2020-05-06 13:50:45 +02:00
parent 7dc1a28c8c
commit 3083e98254
1 changed files with 4 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,6 +449,10 @@ meta_wayland_touch_handle_event (MetaWaylandTouch *touch,
handle_touch_end (touch, event); handle_touch_end (touch, event);
break; break;
case CLUTTER_TOUCH_CANCEL:
meta_wayland_touch_cancel (touch);
break;
default: default:
return FALSE; return FALSE;
} }
@ -510,30 +514,6 @@ meta_wayland_touch_cancel (MetaWaylandTouch *touch)
g_list_free (surfaces); g_list_free (surfaces);
} }
#ifdef HAVE_NATIVE_BACKEND
static gboolean
evdev_filter_func (struct libinput_event *event,
gpointer data)
{
MetaWaylandTouch *touch = data;
switch (libinput_event_get_type (event))
{
case LIBINPUT_EVENT_TOUCH_CANCEL:
/* Clutter translates this into individual CLUTTER_TOUCH_CANCEL events,
* which are not so useful when sending a global signal as the protocol
* requires.
*/
meta_wayland_touch_cancel (touch);
break;
default:
break;
}
return CLUTTER_EVENT_PROPAGATE;
}
#endif
void void
meta_wayland_touch_enable (MetaWaylandTouch *touch) meta_wayland_touch_enable (MetaWaylandTouch *touch)
{ {
@ -545,35 +525,11 @@ meta_wayland_touch_enable (MetaWaylandTouch *touch)
#endif /* HAVE_NATIVE_BACKEND */ #endif /* HAVE_NATIVE_BACKEND */
wl_list_init (&touch->resource_list); wl_list_init (&touch->resource_list);
#ifdef HAVE_NATIVE_BACKEND
MetaBackend *backend = meta_get_backend ();
if (META_IS_BACKEND_NATIVE (backend))
{
ClutterBackend *backend = clutter_get_default_backend ();
ClutterSeat *seat = clutter_backend_get_default_seat (backend);
meta_seat_native_add_filter (META_SEAT_NATIVE (seat),
evdev_filter_func, touch, NULL);
}
#endif
} }
void void
meta_wayland_touch_disable (MetaWaylandTouch *touch) meta_wayland_touch_disable (MetaWaylandTouch *touch)
{ {
#ifdef HAVE_NATIVE_BACKEND
MetaBackend *backend = meta_get_backend ();
if (META_IS_BACKEND_NATIVE (backend))
{
ClutterBackend *backend = clutter_get_default_backend ();
ClutterSeat *seat = clutter_backend_get_default_seat (backend);
meta_seat_native_remove_filter (META_SEAT_NATIVE (seat),
evdev_filter_func, touch);
}
#endif
meta_wayland_touch_cancel (touch); meta_wayland_touch_cancel (touch);
g_clear_pointer (&touch->touch_surfaces, g_hash_table_unref); g_clear_pointer (&touch->touch_surfaces, g_hash_table_unref);