diff options
author | Christoph Gysin <christoph.gysin@gmail.com> | 2015-11-29 22:51:48 +0200 |
---|---|---|
committer | Christoph Gysin <christoph.gysin@gmail.com> | 2015-11-29 23:17:56 +0200 |
commit | b1bd3ae6f3210e6b3ecda2d253518da18420e6cd (patch) | |
tree | 358cdee3a8c412eb22ee52c2437d8f151ef2627b /include/config.h | |
parent | config: Store 'enabled' as int (diff) | |
download | sway-b1bd3ae6f3210e6b3ecda2d253518da18420e6cd.tar.gz sway-b1bd3ae6f3210e6b3ecda2d253518da18420e6cd.tar.zst sway-b1bd3ae6f3210e6b3ecda2d253518da18420e6cd.zip |
cmd_output: Merge instead of replace output config
Diffstat (limited to 'include/config.h')
-rw-r--r-- | include/config.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h index 631c8178..b9ef340b 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -99,6 +99,7 @@ bool read_config(FILE *file, bool is_active); | |||
99 | */ | 99 | */ |
100 | char *do_var_replacement(char *str); | 100 | char *do_var_replacement(char *str); |
101 | int output_name_cmp(const void *item, const void *data); | 101 | int output_name_cmp(const void *item, const void *data); |
102 | void merge_output_config(struct output_config *dst, struct output_config *src); | ||
102 | /** Sets up a WLC output handle based on a given output_config. | 103 | /** Sets up a WLC output handle based on a given output_config. |
103 | */ | 104 | */ |
104 | void apply_output_config(struct output_config *oc, swayc_t *output); | 105 | void apply_output_config(struct output_config *oc, swayc_t *output); |