mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-08 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Store sway_outputs so that they can be reenabled

Browse source
This commit is contained in:
Brian Ashworth 2018-06-05 17:56:32 -04:00
parent 22c1c4beb4
commit a1b5b93d29
11 changed files with 118 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sway/commands/output.c
View file

@ -1,5 +1,7 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/output.h"
#include "sway/tree/layout.h"
#include "list.h"
#include "log.h"
@ -80,16 +82,25 @@ struct cmd_results *cmd_output(int argc, char **argv) {
// will be applied during normal "new output" event from wlroots.
char identifier[128];
bool all = strcmp(output->name, "*") == 0;
for (int i = 0; i < root_container.children->length; ++i) {
struct sway_container *cont = root_container.children->items[i];
if (cont->type != C_OUTPUT) {
continue;
}
list_t *sway_outputs = root_container.sway_root->outputs;
for (int i = 0; i < sway_outputs->length; ++i) {
struct sway_output *sway_output = sway_outputs->items[i];
output_get_identifier(identifier, sizeof(identifier), sway_output);
wlr_log(L_DEBUG, "Checking identifier %s", identifier);
if (all || strcmp(sway_output->wlr_output->name, output->name) == 0
|| strcmp(identifier, output->name) == 0) {
if (!sway_output->swayc) {
if (!output->enabled) {
if (!all) {
break;
}
continue;
}
output_get_identifier(identifier, sizeof(identifier), cont->sway_output);
if (all || strcmp(cont->name, output->name) == 0 ||
strcmp(identifier, output->name) == 0) {
apply_output_config(output, cont);
output_enable(sway_output);
}
apply_output_config(output, sway_output->swayc);
if (!all) {
// Stop looking if the output config isn't applicable to all