mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-20 06:47:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

config/output: Simplify logic in store_output_config

Browse source 
store_output_config first merges the specified configuration into all
existing configuration objects, and then manually merges a new
configuration object ot return to the caller.

Instead, return the existing merged objects, and if none is present,
insert a new object.
This commit is contained in:
Kenny Levinsen 2024-03-08 21:16:17 +01:00
parent 1c71f48ed0
commit 8dbbeff8f7
1 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

48
sway/config/output.c
View file

@ -221,37 +221,39 @@ done:
struct output_config *store_output_config(struct output_config *oc) { struct output_config *store_output_config(struct output_config *oc) {
bool wildcard = strcmp(oc->name, "*") == 0; bool wildcard = strcmp(oc->name, "*") == 0;
if (wildcard) { struct output_config *merged_config = wildcard ?
merge_wildcard_on_all(oc); merge_wildcard_on_all(oc) :
} else { merge_id_on_name(oc);
merge_id_on_name(oc);
if (merged_config != NULL) {
// Our configuration was merged with an existing config, so let us just
// return that instead.
free_output_config(oc);
oc = merged_config;
goto done;
} }
int i = list_seq_find(config->output_configs, output_name_cmp, oc->name); // If this was a specific output, there were no configs that matched this
// output ID or name, so we need a new config which should be merged with
// an existing wildcard if any before adding it to the list.
//
// If this was a wildcard config, there was no existing wildcard config.
// The search will not find anything and the config will be added directly
// to the list.
int i = list_seq_find(config->output_configs, output_name_cmp, "*");
if (i >= 0) { if (i >= 0) {
sway_log(SWAY_DEBUG, "Merging on top of existing output config"); sway_log(SWAY_DEBUG, "Merging on top of output * config");
struct output_config *current = config->output_configs->items[i]; struct output_config *current = new_output_config(oc->name);
merge_output_config(current, config->output_configs->items[i]);
merge_output_config(current, oc); merge_output_config(current, oc);
free_output_config(oc); free_output_config(oc);
oc = current; oc = current;
} else if (!wildcard) {
sway_log(SWAY_DEBUG, "Adding non-wildcard output config");
i = list_seq_find(config->output_configs, output_name_cmp, "*");
if (i >= 0) {
sway_log(SWAY_DEBUG, "Merging on top of output * config");
struct output_config *current = new_output_config(oc->name);
merge_output_config(current, config->output_configs->items[i]);
merge_output_config(current, oc);
free_output_config(oc);
oc = current;
}
list_add(config->output_configs, oc);
} else {
// New wildcard config. Just add it
sway_log(SWAY_DEBUG, "Adding output * config");
list_add(config->output_configs, oc);
} }
sway_log(SWAY_DEBUG, "Adding output config");
list_add(config->output_configs, oc);
done:
sway_log(SWAY_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz " sway_log(SWAY_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz "
"position %d,%d scale %f subpixel %s transform %d) (bg %s %s) (power %d) " "position %d,%d scale %f subpixel %s transform %d) (bg %s %s) (power %d) "
"(max render time: %d)", "(max render time: %d)",