aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-10-17 15:23:18 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-10-17 15:23:18 +0000
commitf1e7d78c96d2062aebc86e2de21180d40e1ed5ec (patch)
tree139106471fba40b16378ce99b6962715049cd02b
parentmeson: bump version to 1.16.1 (diff)
parentrender: sixel: regression: wrong cell color behind opaque sixels (diff)
Merge branch 'master' into releases/1.16
-rw-r--r--CHANGELOG.md17
-rw-r--r--render.c2
2 files changed, 18 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d8d50e2..5e2ec02e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
# Changelog
+* [Unreleased](#unreleased)
* [1.16.1](#1-16-1)
* [1.16.0](#1-16-0)
* [1.15.3](#1-15-3)
@@ -46,6 +47,22 @@
* [1.2.1](#1-2-1)
* [1.2.0](#1-2-0)
+## Unreleased
+### Added
+### Changed
+### 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
+
## 1.16.1
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;