diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-05-04 08:46:33 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-05-04 08:46:33 +0000 |
| commit | 3595d95c2785de5148749101eb16b9c62df6ac22 (patch) | |
| tree | d5246a0ae07c36c13d4520c392b62effc3215983 | |
| parent | Merge branch 'missing-xkb-build-dependency' (diff) | |
| parent | render: only apply alpha when we’re using the default bg for background (diff) | |
Merge branch 'bg-alpha-on-default-bg-only'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | render.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ec26157..4dad6011 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,8 @@ to launch (e.g. bad command line option) and -26/230 when the foot server failed to instantiate a new window (https://codeberg.org/dnkl/foot/issues/466). +* Background alpha no longer applied to palette or RGB colors that + matches the background color. ### Deprecated @@ -429,6 +429,8 @@ render_cell(struct terminal *term, pixman_image_t *pix, uint32_t _fg = 0; uint32_t _bg = 0; + bool apply_alpha = false; + if (is_selected && term->colors.use_custom_selection) { _fg = term->colors.selection_fg; _bg = term->colors.selection_bg; @@ -441,12 +443,14 @@ render_cell(struct terminal *term, pixman_image_t *pix, uint32_t swap = _fg; _fg = _bg; _bg = swap; - } + } else + apply_alpha = !cell->attrs.have_bg; } if (unlikely(is_selected && _fg == _bg)) { /* Invert bg when selected/highlighted text has same fg/bg */ _bg = ~_bg; + apply_alpha = false; } if (cell->attrs.dim) @@ -459,9 +463,7 @@ render_cell(struct terminal *term, pixman_image_t *pix, pixman_color_t fg = color_hex_to_pixman(_fg); pixman_color_t bg = color_hex_to_pixman_with_alpha( - _bg, - (_bg == (term->reverse ? term->colors.fg : term->colors.bg) - ? term->colors.alpha : 0xffff)); + _bg, apply_alpha ? term->colors.alpha : 0xffff); if (term->is_searching && !is_selected) { color_dim_for_search(&fg); |
