sway

commit 95c65ee33ea05963e334555311414e0d834de4b7
parent 00a4591b39182fe57c86e72f06f78fb61475f952
Author: Drew DeVault <sir@cmpwn.com>
Date:   Mon, 16 Nov 2015 10:49:02 -0500

Merge pull request #232 from sce/replace_output_config

cmd_output: Replace existing config if called multiple times.
Diffstat:
M
include/config.h
 | 
1
+
M
sway/commands.c
 | 
9
+++++++++
M
sway/config.c
 | 
2
+-

3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/include/config.h b/include/config.h
@@ -98,6 +98,7 @@ char *do_var_replacement(char *str);
 /** Sets up a WLC output handle based on a given output_config.
  */
 void apply_output_config(struct output_config *oc, swayc_t *output);
+void free_output_config(struct output_config *oc);
 
 /**
  * Global config singleton.
diff --git a/sway/commands.c b/sway/commands.c
@@ -733,6 +733,15 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
 		}
 	}
 
+	for (i = 0; i < config->output_configs->length; ++i) {
+		struct output_config *oc = config->output_configs->items[i];
+		if (strcmp(oc->name, output->name) == 0) {
+			// replace existing config
+			list_del(config->output_configs, i);
+			free_output_config(oc);
+			break;
+		}
+	}
 	list_add(config->output_configs, output);
 
 	sway_log(L_DEBUG, "Config stored for output %s (%d x %d @ %d, %d)",
diff --git a/sway/config.c b/sway/config.c
@@ -36,7 +36,7 @@ static void free_mode(struct sway_mode *mode) {
 	free(mode);
 }
 
-static void free_output_config(struct output_config *oc) {
+void free_output_config(struct output_config *oc) {
 	free(oc->name);
 	free(oc);
 }