aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-12-25 16:13:50 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-12-26 11:37:48 +0000
commitc2bf2d3650b6a837efec834d23b1c3774c263852 (patch)
treebb9bc7c3937fd12e7cdfe970b97bb50165b97a62 /render.c
parentcsi: no need to set VT state’s fg/bg to the default ones on SGR reset (diff)
csi: store color index, not actual color, in cell’s fg/bg attributes
When using indexed colors (i.e. SGR 30/40/90/100), store the index into the cell’s fg/bg attributes, not the actual color value. This has a couple of consequences: Color table lookup is now done when rendering. This means a rendered cell will always reflect the *current* color table, not the color table that was in use when the cell was printed to. This simplifies the OSC-4/104 logic, since we no longer need to update the grid - we just have to damage it to trigger rendering. Furthermore, this change simplifies the VT parsing, since we no longer need to do any memory loads (except loading the SGR parameter values), only writes.
Diffstat (limited to 'render.c')
-rw-r--r--render.c33
1 files changed, 31 insertions, 2 deletions
diff --git a/render.c b/render.c
index b21b23ce..3cbe0e5a 100644
--- a/render.c
+++ b/render.c
@@ -494,8 +494,37 @@ render_cell(struct terminal *term, pixman_image_t *pix,
_bg = term->colors.selection_bg;
} else {
/* Use cell specific color, if set, otherwise the default colors (possible reversed) */
- _fg = cell->attrs.fg_src != COLOR_DEFAULT ? cell->attrs.fg : term->reverse ? term->colors.bg : term->colors.fg;
- _bg = cell->attrs.bg_src != COLOR_DEFAULT ? cell->attrs.bg : term->reverse ? term->colors.fg : term->colors.bg;
+ switch (cell->attrs.fg_src) {
+ case COLOR_RGB:
+ _fg = cell->attrs.fg;
+ break;
+
+ case COLOR_BASE16:
+ case COLOR_BASE256:
+ xassert(cell->attrs.fg < ALEN(term->colors.table));
+ _fg = term->colors.table[cell->attrs.fg];
+ break;
+
+ case COLOR_DEFAULT:
+ _fg = term->reverse ? term->colors.bg : term->colors.fg;
+ break;
+ }
+
+ switch (cell->attrs.bg_src) {
+ case COLOR_RGB:
+ _bg = cell->attrs.bg;
+ break;
+
+ case COLOR_BASE16:
+ case COLOR_BASE256:
+ xassert(cell->attrs.bg < ALEN(term->colors.table));
+ _bg = term->colors.table[cell->attrs.bg];
+ break;
+
+ case COLOR_DEFAULT:
+ _bg = term->reverse ? term->colors.fg : term->colors.bg;
+ break;
+ }
if (cell->attrs.reverse ^ is_selected) {
uint32_t swap = _fg;