mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmd_output: Replace existing config if called multiple times.

Browse Source
This commit is contained in:
S. Christoffer Eliesen 2015-11-16 11:40:24 +01:00
parent 00a4591b39
commit a94a91a723
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/config.h
View File

@ -98,6 +98,7 @@ char *do_var_replacement(char *str);
/** Sets up a WLC output handle based on a given output_config. /** Sets up a WLC output handle based on a given output_config.
*/ */
void apply_output_config(struct output_config *oc, swayc_t *output); void apply_output_config(struct output_config *oc, swayc_t *output);
void free_output_config(struct output_config *oc);
/** /**
* Global config singleton. * Global config singleton.

9
sway/commands.c
View File

@ -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); list_add(config->output_configs, output);
sway_log(L_DEBUG, "Config stored for output %s (%d x %d @ %d, %d)", sway_log(L_DEBUG, "Config stored for output %s (%d x %d @ %d, %d)",

2
sway/config.c
View File

@ -36,7 +36,7 @@ static void free_mode(struct sway_mode *mode) {
free(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->name);
free(oc); free(oc);
} }