aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-24 17:40:41 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-24 17:42:46 +0000
commit4c6f2ea340d1432e50973961579ebd0eb4ca2c0f (patch)
treea6ee4ff5b3831b610082b496ec84ce86e3fccae1
parentsixel: ensure 'start' row is not outside the grid row range (diff)
term: term_erase(): call sixel_delete_*()
This ensures sixel images are removed, regardless of _how_ the screen was erased.
-rw-r--r--sixel.c4
-rw-r--r--terminal.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/sixel.c b/sixel.c
index caa31429..68324fde 100644
--- a/sixel.c
+++ b/sixel.c
@@ -156,8 +156,6 @@ sixel_unhook(struct terminal *term)
term->sixel.image.data,
term->sixel.image.width * sizeof(uint32_t));
- tll_push_back(term->sixel_images, image);
-
term->sixel.image.data = NULL;
term->sixel.image.width = 0;
term->sixel.image.height = 0;
@@ -168,6 +166,8 @@ sixel_unhook(struct terminal *term)
term_linefeed(term);
term_formfeed(term);
render_refresh(term);
+
+ tll_push_back(term->sixel_images, image);
}
static unsigned
diff --git a/terminal.c b/terminal.c
index 8504a45b..e73ea15a 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1366,6 +1366,7 @@ term_erase(struct terminal *term, const struct coord *start, const struct coord
if (start->row == end->row) {
struct row *row = grid_row(term->grid, start->row);
erase_cell_range(term, row, start->col, end->col);
+ sixel_delete_at_row(term, start->row);
return;
}
@@ -1378,6 +1379,7 @@ term_erase(struct terminal *term, const struct coord *start, const struct coord
erase_line(term, grid_row(term->grid, r));
erase_cell_range(term, grid_row(term->grid, end->row), 0, end->col);
+ sixel_delete_in_range(term, start->row, end->row);
}
int