diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-06-06 17:12:02 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-06-06 20:11:24 -0400 |
commit | a0bbe67076b8e32b47a272bc1e96be853006c65d (patch) | |
tree | 3faf1af6058947968b958d2bdabdbc47ea3bfa06 /sway/desktop/output.c | |
parent | Store sway_outputs so that they can be reenabled (diff) | |
download | sway-a0bbe67076b8e32b47a272bc1e96be853006c65d.tar.gz sway-a0bbe67076b8e32b47a272bc1e96be853006c65d.tar.zst sway-a0bbe67076b8e32b47a272bc1e96be853006c65d.zip |
Address emersions comments on output re-enabling
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 5d02f5eb..cb53a980 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -1221,6 +1221,8 @@ void handle_new_output(struct wl_listener *listener, void *data) { | |||
1221 | output->server = server; | 1221 | output->server = server; |
1222 | list_add(root_container.sway_root->outputs, output); | 1222 | list_add(root_container.sway_root->outputs, output); |
1223 | 1223 | ||
1224 | output->damage = wlr_output_damage_create(wlr_output); | ||
1225 | |||
1224 | if (!wl_list_empty(&wlr_output->modes)) { | 1226 | if (!wl_list_empty(&wlr_output->modes)) { |
1225 | struct wlr_output_mode *mode = | 1227 | struct wlr_output_mode *mode = |
1226 | wl_container_of(wlr_output->modes.prev, mode, link); | 1228 | wl_container_of(wlr_output->modes.prev, mode, link); |
@@ -1233,14 +1235,6 @@ void handle_new_output(struct wl_listener *listener, void *data) { | |||
1233 | void output_enable(struct sway_output *output) { | 1235 | void output_enable(struct sway_output *output) { |
1234 | struct wlr_output *wlr_output = output->wlr_output; | 1236 | struct wlr_output *wlr_output = output->wlr_output; |
1235 | 1237 | ||
1236 | if (!wlr_output->data) { | ||
1237 | wlr_output->data = output; | ||
1238 | } | ||
1239 | |||
1240 | if (!output->damage) { | ||
1241 | output->damage = wlr_output_damage_create(wlr_output); | ||
1242 | } | ||
1243 | |||
1244 | output->swayc = output_create(output); | 1238 | output->swayc = output_create(output); |
1245 | if (!output->swayc) { | 1239 | if (!output->swayc) { |
1246 | // Output is disabled | 1240 | // Output is disabled |