[mutter/wip/tablet-protocol: 6/10] wayland: Let	MetaWaylandTabletManager process tablet events
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc: 
- Subject: [mutter/wip/tablet-protocol: 6/10] wayland: Let	MetaWaylandTabletManager process tablet events
- Date: Tue, 26 Jan 2016 22:41:39 +0000 (UTC)
commit f230ef4a4f7a03aa5f535a6d84cdd72d0a98fe41
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Jan 9 17:29:06 2015 +0100
    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 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 62b4387..d6e3ec5 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);
 }
 
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]