sway

commit c9276f04c9fae7a211164003bc9cb8b4369db5fd
parent 3af9588eb4aab0b4f45edf2601c9a7ff0846861f
Author: Brian Ashworth <RedSoxFan@users.noreply.github.com>
Date:   Mon,  3 Sep 2018 00:32:09 -0400

Merge pull request #2553 from emersion/disabled-no-modeset

Do not modeset disabled outputs
Diffstat:
M
sway/config/output.c
 | 
4
++++
M
sway/desktop/output.c
 | 
6
------

2 files changed, 4 insertions(+), 6 deletions(-)
diff --git 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
 		wlr_log(WLR_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width,
 			oc->height, oc->refresh_rate);
 		set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate);
+	} else if (!wl_list_empty(&wlr_output->modes)) {
+		struct wlr_output_mode *mode =
+			wl_container_of(wlr_output->modes.prev, mode, link);
+		wlr_output_set_mode(wlr_output, mode);
 	}
 	if (oc && oc->scale > 0) {
 		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
@@ -559,12 +559,6 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 
 	wl_list_insert(&root_container.sway_root->all_outputs, &output->link);
 
-	if (!wl_list_empty(&wlr_output->modes)) {
-		struct wlr_output_mode *mode =
-			wl_container_of(wlr_output->modes.prev, mode, link);
-		wlr_output_set_mode(wlr_output, mode);
-	}
-
 	output_enable(output);
 }