diff options
author | Isaac Freund <ifreund@ifreund.xyz> | 2020-06-30 16:05:06 +0200 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-06-30 16:19:00 +0200 |
commit | 76adcc3fd3aca74bf45db69d6dbcf3a8443ff159 (patch) | |
tree | 4fea1953bb42937706baf2860f6c5378025a7593 /sway/desktop | |
parent | seat: Refocus seat when wlr_drag is destroyed (diff) | |
download | sway-76adcc3fd3aca74bf45db69d6dbcf3a8443ff159.tar.gz sway-76adcc3fd3aca74bf45db69d6dbcf3a8443ff159.tar.zst sway-76adcc3fd3aca74bf45db69d6dbcf3a8443ff159.zip |
output: simplify loop over layer surfaces
Diffstat (limited to 'sway/desktop')
-rw-r--r-- | sway/desktop/output.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 2a2e332a..4a51b5cc 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -434,18 +434,10 @@ struct sway_workspace *output_get_active_workspace(struct sway_output *output) { | |||
434 | } | 434 | } |
435 | 435 | ||
436 | bool output_has_opaque_overlay_layer_surface(struct sway_output *output) { | 436 | bool output_has_opaque_overlay_layer_surface(struct sway_output *output) { |
437 | struct wlr_layer_surface_v1 *wlr_layer_surface_v1; | 437 | struct sway_layer_surface *sway_layer_surface; |
438 | wl_list_for_each(wlr_layer_surface_v1, &server.layer_shell->surfaces, link) { | 438 | wl_list_for_each(sway_layer_surface, |
439 | if (wlr_layer_surface_v1->output != output->wlr_output || | 439 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], link) { |
440 | wlr_layer_surface_v1->current.layer != ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) { | 440 | struct wlr_surface *wlr_surface = sway_layer_surface->layer_surface->surface; |
441 | continue; | ||
442 | } | ||
443 | struct wlr_surface *wlr_surface = wlr_layer_surface_v1->surface; | ||
444 | struct sway_layer_surface *sway_layer_surface = | ||
445 | layer_from_wlr_layer_surface_v1(wlr_layer_surface_v1); | ||
446 | if (sway_layer_surface == NULL) { | ||
447 | continue; | ||
448 | } | ||
449 | pixman_box32_t output_box = { | 441 | pixman_box32_t output_box = { |
450 | .x2 = output->width, | 442 | .x2 = output->width, |
451 | .y2 = output->height, | 443 | .y2 = output->height, |