aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config/output.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-08-26 10:50:02 -0400
committerLibravatar GitHub <noreply@github.com>2018-08-26 10:50:02 -0400
commit10c2c09cf67021e0e3a3cb4e733841fed1f8eaa9 (patch)
treea78b580f6fe08dda7a94633e47c31c717e190c9c /sway/config/output.c
parentMerge pull request #2515 from RyanDwyer/remove-layout-file (diff)
parentAdd comment for sway_root.all_outputs (diff)
downloadsway-10c2c09cf67021e0e3a3cb4e733841fed1f8eaa9.tar.gz
sway-10c2c09cf67021e0e3a3cb4e733841fed1f8eaa9.tar.zst
sway-10c2c09cf67021e0e3a3cb4e733841fed1f8eaa9.zip
Merge pull request #2513 from RyanDwyer/rename-root-outputs
Rename sway_root.outputs to sway_root.all_outputs
Diffstat (limited to 'sway/config/output.c')
-rw-r--r--sway/config/output.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/config/output.c b/sway/config/output.c
index 199267bf..16ec9339 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -289,7 +289,8 @@ void apply_output_config_to_outputs(struct output_config *oc) {
289 bool wildcard = strcmp(oc->name, "*") == 0; 289 bool wildcard = strcmp(oc->name, "*") == 0;
290 char id[128]; 290 char id[128];
291 struct sway_output *sway_output; 291 struct sway_output *sway_output;
292 wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { 292 wl_list_for_each(sway_output,
293 &root_container.sway_root->all_outputs, link) {
293 char *name = sway_output->wlr_output->name; 294 char *name = sway_output->wlr_output->name;
294 output_get_identifier(id, sizeof(id), sway_output); 295 output_get_identifier(id, sizeof(id), sway_output);
295 if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) { 296 if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) {
@@ -349,7 +350,8 @@ static void default_output_config(struct output_config *oc,
349 350
350void create_default_output_configs(void) { 351void create_default_output_configs(void) {
351 struct sway_output *sway_output; 352 struct sway_output *sway_output;
352 wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { 353 wl_list_for_each(sway_output,
354 &root_container.sway_root->all_outputs, link) {
353 char *name = sway_output->wlr_output->name; 355 char *name = sway_output->wlr_output->name;
354 struct output_config *oc = new_output_config(name); 356 struct output_config *oc = new_output_config(name);
355 default_output_config(oc, sway_output->wlr_output); 357 default_output_config(oc, sway_output->wlr_output);