Merge pull request #278 from christophgysin/merge

cmd_output: Merge instead of replace output config

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 {
  */
 struct output_config {
         char *name;
-        bool enabled;
+        int enabled;
         int width, height;
         int x, y;
         char *background;
@@ -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);