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

output/config: Merge (get|find)_output_config

Browse source
This commit is contained in:
Kenny Levinsen 2024-03-08 23:11:38 +01:00
parent 0e240ba682
commit edf120eb71
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sway/config/output.c
View file

@ -638,9 +638,11 @@ static void default_output_config(struct output_config *oc,
oc->max_render_time = 0; oc->max_render_time = 0;
} }
static struct output_config *get_output_config(char *identifier, struct output_config *find_output_config(struct sway_output *sway_output) {
struct sway_output *sway_output) { char identifier[128];
output_get_identifier(identifier, sizeof(identifier), sway_output);
const char *name = sway_output->wlr_output->name; const char *name = sway_output->wlr_output->name;
struct output_config *oc = NULL; struct output_config *oc = NULL;
// Look for "id on name" output config, which will be stored if configs // Look for "id on name" output config, which will be stored if configs
@ -693,16 +695,8 @@ found:;
return result; return result;
} }
struct output_config *find_output_config(struct sway_output *output) {
char id[128];
output_get_identifier(id, sizeof(id), output);
return get_output_config(id, output);
}
static void apply_output_config_to_output(struct output_config *oc, struct sway_output *sway_output) { static void apply_output_config_to_output(struct output_config *oc, struct sway_output *sway_output) {
char id[128]; struct output_config *current = find_output_config(sway_output);
output_get_identifier(id, sizeof(id), sway_output);
struct output_config *current = get_output_config(id, sway_output);
if (!current) { if (!current) {
// No stored output config matched, apply oc directly // No stored output config matched, apply oc directly
sway_log(SWAY_DEBUG, "Applying oc directly"); sway_log(SWAY_DEBUG, "Applying oc directly");