From a737d7ecc4d7f4825ca7879e3449522bc87049be Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 17 Jan 2019 22:30:24 +0100 Subject: Better handle outputs without CRTC This happens if you plug in more outputs than supported by your GPU. This patch makes it so outputs without CRTCs appear as disabled. As soon as they get a CRTC (signalled via the mode event), we can enable them. --- sway/tree/output.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'sway/tree') diff --git a/sway/tree/output.c b/sway/tree/output.c index 3c376c6b..21beb504 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c @@ -78,6 +78,12 @@ void output_enable(struct sway_output *output, struct output_config *oc) { } output->enabled = true; + if (!apply_output_config(oc, output)) { + output->enabled = false; + return; + } + + output->configured = true; list_add(root->outputs, output); output->lx = wlr_output->lx; @@ -104,8 +110,6 @@ void output_enable(struct sway_output *output, struct output_config *oc) { ipc_event_workspace(NULL, ws, "init"); } - apply_output_config(oc, output); - if (ws && config->default_orientation == L_NONE) { // Since the output transformation and resolution could have changed // due to applying the output config, the previously set layout for the -- cgit v1.2.3