aboutsummaryrefslogtreecommitdiff
path: root/sixel.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-10-05 16:30:23 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-10-09 05:44:18 +0000
commit91c0aed26e387097dddadeee05b2af1773f972a1 (patch)
tree41c070c0c01f8c0915f7b1d2c1f7b74a3fc50d89 /sixel.c
parentsixel: verify scrollback consistency: new verify function (diff)
sixel: ovewrite-by-rectangle: in debug builds, cross-reference against pixman
Use pixman to calculate the intersection of the rectangle being overwritten, and the sixel(s). Verify our code matches.
Diffstat (limited to 'sixel.c')
-rw-r--r--sixel.c40
1 files changed, 38 insertions, 2 deletions
diff --git a/sixel.c b/sixel.c
index 6c378546..53bd3e75 100644
--- a/sixel.c
+++ b/sixel.c
@@ -427,6 +427,13 @@ static void
_sixel_overwrite_by_rectangle(
struct terminal *term, int row, int col, int height, int width)
{
+ verify_sixels(term);
+
+#if defined(_DEBUG)
+ pixman_region32_t overwrite_rect;
+ pixman_region32_init_rect(&overwrite_rect, col, row, width, height);
+#endif
+
const int start = row;
const int end = row + height - 1;
@@ -435,6 +442,8 @@ _sixel_overwrite_by_rectangle(
const int scrollback_rel_start = rebase_row(term, start);
+ bool UNUSED would_have_breaked = false;
+
tll_foreach(term->grid->sixel_images, it) {
struct sixel *six = &it->item;
@@ -447,9 +456,23 @@ _sixel_overwrite_by_rectangle(
if (six_scrollback_rel_end < scrollback_rel_start) {
/* All remaining sixels are *before* our rectangle */
+ would_have_breaked = true;
break;
}
+#if defined(_DEBUG)
+ pixman_region32_t six_rect;
+ pixman_region32_init_rect(&six_rect, six->pos.col, six->pos.row, six->cols, six->rows);
+
+ pixman_region32_t intersection;
+ pixman_region32_init(&intersection);
+ pixman_region32_intersect(&intersection, &six_rect, &overwrite_rect);
+
+ const bool collides = pixman_region32_not_empty(&intersection);
+#else
+ const bool UNUSED collides = false;
+#endif
+
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 */
@@ -461,14 +484,27 @@ _sixel_overwrite_by_rectangle(
(col <= col_end && col + width - 1 >= col_end) ||
(col >= col_start && col + width - 1 <= col_end))
{
+ assert(!would_have_breaked);
+
struct sixel to_be_erased = *six;
tll_remove(term->grid->sixel_images, it);
sixel_overwrite(term, &to_be_erased, start, col, height, width);
sixel_erase(term, &to_be_erased);
- }
- }
+ } else
+ assert(!collides);
+ } else
+ assert(!collides);
+
+#if defined(_DEBUG)
+ pixman_region32_fini(&intersection);
+ pixman_region32_fini(&six_rect);
+#endif
}
+
+#if defined(_DEBUG)
+ pixman_region32_fini(&overwrite_rect);
+#endif
}
void