aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-10-13 16:44:44 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-10-13 16:44:44 +0000
commit3dbb86914cd05143bb0786af5c3756abf5bca73c (patch)
tree139106471fba40b16378ce99b6962715049cd02b
parentchangelog: add new 'unreleased' section (diff)
render: sixel: regression: wrong cell color behind opaque sixels
An opaque sixel that isn't a multiple of the cell size will have some cells partially visible (either the entire last row, the entire last column, or both). These must be rendered before blitting the sixel. f5f2f5a954ee6cf3532a6aba023860ada183d486 introduced a regression, where all such cells were rendered as if the cursor was there, giving them the wrong appearance. Closes #1520
-rw-r--r--CHANGELOG.md7
-rw-r--r--render.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2811945..5e2ec02e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,13 @@
### Deprecated
### Removed
### Fixed
+
+* Last row and/or column of opaque sixels (not having a size that is a
+ multiple of the cell size) being the wrong color ([#1520][1520]).
+
+[1520]: https://codeberg.org/dnkl/foot/issues/1520
+
+
### Security
### Contributors
diff --git a/render.c b/render.c
index 11d323d5..d679b5e8 100644
--- a/render.c
+++ b/render.c
@@ -1309,7 +1309,7 @@ render_sixel(struct terminal *term, pixman_image_t *pix,
if ((last_row_needs_erase && last_row) ||
(last_col_needs_erase && last_col))
{
- render_cell(term, pix, damage, row, term_row_no, col, cursor_col);
+ render_cell(term, pix, damage, row, term_row_no, col, cursor_col == col);
} else {
cell->attrs.clean = 1;
cell->attrs.confined = 1;