diff options
Diffstat (limited to 'src/wayland/meta-wayland-pointer-constraints.c')
| -rw-r--r-- | src/wayland/meta-wayland-pointer-constraints.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/wayland/meta-wayland-pointer-constraints.c b/src/wayland/meta-wayland-pointer-constraints.c index aed15caba..d0bcfab99 100644 --- a/src/wayland/meta-wayland-pointer-constraints.c +++ b/src/wayland/meta-wayland-pointer-constraints.c @@ -126,9 +126,11 @@ appears_focused_changed (MetaWindow *window, GParamSpec *pspec, gpointer user_data) { - MetaWaylandCompositor *wayland_compositor; + MetaDisplay *display = meta_window_get_display (window); + MetaContext *context = meta_display_get_context (display); + MetaWaylandCompositor *wayland_compositor = + meta_context_get_wayland_compositor (context); - wayland_compositor = meta_wayland_compositor_get_default (); meta_wayland_pointer_constraint_maybe_remove_for_seat (wayland_compositor->seat, window); @@ -477,7 +479,7 @@ should_constraint_be_enabled (MetaWaylandPointerConstraint *constraint) if (meta_xwayland_is_xwayland_surface (constraint->surface)) { - MetaDisplay *display = meta_get_display (); + MetaDisplay *display = meta_window_get_display (window); /* * We need to handle Xwayland surfaces differently in order to allow @@ -645,6 +647,12 @@ meta_wayland_pointer_constraint_get_surface (MetaWaylandPointerConstraint *const return constraint->surface; } +MetaWaylandCompositor * +meta_wayland_pointer_constraint_get_compositor (MetaWaylandPointerConstraint *constraint) +{ + return constraint->surface->compositor; +} + static void pointer_constraint_resource_destroyed (struct wl_resource *resource) { |