diff options
author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-09-03 00:32:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-03 00:32:09 -0400 |
commit | c9276f04c9fae7a211164003bc9cb8b4369db5fd (patch) | |
tree | f950fd298c335abd992005a26029dbfba8010136 | |
parent | Merge pull request #2562 from RyanDwyer/ld-library-path (diff) | |
parent | Merge branch 'master' into disabled-no-modeset (diff) | |
download | sway-c9276f04c9fae7a211164003bc9cb8b4369db5fd.tar.gz sway-c9276f04c9fae7a211164003bc9cb8b4369db5fd.tar.zst sway-c9276f04c9fae7a211164003bc9cb8b4369db5fd.zip |
Merge pull request #2553 from emersion/disabled-no-modeset
Do not modeset disabled outputs
-rw-r--r-- | sway/config/output.c | 4 | ||||
-rw-r--r-- | sway/desktop/output.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 16ec9339..65f09258 100644 --- a/sway/config/output.c +++ b/sway/config/output.c | |||
@@ -196,6 +196,10 @@ void apply_output_config(struct output_config *oc, struct sway_container *output | |||
196 | wlr_log(WLR_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width, | 196 | wlr_log(WLR_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width, |
197 | oc->height, oc->refresh_rate); | 197 | oc->height, oc->refresh_rate); |
198 | set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate); | 198 | set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate); |
199 | } else if (!wl_list_empty(&wlr_output->modes)) { | ||
200 | struct wlr_output_mode *mode = | ||
201 | wl_container_of(wlr_output->modes.prev, mode, link); | ||
202 | wlr_output_set_mode(wlr_output, mode); | ||
199 | } | 203 | } |
200 | if (oc && oc->scale > 0) { | 204 | if (oc && oc->scale > 0) { |
201 | wlr_log(WLR_DEBUG, "Set %s scale to %f", oc->name, oc->scale); | 205 | wlr_log(WLR_DEBUG, "Set %s scale to %f", oc->name, oc->scale); |
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index c228979d..c30e52a1 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -559,12 +559,6 @@ void handle_new_output(struct wl_listener *listener, void *data) { | |||
559 | 559 | ||
560 | wl_list_insert(&root_container.sway_root->all_outputs, &output->link); | 560 | wl_list_insert(&root_container.sway_root->all_outputs, &output->link); |
561 | 561 | ||
562 | if (!wl_list_empty(&wlr_output->modes)) { | ||
563 | struct wlr_output_mode *mode = | ||
564 | wl_container_of(wlr_output->modes.prev, mode, link); | ||
565 | wlr_output_set_mode(wlr_output, mode); | ||
566 | } | ||
567 | |||
568 | output_enable(output); | 562 | output_enable(output); |
569 | } | 563 | } |
570 | 564 | ||