diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-11-29 16:26:11 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-11-29 16:26:11 -0500 |
commit | 3f950b6e526baaf719f5a7b5d7085f6468b16b29 (patch) | |
tree | 225c3470228ee2f5ac29d29ca046132154404f43 /include | |
parent | Merge pull request #277 from christophgysin/cmd_output (diff) | |
parent | cmd_output: Merge instead of replace output config (diff) | |
download | sway-3f950b6e526baaf719f5a7b5d7085f6468b16b29.tar.gz sway-3f950b6e526baaf719f5a7b5d7085f6468b16b29.tar.zst sway-3f950b6e526baaf719f5a7b5d7085f6468b16b29.zip |
Merge pull request #278 from christophgysin/merge
cmd_output: Merge instead of replace output config
Diffstat (limited to 'include')
-rw-r--r-- | include/config.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/config.h b/include/config.h index 9caadec8..b9ef340b 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -40,7 +40,7 @@ struct sway_mode { | |||
40 | */ | 40 | */ |
41 | struct output_config { | 41 | struct output_config { |
42 | char *name; | 42 | char *name; |
43 | bool enabled; | 43 | int enabled; |
44 | int width, height; | 44 | int width, height; |
45 | int x, y; | 45 | int x, y; |
46 | char *background; | 46 | char *background; |
@@ -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); |