diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-25 19:29:04 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-25 23:41:11 +1000 |
commit | 2e7401772e740487bed27fc07c4d83398480ae6a (patch) | |
tree | 75f420b4769b4264f095f60d4998146b23224bb6 /sway/config | |
parent | Merge pull request #2510 from RyanDwyer/relocate-layout-functions (diff) | |
download | sway-2e7401772e740487bed27fc07c4d83398480ae6a.tar.gz sway-2e7401772e740487bed27fc07c4d83398480ae6a.tar.zst sway-2e7401772e740487bed27fc07c4d83398480ae6a.zip |
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.
Diffstat (limited to 'sway/config')
-rw-r--r-- | sway/config/output.c | 6 |
1 files changed, 4 insertions, 2 deletions
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) { | |||
288 | bool wildcard = strcmp(oc->name, "*") == 0; | 288 | bool wildcard = strcmp(oc->name, "*") == 0; |
289 | char id[128]; | 289 | char id[128]; |
290 | struct sway_output *sway_output; | 290 | struct sway_output *sway_output; |
291 | wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { | 291 | wl_list_for_each(sway_output, |
292 | &root_container.sway_root->all_outputs, link) { | ||
292 | char *name = sway_output->wlr_output->name; | 293 | char *name = sway_output->wlr_output->name; |
293 | output_get_identifier(id, sizeof(id), sway_output); | 294 | output_get_identifier(id, sizeof(id), sway_output); |
294 | if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) { | 295 | if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) { |
@@ -348,7 +349,8 @@ static void default_output_config(struct output_config *oc, | |||
348 | 349 | ||
349 | void create_default_output_configs(void) { | 350 | void create_default_output_configs(void) { |
350 | struct sway_output *sway_output; | 351 | struct sway_output *sway_output; |
351 | wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { | 352 | wl_list_for_each(sway_output, |
353 | &root_container.sway_root->all_outputs, link) { | ||
352 | char *name = sway_output->wlr_output->name; | 354 | char *name = sway_output->wlr_output->name; |
353 | struct output_config *oc = new_output_config(name); | 355 | struct output_config *oc = new_output_config(name); |
354 | default_output_config(oc, sway_output->wlr_output); | 356 | default_output_config(oc, sway_output->wlr_output); |