diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-29 20:04:24 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-29 20:04:24 +1000 |
commit | a2fbb20a616444213ff3967b33eed7f4561e3978 (patch) | |
tree | 276a133eb78d6e0655bc164693650454d43a22ca /sway/desktop/output.c | |
parent | Add comment about usage to arrange_windows declaration (diff) | |
parent | Merge pull request #2172 from apreiml/fix-keybinding-modifier-handling (diff) | |
download | sway-a2fbb20a616444213ff3967b33eed7f4561e3978.tar.gz sway-a2fbb20a616444213ff3967b33eed7f4561e3978.tar.zst sway-a2fbb20a616444213ff3967b33eed7f4561e3978.zip |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 34fefaa9..69d0bdd4 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -1263,6 +1263,8 @@ static void damage_handle_destroy(struct wl_listener *listener, void *data) { | |||
1263 | 1263 | ||
1264 | static void handle_destroy(struct wl_listener *listener, void *data) { | 1264 | static void handle_destroy(struct wl_listener *listener, void *data) { |
1265 | struct sway_output *output = wl_container_of(listener, output, destroy); | 1265 | struct sway_output *output = wl_container_of(listener, output, destroy); |
1266 | wl_signal_emit(&output->events.destroy, output); | ||
1267 | |||
1266 | if (output->swayc) { | 1268 | if (output->swayc) { |
1267 | container_destroy(output->swayc); | 1269 | container_destroy(output->swayc); |
1268 | } | 1270 | } |
@@ -1343,6 +1345,7 @@ void output_enable(struct sway_output *output) { | |||
1343 | for (size_t i = 0; i < len; ++i) { | 1345 | for (size_t i = 0; i < len; ++i) { |
1344 | wl_list_init(&output->layers[i]); | 1346 | wl_list_init(&output->layers[i]); |
1345 | } | 1347 | } |
1348 | wl_signal_init(&output->events.destroy); | ||
1346 | 1349 | ||
1347 | input_manager_configure_xcursor(input_manager); | 1350 | input_manager_configure_xcursor(input_manager); |
1348 | 1351 | ||