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

config/output: Always set all output fields on finalize

Browse source 
(cherry picked from commit af0d4a048a)
This commit is contained in:
Kenny Levinsen 2024-10-17 01:08:54 +02:00 committed by Simon Ser
parent 124a96c501
commit baea664edc
1 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sway/config/output.c
View file

@ -520,9 +520,9 @@ static bool finalize_output_config(struct output_config *oc, struct sway_output
return true; return true;
} }
if (oc) {
enum scale_filter_mode scale_filter_old = output->scale_filter; enum scale_filter_mode scale_filter_old = output->scale_filter;
switch (oc->scale_filter) { enum scale_filter_mode scale_filter_new = oc ? oc->scale_filter : SCALE_FILTER_DEFAULT;
switch (scale_filter_new) {
case SCALE_FILTER_DEFAULT: case SCALE_FILTER_DEFAULT:
case SCALE_FILTER_SMART: case SCALE_FILTER_SMART:
output->scale_filter = ceilf(wlr_output->scale) == wlr_output->scale ? output->scale_filter = ceilf(wlr_output->scale) == wlr_output->scale ?
@ -530,7 +530,7 @@ static bool finalize_output_config(struct output_config *oc, struct sway_output
break; break;
case SCALE_FILTER_LINEAR: case SCALE_FILTER_LINEAR:
case SCALE_FILTER_NEAREST: case SCALE_FILTER_NEAREST:
output->scale_filter = oc->scale_filter; output->scale_filter = scale_filter_new;
break; break;
} }
if (scale_filter_old != output->scale_filter) { if (scale_filter_old != output->scale_filter) {
@ -538,7 +538,6 @@ static bool finalize_output_config(struct output_config *oc, struct sway_output
sway_output_scale_filter_to_string(output->scale_filter)); sway_output_scale_filter_to_string(output->scale_filter));
wlr_damage_ring_add_whole(&output->scene_output->damage_ring); wlr_damage_ring_add_whole(&output->scene_output->damage_ring);
} }
}
// Find position for it // Find position for it
if (oc && (oc->x != -1 || oc->y != -1)) { if (oc && (oc->x != -1 || oc->y != -1)) {
@ -560,25 +559,19 @@ static bool finalize_output_config(struct output_config *oc, struct sway_output
output_enable(output); output_enable(output);
} }
if (oc && oc->max_render_time >= 0) {
sway_log(SWAY_DEBUG, "Set %s max render time to %d",
oc->name, oc->max_render_time);
output->max_render_time = oc->max_render_time;
}
if (oc && oc->set_color_transform) { if (oc && oc->set_color_transform) {
if (oc->color_transform) { if (oc->color_transform) {
wlr_color_transform_ref(oc->color_transform); wlr_color_transform_ref(oc->color_transform);
} }
wlr_color_transform_unref(output->color_transform); wlr_color_transform_unref(output->color_transform);
output->color_transform = oc->color_transform; output->color_transform = oc->color_transform;
} else {
wlr_color_transform_unref(output->color_transform);
output->color_transform = NULL;
} }
if (oc && oc->allow_tearing >= 0) { output->max_render_time = oc && oc->max_render_time > 0 ? oc->max_render_time : 0;
sway_log(SWAY_DEBUG, "Set %s allow tearing to %d", output->allow_tearing = oc && oc->allow_tearing > 0;
oc->name, oc->allow_tearing);
output->allow_tearing = oc->allow_tearing;
}
return true; return true;
} }