diff options
Diffstat (limited to 'sway/desktop/layer_shell.c')
-rw-r--r-- | sway/desktop/layer_shell.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index cf795dc7..50aa6938 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c | |||
@@ -219,7 +219,7 @@ void arrange_layers(struct sway_output *output) { | |||
219 | wl_list_for_each_reverse(layer, | 219 | wl_list_for_each_reverse(layer, |
220 | &output->layers[layers_above_shell[i]], link) { | 220 | &output->layers[layers_above_shell[i]], link) { |
221 | if (layer->layer_surface->current.keyboard_interactive && | 221 | if (layer->layer_surface->current.keyboard_interactive && |
222 | layer->layer_surface->mapped) { | 222 | layer->layer_surface->surface->mapped) { |
223 | topmost = layer; | 223 | topmost = layer; |
224 | break; | 224 | break; |
225 | } | 225 | } |
@@ -253,7 +253,7 @@ static struct sway_layer_surface *find_mapped_layer_by_client( | |||
253 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], link) { | 253 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], link) { |
254 | struct wl_resource *resource = lsurface->layer_surface->resource; | 254 | struct wl_resource *resource = lsurface->layer_surface->resource; |
255 | if (wl_resource_get_client(resource) == client | 255 | if (wl_resource_get_client(resource) == client |
256 | && lsurface->layer_surface->mapped) { | 256 | && lsurface->layer_surface->surface->mapped) { |
257 | return lsurface; | 257 | return lsurface; |
258 | } | 258 | } |
259 | } | 259 | } |
@@ -293,8 +293,8 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) { | |||
293 | 293 | ||
294 | bool layer_changed = false; | 294 | bool layer_changed = false; |
295 | if (layer_surface->current.committed != 0 | 295 | if (layer_surface->current.committed != 0 |
296 | || layer->mapped != layer_surface->mapped) { | 296 | || layer->mapped != layer_surface->surface->mapped) { |
297 | layer->mapped = layer_surface->mapped; | 297 | layer->mapped = layer_surface->surface->mapped; |
298 | layer_changed = layer->layer != layer_surface->current.layer; | 298 | layer_changed = layer->layer != layer_surface->current.layer; |
299 | if (layer_changed) { | 299 | if (layer_changed) { |
300 | wl_list_remove(&layer->link); | 300 | wl_list_remove(&layer->link); |
@@ -349,7 +349,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { | |||
349 | wl_container_of(listener, sway_layer, destroy); | 349 | wl_container_of(listener, sway_layer, destroy); |
350 | sway_log(SWAY_DEBUG, "Layer surface destroyed (%s)", | 350 | sway_log(SWAY_DEBUG, "Layer surface destroyed (%s)", |
351 | sway_layer->layer_surface->namespace); | 351 | sway_layer->layer_surface->namespace); |
352 | if (sway_layer->layer_surface->mapped) { | 352 | if (sway_layer->layer_surface->surface->mapped) { |
353 | unmap(sway_layer); | 353 | unmap(sway_layer); |
354 | } | 354 | } |
355 | 355 | ||
@@ -454,9 +454,9 @@ static struct sway_layer_subsurface *create_subsurface( | |||
454 | wl_list_insert(&layer_surface->subsurfaces, &subsurface->link); | 454 | wl_list_insert(&layer_surface->subsurfaces, &subsurface->link); |
455 | 455 | ||
456 | subsurface->map.notify = subsurface_handle_map; | 456 | subsurface->map.notify = subsurface_handle_map; |
457 | wl_signal_add(&wlr_subsurface->events.map, &subsurface->map); | 457 | wl_signal_add(&wlr_subsurface->surface->events.map, &subsurface->map); |
458 | subsurface->unmap.notify = subsurface_handle_unmap; | 458 | subsurface->unmap.notify = subsurface_handle_unmap; |
459 | wl_signal_add(&wlr_subsurface->events.unmap, &subsurface->unmap); | 459 | wl_signal_add(&wlr_subsurface->surface->events.unmap, &subsurface->unmap); |
460 | subsurface->destroy.notify = subsurface_handle_destroy; | 460 | subsurface->destroy.notify = subsurface_handle_destroy; |
461 | wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy); | 461 | wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy); |
462 | subsurface->commit.notify = subsurface_handle_commit; | 462 | subsurface->commit.notify = subsurface_handle_commit; |
@@ -571,9 +571,9 @@ static struct sway_layer_popup *create_popup(struct wlr_xdg_popup *wlr_popup, | |||
571 | popup->parent_layer = parent; | 571 | popup->parent_layer = parent; |
572 | 572 | ||
573 | popup->map.notify = popup_handle_map; | 573 | popup->map.notify = popup_handle_map; |
574 | wl_signal_add(&wlr_popup->base->events.map, &popup->map); | 574 | wl_signal_add(&wlr_popup->base->surface->events.map, &popup->map); |
575 | popup->unmap.notify = popup_handle_unmap; | 575 | popup->unmap.notify = popup_handle_unmap; |
576 | wl_signal_add(&wlr_popup->base->events.unmap, &popup->unmap); | 576 | wl_signal_add(&wlr_popup->base->surface->events.unmap, &popup->unmap); |
577 | popup->destroy.notify = popup_handle_destroy; | 577 | popup->destroy.notify = popup_handle_destroy; |
578 | wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy); | 578 | wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy); |
579 | popup->commit.notify = popup_handle_commit; | 579 | popup->commit.notify = popup_handle_commit; |
@@ -661,9 +661,9 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) { | |||
661 | sway_layer->destroy.notify = handle_destroy; | 661 | sway_layer->destroy.notify = handle_destroy; |
662 | wl_signal_add(&layer_surface->events.destroy, &sway_layer->destroy); | 662 | wl_signal_add(&layer_surface->events.destroy, &sway_layer->destroy); |
663 | sway_layer->map.notify = handle_map; | 663 | sway_layer->map.notify = handle_map; |
664 | wl_signal_add(&layer_surface->events.map, &sway_layer->map); | 664 | wl_signal_add(&layer_surface->surface->events.map, &sway_layer->map); |
665 | sway_layer->unmap.notify = handle_unmap; | 665 | sway_layer->unmap.notify = handle_unmap; |
666 | wl_signal_add(&layer_surface->events.unmap, &sway_layer->unmap); | 666 | wl_signal_add(&layer_surface->surface->events.unmap, &sway_layer->unmap); |
667 | sway_layer->new_popup.notify = handle_new_popup; | 667 | sway_layer->new_popup.notify = handle_new_popup; |
668 | wl_signal_add(&layer_surface->events.new_popup, &sway_layer->new_popup); | 668 | wl_signal_add(&layer_surface->events.new_popup, &sway_layer->new_popup); |
669 | sway_layer->new_subsurface.notify = handle_new_subsurface; | 669 | sway_layer->new_subsurface.notify = handle_new_subsurface; |