aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/output.c
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-09-14 19:21:44 +0200
committerLibravatar emersion <contact@emersion.fr>2018-09-14 19:21:44 +0200
commit7699c5444c32289a22ce2c57d1daadabed87e7ac (patch)
tree74696e6dd2f405e8629061ee010e14e3d6cf0b37 /sway/desktop/output.c
parentMerge pull request #2628 from RyanDwyer/remove-rejigger-assertion (diff)
downloadsway-7699c5444c32289a22ce2c57d1daadabed87e7ac.tar.gz
sway-7699c5444c32289a22ce2c57d1daadabed87e7ac.tar.zst
sway-7699c5444c32289a22ce2c57d1daadabed87e7ac.zip
Update for swaywm/wlroots#1243
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r--sway/desktop/output.c16
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,
182 void *user_data) { 182 void *user_data) {
183 struct sway_layer_surface *layer_surface; 183 struct sway_layer_surface *layer_surface;
184 wl_list_for_each(layer_surface, layer_surfaces, link) { 184 wl_list_for_each(layer_surface, layer_surfaces, link) {
185 struct wlr_layer_surface *wlr_layer_surface = 185 struct wlr_layer_surface_v1 *wlr_layer_surface_v1 =
186 layer_surface->layer_surface; 186 layer_surface->layer_surface;
187 output_surface_for_each_surface(output, wlr_layer_surface->surface, 187 output_surface_for_each_surface(output, wlr_layer_surface_v1->surface,
188 layer_surface->geo.x, layer_surface->geo.y, iterator, 188 layer_surface->geo.x, layer_surface->geo.y, iterator,
189 user_data); 189 user_data);
190 } 190 }
@@ -240,15 +240,15 @@ struct sway_workspace *output_get_active_workspace(struct sway_output *output) {
240} 240}
241 241
242bool output_has_opaque_overlay_layer_surface(struct sway_output *output) { 242bool output_has_opaque_overlay_layer_surface(struct sway_output *output) {
243 struct wlr_layer_surface *wlr_layer_surface; 243 struct wlr_layer_surface_v1 *wlr_layer_surface_v1;
244 wl_list_for_each(wlr_layer_surface, &server.layer_shell->surfaces, link) { 244 wl_list_for_each(wlr_layer_surface_v1, &server.layer_shell->surfaces, link) {
245 if (wlr_layer_surface->output != output->wlr_output || 245 if (wlr_layer_surface_v1->output != output->wlr_output ||
246 wlr_layer_surface->layer != ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) { 246 wlr_layer_surface_v1->layer != ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) {
247 continue; 247 continue;
248 } 248 }
249 struct wlr_surface *wlr_surface = wlr_layer_surface->surface; 249 struct wlr_surface *wlr_surface = wlr_layer_surface_v1->surface;
250 struct sway_layer_surface *sway_layer_surface = 250 struct sway_layer_surface *sway_layer_surface =
251 layer_from_wlr_layer_surface(wlr_layer_surface); 251 layer_from_wlr_layer_surface_v1(wlr_layer_surface_v1);
252 pixman_box32_t output_box = { 252 pixman_box32_t output_box = {
253 .x2 = output->width, 253 .x2 = output->width,
254 .y2 = output->height, 254 .y2 = output->height,