mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-10 05:33:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: brighten: use corresponding bright palette color for base 8 colors

Browse source 
When brightening one of the 8 base (“regular”) colors, use the
corresponding bright palette color, instead of increasing the
luminance.

Closes #449
This commit is contained in:
Daniel Eklöf 2021-04-17 21:02:02 +02:00
parent 40686303ef
commit 2cd9fee9c4
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -42,6 +42,9 @@
(https://codeberg.org/dnkl/foot/issues/415). (https://codeberg.org/dnkl/foot/issues/415).
* Foot now tries much harder to keep URL jump labels inside the window * Foot now tries much harder to keep URL jump labels inside the window
geometry (https://codeberg.org/dnkl/foot/issues/443). geometry (https://codeberg.org/dnkl/foot/issues/443).
* `bold-text-in-bright` now uses the corresponding bright palette
color when the color to brighten matches one of the base 8 colors
(https://codeberg.org/dnkl/foot/issues/449).
### Deprecated ### Deprecated

13
render.c
View file

@ -252,8 +252,17 @@ color_dim(uint32_t color)
} }
static inline uint32_t static inline uint32_t
color_brighten(uint32_t color) color_brighten(const struct terminal *term, uint32_t color)
{ {
/*
* First try to match the color against the base 8 colors. If we
* find a match, return the corresponding bright color.
*/
for (size_t i = 0; i < 8; i++) {
if (term->colors.table[i] == color)
return term->colors.table[i + 8];
}
int hue, sat, lum; int hue, sat, lum;
rgb_to_hsl(color, &hue, &sat, &lum); rgb_to_hsl(color, &hue, &sat, &lum);
return hsl_to_rgb(hue, sat, min(100, lum * 1.3)); return hsl_to_rgb(hue, sat, min(100, lum * 1.3));
@ -435,7 +444,7 @@ render_cell(struct terminal *term, pixman_image_t *pix,
if (cell->attrs.dim) if (cell->attrs.dim)
_fg = color_dim(_fg); _fg = color_dim(_fg);
if (term->conf->bold_in_bright && cell->attrs.bold) if (term->conf->bold_in_bright && cell->attrs.bold)
_fg = color_brighten(_fg); _fg = color_brighten(term, _fg);
if (cell->attrs.blink && term->blink.state == BLINK_OFF) if (cell->attrs.blink && term->blink.state == BLINK_OFF)
_fg = color_dim(_fg); _fg = color_dim(_fg);