From ae7ed795730398d50e6408575a1edfbd5c34bd3c Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Sun, 29 Nov 2015 23:17:42 +0200 Subject: config: Store 'enabled' as int --- include/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/config.h b/include/config.h index 9caadec8..631c8178 100644 --- a/include/config.h +++ b/include/config.h @@ -40,7 +40,7 @@ struct sway_mode { */ struct output_config { char *name; - bool enabled; + int enabled; int width, height; int x, y; char *background; -- cgit v1.2.3 From b1bd3ae6f3210e6b3ecda2d253518da18420e6cd Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Sun, 29 Nov 2015 22:51:48 +0200 Subject: cmd_output: Merge instead of replace output config --- include/config.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') 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); */ char *do_var_replacement(char *str); int output_name_cmp(const void *item, const void *data); +void merge_output_config(struct output_config *dst, struct output_config *src); /** Sets up a WLC output handle based on a given output_config. */ void apply_output_config(struct output_config *oc, swayc_t *output); -- cgit v1.2.3