diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-09-14 21:12:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 21:12:56 -0400 |
| commit | b47f4f5fd4b8dc3852c5958f3e6ec70de448ff2d (patch) | |
| tree | 90b2a21c3a1cf5e0cdb8ef720081e7acfce64eee /sway/desktop/output.c | |
| parent | 3b92d5bb6dcaf6b8fa9b51d9cf879e68d67ee1fb (diff) | |
| parent | 64d567be9b4a1341bca165f02354e077a2f112fb (diff) | |
Merge pull request #2630 from emersion/wlroots-1243
Update for swaywm/wlroots#1243
Diffstat (limited to 'sway/desktop/output.c')
| -rw-r--r-- | sway/desktop/output.c | 16 |
1 files changed, 8 insertions, 8 deletions
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, |