From 6eb8da0e147aa535ec0736684237890ad4291d84 Mon Sep 17 00:00:00 2001 From: "S. Christoffer Eliesen" Date: Wed, 21 Oct 2015 22:22:01 +0200 Subject: commands,container: Tweak debug output to better reflect reality. --- sway/commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sway/commands.c') diff --git a/sway/commands.c b/sway/commands.c index eb77c172..7b026fd2 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -619,7 +619,7 @@ static enum cmd_status cmd_output(int argc, char **argv) { list_add(config->output_configs, output); - sway_log(L_DEBUG, "Configured output %s to %d x %d @ %d, %d", + sway_log(L_DEBUG, "Config stored for output %s (%d x %d @ %d, %d)", output->name, output->width, output->height, output->x, output->y); return CMD_SUCCESS; -- cgit v1.2.3 From ca862a5bd45ef094d0f0de5a0765224524b74c48 Mon Sep 17 00:00:00 2001 From: "S. Christoffer Eliesen" Date: Wed, 21 Oct 2015 16:34:12 +0200 Subject: config: Apply output config also during config reload. --- sway/commands.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'sway/commands.c') diff --git a/sway/commands.c b/sway/commands.c index 7b026fd2..9eb0928e 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -622,6 +622,20 @@ static enum cmd_status cmd_output(int argc, char **argv) { sway_log(L_DEBUG, "Config stored for output %s (%d x %d @ %d, %d)", output->name, output->width, output->height, output->x, output->y); + if (output->name) { + // Try to find the output container and apply configuration now. If + // this is during startup then there will be no container and config + // will be applied during normal "new output" event from wlc. + swayc_t *cont = NULL; + for (int i = 0; i < root_container.children->length; ++i) { + cont = root_container.children->items[i]; + if (cont->name && strcmp(cont->name, output->name) == 0) { + apply_output_config(output, cont); + break; + } + } + } + return CMD_SUCCESS; } -- cgit v1.2.3 From 9b271573a9c5b4f55a1625435aa01de0539f3333 Mon Sep 17 00:00:00 2001 From: "S. Christoffer Eliesen" Date: Thu, 22 Oct 2015 00:15:23 +0200 Subject: commands: Allow changing resolution outside config load. --- sway/commands.c | 1 - 1 file changed, 1 deletion(-) (limited to 'sway/commands.c') diff --git a/sway/commands.c b/sway/commands.c index 9eb0928e..7605a36b 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -561,7 +561,6 @@ static enum cmd_status cmd_orientation(int argc, char **argv) { } static enum cmd_status cmd_output(int argc, char **argv) { - if (!config->reading) return CMD_FAILURE; if (!checkarg(argc, "output", EXPECTED_AT_LEAST, 1)) { return CMD_FAILURE; } -- cgit v1.2.3