aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway/config.h
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-03-15 15:09:55 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-03-16 10:40:46 -0600
commit3106ef23a7b4f7f7efeb43d47e724f5b23c4fd78 (patch)
tree82335e0f8877d291a36e3c67f8cfefe07bbdde56 /include/sway/config.h
parentFlush stdout in swaymsg when in subscribe mode (diff)
downloadsway-3106ef23a7b4f7f7efeb43d47e724f5b23c4fd78.tar.gz
sway-3106ef23a7b4f7f7efeb43d47e724f5b23c4fd78.tar.zst
sway-3106ef23a7b4f7f7efeb43d47e724f5b23c4fd78.zip
Fix output config retrieval for new outputs
This removes `output_find_config`, which would take the first matching output config it found. This is fine if only a name output config, identifier output config, or even just wildcard exist, but if there is a name output config and identifier output config, they are not merged. Instead, this introduces find_output_config, which is just a wrapper for `get_output_config`. This ensures that both the name and identifier output configs are respected. This fixes the following case: - For simplicity in this example, remove all output configs from config - Run `swaymsg output <name> bg #ff0000 solid_color` - Run `swaymsg output <identifier> scale 2` - Disconnect and reconnect output Without this, the output will have the background, but not the scale. With this, the output will have both the background and scale
Diffstat (limited to 'include/sway/config.h')
-rw-r--r--include/sway/config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sway/config.h b/include/sway/config.h
index 46ca7cee..7c544541 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -585,6 +585,8 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output);
585 585
586struct output_config *store_output_config(struct output_config *oc); 586struct output_config *store_output_config(struct output_config *oc);
587 587
588struct output_config *find_output_config(struct sway_output *output);
589
588void apply_output_config_to_outputs(struct output_config *oc); 590void apply_output_config_to_outputs(struct output_config *oc);
589 591
590void reset_outputs(void); 592void reset_outputs(void);