From 06b3d36e97b612adfa5a73e546b21985b50285f2 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 4 Oct 2013 02:33:10 -0400
Subject: [PATCH] wayland: Move cursor tracker handling code to
 meta_wayland_seat_handle_event

---
 src/wayland/meta-wayland-seat.c | 13 +++++++++++++
 src/wayland/meta-wayland.c      | 19 +------------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index d8b26b3af..9c19ca6e4 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -359,6 +359,19 @@ meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
 {
   seat->pointer.button_count = count_buttons (event);
 
+  if (seat->cursor_tracker)
+    {
+      meta_cursor_tracker_update_position (seat->cursor_tracker,
+					   wl_fixed_to_int (seat->pointer.x),
+					   wl_fixed_to_int (seat->pointer.y));
+
+      if (seat->pointer.current == NULL)
+	meta_cursor_tracker_revert_root (seat->cursor_tracker);
+
+      meta_cursor_tracker_queue_redraw (seat->cursor_tracker,
+                                        CLUTTER_ACTOR (event->any.stage));
+    }
+
   switch (event->type)
     {
     case CLUTTER_MOTION:
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index c9a2c2f62..f0733ad3f 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -564,27 +564,10 @@ event_filter_cb (const ClutterEvent *event,
 {
   MetaWaylandCompositor *compositor = user_data;
   MetaWaylandSeat *seat = compositor->seat;
-  MetaWaylandPointer *pointer = &seat->pointer;
 
   reset_idletimes (event);
 
-  if (meta_wayland_seat_handle_event (compositor->seat, event))
-    return TRUE;
-
-  if (seat->cursor_tracker)
-    {
-      meta_cursor_tracker_update_position (seat->cursor_tracker,
-					   wl_fixed_to_int (pointer->x),
-					   wl_fixed_to_int (pointer->y));
-
-      if (pointer->current == NULL)
-	meta_cursor_tracker_revert_root (seat->cursor_tracker);
-
-      meta_cursor_tracker_queue_redraw (seat->cursor_tracker,
-                                        CLUTTER_ACTOR (event->any.stage));
-    }
-
-  return FALSE;
+  return meta_wayland_seat_handle_event (compositor->seat, event);
 }
 
 static void