summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2015-01-09 17:29:06 +0100
committerCarlos Garnacho <carlosg@gnome.org>2015-11-16 13:52:28 +0100
commit2259ae75cdeb5c32d84c56519246dc7b6f692704 (patch)
tree3506ee74b546c0ecfa7f6d8fcf51b85fa6b9bb19
parentf3140b8135b85f0a88e80f273e84242bb2467434 (diff)
downloadmutter-2259ae75cdeb5c32d84c56519246dc7b6f692704.tar.gz
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.
-rw-r--r--src/wayland/meta-wayland.c9
1 files changed, 8 insertions, 1 deletions
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);
}