aboutsummaryrefslogtreecommitdiff
path: root/grid.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-11-22 20:55:06 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-11-22 20:55:06 +0000
commitf9854d93cf645b07a3326d729b5850f1a14041d5 (patch)
tree0b70bb7c45785b50dff10fa8f67301d0202461ff /grid.c
parentmeson: bump version to 1.10.0 (diff)
parentMerge branch 'osc8-overwrite-2' (diff)
Merge branch 'master' into releases/1.10
Diffstat (limited to 'grid.c')
-rw-r--r--grid.c144
1 files changed, 139 insertions, 5 deletions
diff --git a/grid.c b/grid.c
index 733d8ded..459fa369 100644
--- a/grid.c
+++ b/grid.c
@@ -236,7 +236,7 @@ grid_resize_without_reflow(
.id = it->item.id,
.uri = xstrdup(it->item.uri),
};
- grid_row_add_uri_range(new_row, range);
+ grid_row_uri_range_add(new_row, range);
}
}
@@ -303,7 +303,7 @@ reflow_uri_range_start(struct row_uri_range *range, struct row *new_row,
.uri = range->uri,
};
range->uri = NULL;
- grid_row_add_uri_range(new_row, new_range);
+ grid_row_uri_range_add(new_row, new_range);
}
static void
@@ -366,7 +366,7 @@ _line_wrap(struct grid *old_grid, struct row **new_grid, struct row *row,
.id = range->id,
.uri = xstrdup(range->uri),
};
- grid_row_add_uri_range(new_row, new_range);
+ grid_row_uri_range_add(new_row, new_range);
}
}
@@ -845,14 +845,148 @@ ensure_row_has_extra_data(struct row *row)
}
void
-grid_row_add_uri_range(struct row *row, struct row_uri_range range)
+grid_row_uri_range_add(struct row *row, struct row_uri_range range)
{
ensure_row_has_extra_data(row);
tll_rforeach(row->extra->uri_ranges, it) {
if (it->item.end < range.start) {
tll_insert_after(row->extra->uri_ranges, it, range);
- return;
+ goto out;
}
}
+
tll_push_front(row->extra->uri_ranges, range);
+
+out:
+ ;
+#if defined(_DEBUG)
+ tll_foreach(row->extra->uri_ranges, it1) {
+ tll_foreach(row->extra->uri_ranges, it2) {
+ if (&it1->item == &it2->item)
+ continue;
+
+ xassert(it1->item.start != it2->item.start);
+ xassert(it1->item.start != it2->item.end);
+ xassert(it1->item.end != it2->item.start);
+ xassert(it1->item.end != it2->item.end);
+ }
+ }
+#endif
+}
+
+void
+grid_row_uri_range_erase(struct row *row, int start, int end)
+{
+ xassert(row->extra != NULL);
+ xassert(start <= end);
+
+ /* Split up, or remove, URI ranges affected by the erase */
+ tll_foreach(row->extra->uri_ranges, it) {
+ struct row_uri_range *old = &it->item;
+
+ if (old->end < start)
+ continue;
+
+ if (old->start > end)
+ return;
+
+ if (start <= old->start && end >= old->end) {
+ /* Erase range covers URI completely - remove it */
+ grid_row_uri_range_destroy(old);
+ tll_remove(row->extra->uri_ranges, it);
+ }
+
+ else if (start > old->start && end < old->end) {
+ /* Erase range erases a part in the middle of the URI */
+ struct row_uri_range old_tail = {
+ .start = end + 1,
+ .end = old->end,
+ .id = old->id,
+ .uri = old->uri != NULL ? xstrdup(old->uri) : NULL,
+ };
+ tll_insert_after(row->extra->uri_ranges, it, old_tail);
+ old->end = start - 1;
+ return; /* There can be no more URIs affected by the erase range */
+ }
+
+ else if (start <= old->start && end >= old->start) {
+ /* Erase range erases the head of the URI */
+ xassert(start <= old->start);
+ old->start = end + 1;
+ return; /* There can be no more overlapping URIs */
+ }
+
+ else if (start <= old->end && end >= old->end) {
+ /* Erase range erases the tail of the URI */
+ xassert(end >= old->end);
+ old->end = start - 1;
+ }
+ }
+}
+
+UNITTEST
+{
+ struct row_data row_data = {.uri_ranges = tll_init()};
+ struct row row = {.extra = &row_data};
+
+#define row_has_no_overlapping_uris(row) \
+ do { \
+ tll_foreach((row)->extra->uri_ranges, it1) { \
+ tll_foreach((row)->extra->uri_ranges, it2) { \
+ if (&it1->item == &it2->item) \
+ continue; \
+ xassert(it1->item.start != it2->item.start); \
+ xassert(it1->item.start != it2->item.end); \
+ xassert(it1->item.end != it2->item.start); \
+ xassert(it1->item.end != it2->item.end); \
+ } \
+ } \
+ } while (0)
+
+ grid_row_uri_range_add(&row, (struct row_uri_range){1, 10});
+ xassert(tll_length(row_data.uri_ranges) == 1);
+ xassert(tll_front(row_data.uri_ranges).start == 1);
+ xassert(tll_front(row_data.uri_ranges).end == 10);
+ row_has_no_overlapping_uris(&row);
+
+ grid_row_uri_range_add(&row, (struct row_uri_range){11, 20});
+ xassert(tll_length(row_data.uri_ranges) == 2);
+ xassert(tll_back(row_data.uri_ranges).start == 11);
+ xassert(tll_back(row_data.uri_ranges).end == 20);
+ row_has_no_overlapping_uris(&row);
+
+ /* Erase both URis */
+ grid_row_uri_range_erase(&row, 1, 20);
+ xassert(tll_length(row_data.uri_ranges) == 0);
+ row_has_no_overlapping_uris(&row);
+
+ /* Two URIs, then erase second half of the first, first half of
+ the second */
+ grid_row_uri_range_add(&row, (struct row_uri_range){1, 10});
+ grid_row_uri_range_add(&row, (struct row_uri_range){11, 20});
+ grid_row_uri_range_erase(&row, 5, 15);
+ xassert(tll_length(row_data.uri_ranges) == 2);
+ xassert(tll_front(row_data.uri_ranges).start == 1);
+ xassert(tll_front(row_data.uri_ranges).end == 4);
+ xassert(tll_back(row_data.uri_ranges).start == 16);
+ xassert(tll_back(row_data.uri_ranges).end == 20);
+ row_has_no_overlapping_uris(&row);
+
+ tll_pop_back(row_data.uri_ranges);
+ tll_pop_back(row_data.uri_ranges);
+ xassert(tll_length(row_data.uri_ranges) == 0);
+
+ /* One URI, erase middle part of it */
+ grid_row_uri_range_add(&row, (struct row_uri_range){1, 10});
+ grid_row_uri_range_erase(&row, 5, 6);
+ xassert(tll_length(row_data.uri_ranges) == 2);
+ xassert(tll_front(row_data.uri_ranges).start == 1);
+ xassert(tll_front(row_data.uri_ranges).end == 4);
+ xassert(tll_back(row_data.uri_ranges).start == 7);
+ xassert(tll_back(row_data.uri_ranges).end == 10);
+ row_has_no_overlapping_uris(&row);
+
+#undef row_has_no_overlapping_uris
+
+ tll_free(row_data.uri_ranges);
}