diff options
author | Dominique Martinet <asmadeus@codewreck.org> | 2018-06-26 21:19:38 +0900 |
---|---|---|
committer | Dominique Martinet <asmadeus@codewreck.org> | 2018-06-26 21:20:56 +0900 |
commit | 6856866a612c9f0708a42cbe6d9627173d9e3569 (patch) | |
tree | 14be83d7e63450352c85e9723977c5f1001ae3c7 /sway/desktop | |
parent | layer_shell: cleanup output link on output destroy (diff) | |
download | sway-6856866a612c9f0708a42cbe6d9627173d9e3569.tar.gz sway-6856866a612c9f0708a42cbe6d9627173d9e3569.tar.zst sway-6856866a612c9f0708a42cbe6d9627173d9e3569.zip |
layer_shell: order destroying before sway_output
Both sway_output and sway_layer_shell listen to wlr's output destroy event,
but sway_layer_shell needs to access into sway_output's data strucure and needs
to be destroyed first.
Resolve this by making sway_layer_shell listen to a new event that happens at
start of sway_output's destroy handler
Diffstat (limited to 'sway/desktop')
-rw-r--r-- | sway/desktop/layer_shell.c | 7 | ||||
-rw-r--r-- | sway/desktop/output.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 94dc22e7..b57d1ee6 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c | |||
@@ -352,10 +352,6 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) { | |||
352 | wl_signal_add(&layer_surface->surface->events.commit, | 352 | wl_signal_add(&layer_surface->surface->events.commit, |
353 | &sway_layer->surface_commit); | 353 | &sway_layer->surface_commit); |
354 | 354 | ||
355 | sway_layer->output_destroy.notify = handle_output_destroy; | ||
356 | wl_signal_add(&layer_surface->output->events.destroy, | ||
357 | &sway_layer->output_destroy); | ||
358 | |||
359 | sway_layer->destroy.notify = handle_destroy; | 355 | sway_layer->destroy.notify = handle_destroy; |
360 | wl_signal_add(&layer_surface->events.destroy, &sway_layer->destroy); | 356 | wl_signal_add(&layer_surface->events.destroy, &sway_layer->destroy); |
361 | sway_layer->map.notify = handle_map; | 357 | sway_layer->map.notify = handle_map; |
@@ -368,6 +364,9 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) { | |||
368 | layer_surface->data = sway_layer; | 364 | layer_surface->data = sway_layer; |
369 | 365 | ||
370 | struct sway_output *output = layer_surface->output->data; | 366 | struct sway_output *output = layer_surface->output->data; |
367 | sway_layer->output_destroy.notify = handle_output_destroy; | ||
368 | wl_signal_add(&output->events.destroy, &sway_layer->output_destroy); | ||
369 | |||
371 | wl_list_insert(&output->layers[layer_surface->layer], &sway_layer->link); | 370 | wl_list_insert(&output->layers[layer_surface->layer], &sway_layer->link); |
372 | 371 | ||
373 | // Temporarily set the layer's current state to client_pending | 372 | // Temporarily set the layer's current state to client_pending |
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index d4115be8..f0f1603a 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -1199,6 +1199,8 @@ static void damage_handle_destroy(struct wl_listener *listener, void *data) { | |||
1199 | 1199 | ||
1200 | static void handle_destroy(struct wl_listener *listener, void *data) { | 1200 | static void handle_destroy(struct wl_listener *listener, void *data) { |
1201 | struct sway_output *output = wl_container_of(listener, output, destroy); | 1201 | struct sway_output *output = wl_container_of(listener, output, destroy); |
1202 | wl_signal_emit(&output->events.destroy, output); | ||
1203 | |||
1202 | if (output->swayc) { | 1204 | if (output->swayc) { |
1203 | container_destroy(output->swayc); | 1205 | container_destroy(output->swayc); |
1204 | } | 1206 | } |
@@ -1277,6 +1279,7 @@ void output_enable(struct sway_output *output) { | |||
1277 | for (size_t i = 0; i < len; ++i) { | 1279 | for (size_t i = 0; i < len; ++i) { |
1278 | wl_list_init(&output->layers[i]); | 1280 | wl_list_init(&output->layers[i]); |
1279 | } | 1281 | } |
1282 | wl_signal_init(&output->events.destroy); | ||
1280 | 1283 | ||
1281 | input_manager_configure_xcursor(input_manager); | 1284 | input_manager_configure_xcursor(input_manager); |
1282 | 1285 | ||