aboutsummaryrefslogtreecommitdiff
path: root/csi.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-07-16 14:45:36 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-07-18 14:14:21 +0000
commit5f0ceb72f176caf7673ea1d4bc5195f26f4b4df7 (patch)
treed5dc946ae5af95369f47924e041f161bc8ae6ee2 /csi.c
parentMerge branch 'refactor-shm-buffer-management' (diff)
csi: erase scrollback: cancel selection if it touches the scrollback
This breaks out the scrollback erasing logic for \E[3J from csi.c, and moves it to the new function term_erase_scrollback(), and changes the logic to calculate the start and end row (absolute) numbers of the scrollback, and only iterate those, instead of iterating *all* rows, filtering out those that are on-screen. It also adds an intersection range check of the selection range, and cancels the selection if it touches any of the deleted scrollback rows. This fixes a crash when trying to render the next frame, since the selection now references rows that have been freed. Closes #633
Diffstat (limited to 'csi.c')
-rw-r--r--csi.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/csi.c b/csi.c
index 80ee75cd..dc5a018a 100644
--- a/csi.c
+++ b/csi.c
@@ -917,26 +917,7 @@ csi_dispatch(struct terminal *term, uint8_t final)
case 3: {
/* Erase scrollback */
- int end = (term->grid->offset + term->rows - 1) % term->grid->num_rows;
- for (size_t i = 0; i < term->grid->num_rows; i++) {
- if (end >= term->grid->offset) {
- /* Not wrapped */
- if (i >= term->grid->offset && i <= end)
- continue;
- } else {
- /* Wrapped */
- if (i >= term->grid->offset || i <= end)
- continue;
- }
-
- if (term->render.last_cursor.row == term->grid->rows[i])
- term->render.last_cursor.row = NULL;
-
- grid_row_free(term->grid->rows[i]);
- term->grid->rows[i] = NULL;
- }
- term->grid->view = term->grid->offset;
- term_damage_view(term);
+ term_erase_scrollback(term);
break;
}