mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-06 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd_output: Merge instead of replace output config

Browse source
This commit is contained in:
Christoph Gysin 2015-11-29 22:51:48 +02:00
parent ae7ed79573
commit b1bd3ae6f3
3 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sway/commands.c
View file

@ -804,12 +804,14 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
i = list_seq_find(config->output_configs, output_name_cmp, name);
if (i >= 0) {
// replace existing config
// merge existing config
struct output_config *oc = config->output_configs->items[i];
list_del(config->output_configs, i);
free_output_config(oc);
merge_output_config(oc, output);
free_output_config(output);
output = oc;
} else {
list_add(config->output_configs, output);
}
list_add(config->output_configs, output);
sway_log(L_DEBUG, "Config stored for output %s (enabled:%d) (%d x %d @ %d, %d) (bg %s %s)",
output->name, output->enabled, output->width,