diff options
Diffstat (limited to 'src/wayland/meta-wayland-pointer-constraints.c')
| -rw-r--r-- | src/wayland/meta-wayland-pointer-constraints.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/wayland/meta-wayland-pointer-constraints.c b/src/wayland/meta-wayland-pointer-constraints.c index 9389dd6f8..01e9d855c 100644 --- a/src/wayland/meta-wayland-pointer-constraints.c +++ b/src/wayland/meta-wayland-pointer-constraints.c @@ -193,7 +193,7 @@ surface_constraint_data_new (MetaWaylandSurface *surface) connect_window (data, window); } #ifdef HAVE_XWAYLAND - else if (meta_xwayland_is_xwayland_surface (surface)) + else if (meta_wayland_surface_is_xwayland (surface)) { data->window_associated_handler_id = g_signal_connect (surface->role, "window-associated", @@ -475,7 +475,7 @@ should_constraint_be_enabled (MetaWaylandPointerConstraint *constraint) * For subsurfaces the window of the ancestor might be gone already. */ #ifdef HAVE_XWAYLAND - g_warn_if_fail (meta_xwayland_is_xwayland_surface (constraint->surface) || + g_warn_if_fail (meta_wayland_surface_is_xwayland (constraint->surface) || META_IS_WAYLAND_SUBSURFACE (constraint->surface->role)); #endif return FALSE; @@ -488,8 +488,7 @@ should_constraint_be_enabled (MetaWaylandPointerConstraint *constraint) if (constraint->seat->pointer->focus_surface != constraint->surface) return FALSE; -#ifdef HAVE_XWAYLAND - if (meta_xwayland_is_xwayland_surface (constraint->surface)) + if (meta_wayland_surface_is_xwayland (constraint->surface)) { MetaDisplay *display = meta_window_get_display (window); @@ -511,7 +510,6 @@ should_constraint_be_enabled (MetaWaylandPointerConstraint *constraint) display->focus_window->client_type != META_WINDOW_CLIENT_TYPE_X11) return FALSE; } -#endif if (!meta_window_appears_focused (window)) return FALSE; @@ -632,9 +630,7 @@ meta_wayland_pointer_constraint_calculate_effective_region (MetaWaylandPointerCo MetaFrame *frame = window->frame; int actual_width, actual_height; -#ifdef HAVE_XWAYLAND - g_assert (meta_xwayland_is_xwayland_surface (constraint->surface)); -#endif + g_assert (meta_wayland_surface_is_xwayland (constraint->surface)); actual_width = window->buffer_rect.width - (frame->child_x + frame->right_width); |