From 7699c5444c32289a22ce2c57d1daadabed87e7ac Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 14 Sep 2018 19:21:44 +0200 Subject: Update for swaywm/wlroots#1243 --- sway/desktop/output.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sway/desktop/output.c') diff --git a/sway/desktop/output.c b/sway/desktop/output.c index e49c4cca..a5db15cd 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -182,9 +182,9 @@ void output_layer_for_each_surface(struct sway_output *output, void *user_data) { struct sway_layer_surface *layer_surface; wl_list_for_each(layer_surface, layer_surfaces, link) { - struct wlr_layer_surface *wlr_layer_surface = + struct wlr_layer_surface_v1 *wlr_layer_surface_v1 = layer_surface->layer_surface; - output_surface_for_each_surface(output, wlr_layer_surface->surface, + output_surface_for_each_surface(output, wlr_layer_surface_v1->surface, layer_surface->geo.x, layer_surface->geo.y, iterator, user_data); } @@ -240,15 +240,15 @@ struct sway_workspace *output_get_active_workspace(struct sway_output *output) { } bool output_has_opaque_overlay_layer_surface(struct sway_output *output) { - struct wlr_layer_surface *wlr_layer_surface; - wl_list_for_each(wlr_layer_surface, &server.layer_shell->surfaces, link) { - if (wlr_layer_surface->output != output->wlr_output || - wlr_layer_surface->layer != ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) { + struct wlr_layer_surface_v1 *wlr_layer_surface_v1; + wl_list_for_each(wlr_layer_surface_v1, &server.layer_shell->surfaces, link) { + if (wlr_layer_surface_v1->output != output->wlr_output || + wlr_layer_surface_v1->layer != ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) { continue; } - struct wlr_surface *wlr_surface = wlr_layer_surface->surface; + struct wlr_surface *wlr_surface = wlr_layer_surface_v1->surface; struct sway_layer_surface *sway_layer_surface = - layer_from_wlr_layer_surface(wlr_layer_surface); + layer_from_wlr_layer_surface_v1(wlr_layer_surface_v1); pixman_box32_t output_box = { .x2 = output->width, .y2 = output->height, -- cgit v1.2.3-54-g00ecf