diff options
author | Alexander Orzechowski <orzechowski.alexander@gmail.com> | 2022-03-01 16:19:23 -0500 |
---|---|---|
committer | Kirill Primak <vyivel@eclair.cafe> | 2024-01-18 18:36:54 +0300 |
commit | b4d7e84d3852ea93d2aab22f5993f84a7060b950 (patch) | |
tree | b3b3e32af7044e3af6679482a861e650e20eed62 /sway/desktop/output.c | |
parent | layer-shell: don't configure uninitialized surfaces (diff) | |
download | sway-b4d7e84d3852ea93d2aab22f5993f84a7060b950.tar.gz sway-b4d7e84d3852ea93d2aab22f5993f84a7060b950.tar.zst sway-b4d7e84d3852ea93d2aab22f5993f84a7060b950.zip |
desktop: Rename layers to shell_layers
This code will be deleted later, but for the time being rename
it so it doesn't conflict with future properties.
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 8b84da86..928c77d6 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -347,10 +347,10 @@ static void output_for_each_surface(struct sway_output *output, | |||
347 | #endif | 347 | #endif |
348 | } else { | 348 | } else { |
349 | output_layer_for_each_surface(output, | 349 | output_layer_for_each_surface(output, |
350 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND], | 350 | &output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND], |
351 | iterator, user_data); | 351 | iterator, user_data); |
352 | output_layer_for_each_surface(output, | 352 | output_layer_for_each_surface(output, |
353 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM], | 353 | &output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM], |
354 | iterator, user_data); | 354 | iterator, user_data); |
355 | 355 | ||
356 | workspace_for_each_container(workspace, | 356 | workspace_for_each_container(workspace, |
@@ -361,13 +361,13 @@ static void output_for_each_surface(struct sway_output *output, | |||
361 | iterator, user_data); | 361 | iterator, user_data); |
362 | #endif | 362 | #endif |
363 | output_layer_for_each_surface(output, | 363 | output_layer_for_each_surface(output, |
364 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP], | 364 | &output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP], |
365 | iterator, user_data); | 365 | iterator, user_data); |
366 | } | 366 | } |
367 | 367 | ||
368 | overlay: | 368 | overlay: |
369 | output_layer_for_each_surface(output, | 369 | output_layer_for_each_surface(output, |
370 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], | 370 | &output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], |
371 | iterator, user_data); | 371 | iterator, user_data); |
372 | output_drag_icons_for_each_surface(output, &root->drag_icons, | 372 | output_drag_icons_for_each_surface(output, &root->drag_icons, |
373 | iterator, user_data); | 373 | iterator, user_data); |
@@ -399,7 +399,7 @@ struct sway_workspace *output_get_active_workspace(struct sway_output *output) { | |||
399 | bool output_has_opaque_overlay_layer_surface(struct sway_output *output) { | 399 | bool output_has_opaque_overlay_layer_surface(struct sway_output *output) { |
400 | struct sway_layer_surface *sway_layer_surface; | 400 | struct sway_layer_surface *sway_layer_surface; |
401 | wl_list_for_each(sway_layer_surface, | 401 | wl_list_for_each(sway_layer_surface, |
402 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], link) { | 402 | &output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], link) { |
403 | struct wlr_surface *wlr_surface = sway_layer_surface->layer_surface->surface; | 403 | struct wlr_surface *wlr_surface = sway_layer_surface->layer_surface->surface; |
404 | pixman_box32_t output_box = { | 404 | pixman_box32_t output_box = { |
405 | .x2 = output->width, | 405 | .x2 = output->width, |
@@ -488,7 +488,7 @@ static bool scan_out_fullscreen_view(struct sway_output *output, | |||
488 | } | 488 | } |
489 | #endif | 489 | #endif |
490 | 490 | ||
491 | if (!wl_list_empty(&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY])) { | 491 | if (!wl_list_empty(&output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY])) { |
492 | return false; | 492 | return false; |
493 | } | 493 | } |
494 | if (!wl_list_empty(&root->drag_icons)) { | 494 | if (!wl_list_empty(&root->drag_icons)) { |