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

sway/commands/output: add color_profile "--device-primaries"

Browse source 
When a display is connected, create a color transform from its
self-reported color characteristics
This commit is contained in:
Félix Poisot 2025-12-05 21:51:54 +00:00 • committed by Simon Ser
parent 776d445ec5
commit 26eb393d6d
4 changed files with 88 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

59
sway/config/output.c
View file

@ -75,7 +75,7 @@ struct output_config *new_output_config(const char *name) {
oc->max_render_time = -1;
oc->adaptive_sync = -1;
oc->render_bit_depth = RENDER_BIT_DEPTH_DEFAULT;
oc->set_color_transform = false;
oc->color_profile = COLOR_PROFILE_DEFAULT;
oc->color_transform = NULL;
oc->power = -1;
oc->allow_tearing = -1;
@ -130,12 +130,12 @@ static void supersede_output_config(struct output_config *dst, struct output_con
if (src->render_bit_depth != RENDER_BIT_DEPTH_DEFAULT) {
dst->render_bit_depth = RENDER_BIT_DEPTH_DEFAULT;
}
if (src->set_color_transform) {
if (src->color_profile != COLOR_PROFILE_DEFAULT) {
if (dst->color_transform) {
wlr_color_transform_unref(dst->color_transform);
dst->color_transform = NULL;
}
dst->set_color_transform = false;
dst->color_profile = COLOR_PROFILE_DEFAULT;
}
if (src->background) {
free(dst->background);
@ -207,12 +207,12 @@ static void merge_output_config(struct output_config *dst, struct output_config
if (src->render_bit_depth != RENDER_BIT_DEPTH_DEFAULT) {
dst->render_bit_depth = src->render_bit_depth;
}
if (src->set_color_transform) {
if (src->color_profile != COLOR_PROFILE_DEFAULT) {
if (src->color_transform) {
wlr_color_transform_ref(src->color_transform);
}
wlr_color_transform_unref(dst->color_transform);
dst->set_color_transform = true;
dst->color_profile = src->color_profile;
dst->color_transform = src->color_transform;
}
if (src->background) {
@ -570,13 +570,60 @@ static void config_output_state_finish(struct config_output_state *state) {
wlr_color_transform_unref(state->color_transform);
}
static struct wlr_color_transform *color_profile_from_device(struct wlr_output *wlr_output,
struct wlr_color_transform *transfer_function) {
struct wlr_color_primaries srgb_primaries;
wlr_color_primaries_from_named(&srgb_primaries, WLR_COLOR_NAMED_PRIMARIES_SRGB);
const struct wlr_color_primaries *primaries = wlr_output->default_primaries;
if (primaries == NULL) {
sway_log(SWAY_INFO, "output has no reported color information");
if (transfer_function) {
wlr_color_transform_ref(transfer_function);
}
return transfer_function;
} else if (memcmp(primaries, &srgb_primaries, sizeof(*primaries)) == 0) {
sway_log(SWAY_INFO, "output reports sRGB colors, no correction needed");
if (transfer_function) {
wlr_color_transform_ref(transfer_function);
}
return transfer_function;
} else {
sway_log(SWAY_INFO, "Creating color profile from reported color primaries: "
"R(%f, %f) G(%f, %f) B(%f, %f) W(%f, %f)",
primaries->red.x, primaries->red.y, primaries->green.x, primaries->green.y,
primaries->blue.x, primaries->blue.y, primaries->white.x, primaries->white.y);
float matrix[9];
wlr_color_primaries_transform_absolute_colorimetric(&srgb_primaries, primaries, matrix);
struct wlr_color_transform *matrix_transform = wlr_color_transform_init_matrix(matrix);
if (matrix_transform == NULL) {
return NULL;
}
struct wlr_color_transform *resolved_tf = transfer_function ?
wlr_color_transform_ref(transfer_function) :
wlr_color_transform_init_linear_to_inverse_eotf(WLR_COLOR_TRANSFER_FUNCTION_GAMMA22);
if (resolved_tf == NULL) {
wlr_color_transform_unref(matrix_transform);
return NULL;
}
struct wlr_color_transform *transforms[] = { matrix_transform, resolved_tf };
size_t transforms_len = sizeof(transforms) / sizeof(transforms[0]);
struct wlr_color_transform *result = wlr_color_transform_init_pipeline(transforms, transforms_len);
wlr_color_transform_unref(matrix_transform);
wlr_color_transform_unref(resolved_tf);
return result;
}
}
static struct wlr_color_transform *get_color_profile(struct wlr_output *output,
struct output_config *oc) {
if (oc && oc->set_color_transform) {
if (oc && oc->color_profile == COLOR_PROFILE_TRANSFORM) {
if (oc->color_transform) {
wlr_color_transform_ref(oc->color_transform);
}
return oc->color_transform;
} else if (oc && oc->color_profile == COLOR_PROFILE_TRANSFORM_WITH_DEVICE_PRIMARIES) {
return color_profile_from_device(output, oc->color_transform);
} else {
return NULL;
}