aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-24 17:39:14 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-24 17:42:32 +0000
commit95f7c5586c7f8d647ed38645599ace39fb82c989 (patch)
tree05d3ecb0240035acd3ae3b7c7ba39a484637f1af
parentterm: resize: pre-calculate right/bottom margins (diff)
sixel: add sixel_delete_at_row and sixel_delete_in_range
These are utility functions to erase sixel images that are at the specified row, or in a row range.
-rw-r--r--sixel.c72
-rw-r--r--sixel.h3
2 files changed, 68 insertions, 7 deletions
diff --git a/sixel.c b/sixel.c
index 6a0b2982..d8a494e1 100644
--- a/sixel.c
+++ b/sixel.c
@@ -52,26 +52,84 @@ sixel_destroy(struct sixel *sixel)
sixel->data = NULL;
}
+static void
+sixel_erase(struct terminal *term, struct sixel *sixel)
+{
+ for (int i = 0; i < sixel->rows; i++) {
+ int r = (sixel->pos.row + i) & (term->grid->num_rows - 1);
+
+ struct row *row = term->grid->rows[r];
+ row->dirty = true;
+
+ for (int c = 0; c < term->grid->num_cols; c++)
+ row->cells[c].attrs.clean = 0;
+ }
+
+ sixel_destroy(sixel);
+}
+
void
-sixel_delete_at_cursor(struct terminal *term)
+sixel_delete_at_row(struct terminal *term, int _row)
{
- const int row = term->grid->offset + term->cursor.point.row;
+ if (likely(tll_length(term->sixel_images) == 0))
+ return;
tll_foreach(term->sixel_images, it) {
- if (it->item.grid != term->grid)
+ struct sixel *six = &it->item;
+
+ if (six->grid != term->grid)
continue;
- const int start = it->item.pos.row;
- const int end = start + it->item.rows;
+ const int row = (term->grid->offset + _row) & (term->grid->num_rows - 1);
+ const int six_start = six->pos.row;
+ const int six_end = six_start + six->rows - 1;
- if (row >= start && row < end) {
- sixel_destroy(&it->item);
+ if (row >= six_start && row <= six_end) {
+ sixel_erase(term, six);
tll_remove(term->sixel_images, it);
}
}
}
void
+sixel_delete_in_range(struct terminal *term, int _start, int _end)
+{
+ assert(_end >= _start);
+
+ if (likely(tll_length(term->sixel_images) == 0))
+ return;
+
+ if (_start == _end)
+ return sixel_delete_at_row(term, _start);
+
+ tll_foreach(term->sixel_images, it) {
+ struct sixel *six = &it->item;
+
+ if (six->grid != term->grid)
+ continue;
+
+ const int start = (term->grid->offset + _start) & (term->grid->num_rows - 1);
+ const int end = start + (_end - _start);
+ const int six_start = six->pos.row;
+ const int six_end = six_start + six->rows - 1;
+
+ if ((start <= six_start && end >= six_start) || /* Crosses sixel start boundary */
+ (start <= six_end && end >= six_end) || /* Crosses sixel end boundary */
+ (start >= six_start && end <= six_end)) /* Fully within sixel range */
+ {
+ sixel_erase(term, six);
+ tll_remove(term->sixel_images, it);
+ }
+ }
+}
+
+void
+sixel_delete_at_cursor(struct terminal *term)
+{
+ sixel_delete_at_row(term, term->cursor.point.row);
+}
+
+void
sixel_unhook(struct terminal *term)
{
free(term->sixel.palette);
diff --git a/sixel.h b/sixel.h
index 040df93a..13eff024 100644
--- a/sixel.h
+++ b/sixel.h
@@ -9,6 +9,9 @@ void sixel_put(struct terminal *term, uint8_t c);
void sixel_unhook(struct terminal *term);
void sixel_destroy(struct sixel *sixel);
+
+void sixel_delete_in_range(struct terminal *term, int start, int end);
+void sixel_delete_at_row(struct terminal *term, int _row);
void sixel_delete_at_cursor(struct terminal *term);
void sixel_colors_report_current(struct terminal *term);