[mutter] wayland-stage: Don't use the Wayland seat to find the cursor tracker



commit 13a444482a498f441e32591aad0c9c40feb53104
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Apr 21 20:55:18 2014 -0400

    wayland-stage: Don't use the Wayland seat to find the cursor tracker
    
    Simply look it up on the seat itself.

 src/wayland/meta-wayland-stage.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/wayland/meta-wayland-stage.c b/src/wayland/meta-wayland-stage.c
index 31240fc..71d3511 100644
--- a/src/wayland/meta-wayland-stage.c
+++ b/src/wayland/meta-wayland-stage.c
@@ -23,7 +23,6 @@
 
 #include "meta-wayland-stage.h"
 
-#include "meta-wayland-private.h"
 #include "meta-cursor-tracker-private.h"
 
 G_DEFINE_TYPE (MetaWaylandStage, meta_wayland_stage, CLUTTER_TYPE_STAGE);
@@ -31,13 +30,16 @@ G_DEFINE_TYPE (MetaWaylandStage, meta_wayland_stage, CLUTTER_TYPE_STAGE);
 static void
 meta_wayland_stage_paint (ClutterActor *actor)
 {
-  MetaWaylandCompositor *compositor;
+  MetaDisplay *display = meta_get_display ();
+  MetaScreen *screen = display->screen;
+  MetaCursorTracker *tracker;
 
   CLUTTER_ACTOR_CLASS (meta_wayland_stage_parent_class)->paint (actor);
 
-  compositor = meta_wayland_compositor_get_default ();
-  if (compositor->seat->pointer.cursor_tracker)
-    meta_cursor_renderer_paint (compositor->seat->pointer.cursor_tracker->renderer);
+  tracker = meta_cursor_tracker_get_for_screen (display->screen);
+
+  if (tracker)
+    meta_cursor_renderer_paint (tracker->renderer);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]