aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-11-20 17:07:45 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-11-20 17:07:45 +0000
commit43798685d8414239b058b0c29459617ffc891524 (patch)
tree40b56ca235cd55975e55505f875a3689b5e043a1 /render.c
parentconfig: use stack allocation for temporary buffer in value_to_enum() (diff)
parentterm: track cell color source (diff)
Merge branch 'cell-color-source'
Diffstat (limited to 'render.c')
-rw-r--r--render.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/render.c b/render.c
index 46cc0f75..2710c0a2 100644
--- a/render.c
+++ b/render.c
@@ -494,14 +494,14 @@ 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.have_fg ? cell->attrs.fg : term->reverse ? term->colors.bg : term->colors.fg;
- _bg = cell->attrs.have_bg ? cell->attrs.bg : term->reverse ? term->colors.fg : term->colors.bg;
+ _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;
if (cell->attrs.reverse ^ is_selected) {
uint32_t swap = _fg;
_fg = _bg;
_bg = swap;
- } else if (!cell->attrs.have_bg)
+ } else if (cell->attrs.bg_src == COLOR_DEFAULT)
alpha = term->colors.alpha;
}