From 13a444482a498f441e32591aad0c9c40feb53104 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 21 Apr 2014 20:55:18 -0400 Subject: [PATCH] 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 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/wayland/meta-wayland-stage.c b/src/wayland/meta-wayland-stage.c index 31240fcc3..71d3511b5 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