From 2c2a39317be3df4ff9899896067684408526fb29 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 30 Oct 2022 19:39:09 +0100 Subject: render: never apply alpha to text color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When drawing a block cursor using inversed fg/bg colors, we didn’t strip the alpha from the background color. This meant that the text "behind" the cursor was rendered with transparency. If alpha was set to 0, the text was completely invisible. We should never apply alpha to the text color. So, detect this, and force alpha to 1.0. Normally, when selecting the cursor’s color, we don’t really know _where_ the background color is coming from (or more accurately, _what_ it is). However, the *only* background color that can have a non-1.0 alpha is the *default* background color. This is why we can ignore the bg parameter, and use term->colors.fg/bg instead. Closes #1205 --- render.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'render.c') diff --git a/render.c b/render.c index 76f4b7c6..822667ae 100644 --- a/render.c +++ b/render.c @@ -419,7 +419,14 @@ cursor_colors_for_cell(const struct terminal *term, const struct cell *cell, } } else { *cursor_color = *fg; - *text_color = *bg; + + if (unlikely(text_color->alpha != 0xffff)) { + /* We *know* this only happens when bg is the default bg + * color */ + *text_color = color_hex_to_pixman( + term->reverse ? term->colors.fg : term->colors.bg); + } else + *text_color = *bg; } } -- cgit v1.3