From 2e7401772e740487bed27fc07c4d83398480ae6a Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 25 Aug 2018 19:29:04 +1000 Subject: Rename sway_root.outputs to sway_root.all_outputs This list includes disabled outputs. When sway_container is demoted, we'll need to store the root's children (ie. enabled outputs) in the sway_root. It makes sense to put these in a list called `outputs`, so I'm renaming the existing list in advance. --- sway/config/output.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sway/config') diff --git a/sway/config/output.c b/sway/config/output.c index 7f9b1007..d939eea6 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -288,7 +288,8 @@ void apply_output_config_to_outputs(struct output_config *oc) { bool wildcard = strcmp(oc->name, "*") == 0; char id[128]; struct sway_output *sway_output; - wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { + wl_list_for_each(sway_output, + &root_container.sway_root->all_outputs, link) { char *name = sway_output->wlr_output->name; output_get_identifier(id, sizeof(id), sway_output); if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) { @@ -348,7 +349,8 @@ static void default_output_config(struct output_config *oc, void create_default_output_configs(void) { struct sway_output *sway_output; - wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { + wl_list_for_each(sway_output, + &root_container.sway_root->all_outputs, link) { char *name = sway_output->wlr_output->name; struct output_config *oc = new_output_config(name); default_output_config(oc, sway_output->wlr_output); -- cgit v1.2.3-54-g00ecf