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

render: fix rendering of cursor when cell is reversed

Browse source 
When the user had configured the cursor color, we failed to
invert (reverse) the foreground and background color when the cursor
was on a cell with the 'reverse' attribute set.
This commit is contained in:
Daniel Eklöf 2019-11-28 19:22:21 +01:00
parent 903581b7eb
commit b96fb2ddab
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
render.c
View file

@ -202,12 +202,25 @@ render_cell(struct terminal *term, pixman_image_t *pix,
bool block_cursor = has_cursor && term->cursor_style == CURSOR_BLOCK;
bool is_selected = coord_is_selected(term, col, row);
uint32_t _fg = cell->attrs.have_fg
? cell->attrs.fg
: !term->reverse ? term->colors.fg : term->colors.bg;
uint32_t _bg = cell->attrs.have_bg
? cell->attrs.bg
: !term->reverse ? term->colors.bg : term->colors.fg;
uint32_t _fg = 0;
uint32_t _bg = 0;
if (block_cursor && term->cursor_color.text >> 31) {
/* User configured cursor color overrides all attributes */
assert(term->cursor_color.cursor >> 31);
/* Slightly ugly... reverse here, since they'll be reversed again below */
_fg = term->cursor_color.cursor;
_bg = term->cursor_color.text;
} 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.fg : term->colors.bg;
_bg = cell->attrs.have_bg
? cell->attrs.bg
: !term->reverse ? term->colors.bg : term->colors.fg;
}
/* If *one* is set, we reverse */
if (block_cursor ^ cell->attrs.reverse ^ is_selected) {
@ -226,13 +239,6 @@ render_cell(struct terminal *term, pixman_image_t *pix,
if (cell->attrs.dim)
pixman_color_dim(&fg);
if (block_cursor && term->cursor_color.text >> 31) {
/* User configured cursor color overrides all attributes */
assert(term->cursor_color.cursor >> 31);
fg = color_hex_to_pixman(term->cursor_color.text);
bg = color_hex_to_pixman(term->cursor_color.cursor);
}
if (term->is_searching && !is_selected) {
pixman_color_dim_for_search(&fg);
pixman_color_dim_for_search(&bg);