[mutter/wip/tablet-protocol: 79/83] wayland: Let MetaWaylandTabletManager process tablet events



commit 67aa4070fcb2c0058dcb7803ed0fd52b0bab9e0d
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 c8f79a4..4a8e677 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -168,7 +168,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
@@ -197,6 +200,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]