From 44e9774636983af698a6993699bf1cf131f42c59 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Sat, 7 Nov 2020 22:08:24 +0100 Subject: [PATCH] Update to new surface enter/leave API --- sway/desktop/layer_shell.c | 4 ++-- sway/tree/container.c | 4 ++-- sway/tree/view.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 738b17979..18b18c2e8 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -369,7 +369,7 @@ static void handle_map(struct wl_listener *listener, void *data) { struct sway_output *output = sway_layer->layer_surface->output->data; output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y, sway_layer->layer_surface->surface, true); - wlr_surface_send_enter(sway_layer->layer_surface->surface, + wlr_surface_enter_output(sway_layer->layer_surface->surface, sway_layer->layer_surface->output); cursor_rebase_all(); } @@ -416,7 +416,7 @@ static void popup_handle_map(struct wl_listener *listener, void *data) { struct sway_layer_popup *popup = wl_container_of(listener, popup, map); struct sway_layer_surface *layer = popup_get_layer(popup); struct wlr_output *wlr_output = layer->layer_surface->output; - wlr_surface_send_enter(popup->wlr_popup->base->surface, wlr_output); + wlr_surface_enter_output(popup->wlr_popup->base->surface, wlr_output); popup_damage(popup, true); } diff --git a/sway/tree/container.c b/sway/tree/container.c index 8557210f5..e3467b65e 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -1161,13 +1161,13 @@ bool container_is_fullscreen_or_child(struct sway_container *container) { static void surface_send_enter_iterator(struct wlr_surface *surface, int x, int y, void *data) { struct wlr_output *wlr_output = data; - wlr_surface_send_enter(surface, wlr_output); + wlr_surface_enter_output(surface, wlr_output); } static void surface_send_leave_iterator(struct wlr_surface *surface, int x, int y, void *data) { struct wlr_output *wlr_output = data; - wlr_surface_send_leave(surface, wlr_output); + wlr_surface_leave_output(surface, wlr_output); } void container_discover_outputs(struct sway_container *con) { diff --git a/sway/tree/view.c b/sway/tree/view.c index d699b01eb..67f23aa74 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -1049,7 +1049,7 @@ void view_child_init(struct sway_view_child *child, struct sway_workspace *workspace = child->view->container->workspace; if (workspace) { - wlr_surface_send_enter(child->surface, workspace->output->wlr_output); + wlr_surface_enter_output(child->surface, workspace->output->wlr_output); } view_init_subsurfaces(child->view, surface);