aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-12-26 11:39:01 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-12-26 11:39:01 +0000
commit366da7349cf0706e34fc539c468919196ac1ec4d (patch)
tree64bf598076f70a152c175da88a848de9f30e0afb /render.c
parenttest: config: test ‘scrollback’ section (diff)
parentsixel: VT state’s bg color may now be an index, rather than an actual color value (diff)
Merge branch 'cell-colors-use-index'
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;