From 2259ae75cdeb5c32d84c56519246dc7b6f692704 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 9 Jan 2015 17:29:06 +0100 Subject: wayland: Let MetaWaylandTabletManager process tablet events meta_wayland_tablet_manager_update()/handle_event() are called before the MetaWaylandSeat counterparts. If the event comes from a device managed by MetaWaylandTabletManager, the event will be exclusively handled by it. --- src/wayland/meta-wayland.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c index fb23f383a..b05b06616 100644 --- a/src/wayland/meta-wayland.c +++ b/src/wayland/meta-wayland.c @@ -176,7 +176,10 @@ void meta_wayland_compositor_update (MetaWaylandCompositor *compositor, const ClutterEvent *event) { - meta_wayland_seat_update (compositor->seat, event); + if (meta_wayland_tablet_manager_consumes_event (compositor->tablet_manager, event)) + meta_wayland_tablet_manager_update (compositor->tablet_manager, event); + else + meta_wayland_seat_update (compositor->seat, event); } void @@ -205,6 +208,10 @@ gboolean meta_wayland_compositor_handle_event (MetaWaylandCompositor *compositor, const ClutterEvent *event) { + if (meta_wayland_tablet_manager_handle_event (compositor->tablet_manager, + event)) + return TRUE; + return meta_wayland_seat_handle_event (compositor->seat, event); } -- cgit v1.2.1