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

Merge branch 'osc4-dont-modify-rgb-colors'

Browse source 
Closes #678
This commit is contained in:
Daniel Eklöf 2021-12-01 20:08:23 +01:00
commit 758b0205db
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -62,6 +62,8 @@
* Visual corruption with large CSD borders * Visual corruption with large CSD borders
(https://codeberg.org/dnkl/foot/issues/823). (https://codeberg.org/dnkl/foot/issues/823).
* Mouse cursor shape sometimes not being updated correctly. * Mouse cursor shape sometimes not being updated correctly.
* Color palette changes (via OSC 4/104) no longer affect RGB colors
(https://codeberg.org/dnkl/foot/issues/678).
### Security ### Security

22
osc.c
View file

@ -528,8 +528,7 @@ osc_notify(struct terminal *term, char *string)
} }
static void static void
update_color_in_grids(struct terminal *term, uint32_t old_color, update_color_in_grids(struct terminal *term, int palette_idx, uint32_t new_color)
uint32_t new_color)
{ {
/* /*
* Update color of already rendered cells. * Update color of already rendered cells.
@ -560,16 +559,19 @@ update_color_in_grids(struct terminal *term, uint32_t old_color,
for (size_t c = 0; c < term->grid->num_cols; c++) { for (size_t c = 0; c < term->grid->num_cols; c++) {
struct cell *cell = &row->cells[c]; struct cell *cell = &row->cells[c];
if (cell->attrs.fg_src != COLOR_DEFAULT && enum color_source fg_src = cell->attrs.fg_src;
cell->attrs.fg == old_color) enum color_source bg_src = cell->attrs.bg_src;
if ((fg_src == COLOR_BASE16 || fg_src == COLOR_BASE256) &&
cell->attrs.fg == term->colors.table[palette_idx])
{ {
cell->attrs.fg = new_color; cell->attrs.fg = new_color;
cell->attrs.clean = 0; cell->attrs.clean = 0;
row->dirty = true; row->dirty = true;
} }
if (cell->attrs.bg_src != COLOR_DEFAULT && if ((bg_src == COLOR_BASE16 || bg_src == COLOR_BASE256) &&
cell->attrs.bg == old_color) cell->attrs.bg == term->colors.table[palette_idx])
{ {
cell->attrs.bg = new_color; cell->attrs.bg = new_color;
cell->attrs.clean = 0; cell->attrs.clean = 0;
@ -666,7 +668,7 @@ osc_dispatch(struct terminal *term)
LOG_DBG("change color definition for #%u from %06x to %06x", LOG_DBG("change color definition for #%u from %06x to %06x",
idx, term->colors.table[idx], color); idx, term->colors.table[idx], color);
update_color_in_grids(term, term->colors.table[idx], color); update_color_in_grids(term, idx, color);
term->colors.table[idx] = color; term->colors.table[idx] = color;
} }
} }
@ -810,8 +812,7 @@ osc_dispatch(struct terminal *term)
if (strlen(string) == 0) { if (strlen(string) == 0) {
LOG_DBG("resetting all colors"); LOG_DBG("resetting all colors");
for (size_t i = 0; i < ALEN(term->colors.table); i++) { for (size_t i = 0; i < ALEN(term->colors.table); i++) {
update_color_in_grids( update_color_in_grids(term, i, term->conf->colors.table[i]);
term, term->colors.table[i], term->conf->colors.table[i]);
term->colors.table[i] = term->conf->colors.table[i]; term->colors.table[i] = term->conf->colors.table[i];
} }
} }
@ -834,8 +835,7 @@ osc_dispatch(struct terminal *term)
} }
LOG_DBG("resetting color #%u", idx); LOG_DBG("resetting color #%u", idx);
update_color_in_grids( update_color_in_grids(term, idx, term->conf->colors.table[idx]);
term, term->colors.table[idx], term->conf->colors.table[idx]);
term->colors.table[idx] = term->conf->colors.table[idx]; term->colors.table[idx] = term->conf->colors.table[idx];
} }
} }