diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-10-28 12:42:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-28 12:42:27 +0100 |
commit | 09f3f7b75ffb5e73fc28f889d27900e896f8396f (patch) | |
tree | e328a641a5bcaa67a88a2c47be4994ee869c08b8 /sway/tree | |
parent | Merge pull request #3010 from Emantor/fix/cursor_warping_view_map (diff) | |
parent | output: initialize layers and signal before using functions (diff) | |
download | sway-09f3f7b75ffb5e73fc28f889d27900e896f8396f.tar.gz sway-09f3f7b75ffb5e73fc28f889d27900e896f8396f.tar.zst sway-09f3f7b75ffb5e73fc28f889d27900e896f8396f.zip |
Merge pull request #3011 from Emantor/fix/2922
output: initialize layers before usage in apply_config
Diffstat (limited to 'sway/tree')
-rw-r--r-- | sway/tree/output.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c index e5794b8a..632501e1 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c | |||
@@ -65,6 +65,12 @@ void output_enable(struct sway_output *output, struct output_config *oc) { | |||
65 | return; | 65 | return; |
66 | } | 66 | } |
67 | struct wlr_output *wlr_output = output->wlr_output; | 67 | struct wlr_output *wlr_output = output->wlr_output; |
68 | size_t len = sizeof(output->layers) / sizeof(output->layers[0]); | ||
69 | for (size_t i = 0; i < len; ++i) { | ||
70 | wl_list_init(&output->layers[i]); | ||
71 | } | ||
72 | wl_signal_init(&output->events.destroy); | ||
73 | |||
68 | output->enabled = true; | 74 | output->enabled = true; |
69 | apply_output_config(oc, output); | 75 | apply_output_config(oc, output); |
70 | list_add(root->outputs, output); | 76 | list_add(root->outputs, output); |
@@ -92,12 +98,6 @@ void output_enable(struct sway_output *output, struct output_config *oc) { | |||
92 | ipc_event_workspace(NULL, ws, "init"); | 98 | ipc_event_workspace(NULL, ws, "init"); |
93 | } | 99 | } |
94 | 100 | ||
95 | size_t len = sizeof(output->layers) / sizeof(output->layers[0]); | ||
96 | for (size_t i = 0; i < len; ++i) { | ||
97 | wl_list_init(&output->layers[i]); | ||
98 | } | ||
99 | wl_signal_init(&output->events.destroy); | ||
100 | |||
101 | input_manager_configure_xcursor(); | 101 | input_manager_configure_xcursor(); |
102 | 102 | ||
103 | wl_signal_add(&wlr_output->events.mode, &output->mode); | 103 | wl_signal_add(&wlr_output->events.mode, &output->mode); |