aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-24 17:47:08 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-24 17:47:08 +0000
commit01a11457a522b36fd22d46d2b539133f253ab187 (patch)
treeac37795ea39ee7417889a335effe03dc917b6349 /terminal.c
parentcsd: wip: something to get started... (diff)
parentsixel: CSI setters also write a reply to the client (diff)
Merge branch 'master' into csd
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c41
1 files changed, 6 insertions, 35 deletions
diff --git a/terminal.c b/terminal.c
index 8504a45b..3977caae 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
@@ -1532,27 +1534,12 @@ term_scroll_partial(struct terminal *term, struct scroll_region region, int rows
/* Erase scrolled in lines */
for (int r = max(region.end - rows, region.start); r < region.end; r++) {
erase_line(term, grid_row_and_alloc(term->grid, r));
+ //sixel_delete_at_row(term, r);
if (selection_on_row_in_view(term, r))
selection_cancel(term);
-
-
- tll_foreach(term->sixel_images, it) {
- if (it->item.grid != term->grid)
- continue;
-
- /* Make it simple - remove the entire image if it starts
- * getting scrolled out */
-
- int img_top_row = it->item.pos.row & (term->grid->num_rows - 1);
- int new_row = (term->grid->offset + r) & (term->grid->num_rows - 1);
-
- if (img_top_row == new_row) {
- sixel_destroy(&it->item);
- tll_remove(term->sixel_images, it);
- }
- }
}
+ sixel_delete_in_range(term, max(region.end - rows, region.start), region.end - 1);
term_damage_scroll(term, DAMAGE_SCROLL, region, rows);
term->grid->cur_row = grid_row(term->grid, term->cursor.point.row);
}
@@ -1600,28 +1587,12 @@ term_scroll_reverse_partial(struct terminal *term,
/* Erase scrolled in lines */
for (int r = region.start; r < min(region.start + rows, region.end); r++) {
erase_line(term, grid_row_and_alloc(term->grid, r));
+ //sixel_delete_at_row(term, r);
if (selection_on_row_in_view(term, r))
selection_cancel(term);
-
- tll_foreach(term->sixel_images, it) {
- if (it->item.grid != term->grid)
- continue;
-
- /* Make it simple - remove the entire image if it starts
- * getting scrolled out */
-
- /* TODO: untested */
-
- int img_bottom_row = (it->item.pos.row + it->item.rows) & (term->grid->num_rows - 1);
- int new_row = (term->grid->offset + r) & (term->grid->num_rows - 1);
-
- if (img_bottom_row == new_row) {
- sixel_destroy(&it->item);
- tll_remove(term->sixel_images, it);
- }
- }
}
+ sixel_delete_in_range(term, region.start, min(region.start + rows, region.end) - 1);
term_damage_scroll(term, DAMAGE_SCROLL_REVERSE, region, rows);
term->grid->cur_row = grid_row(term->grid, term->cursor.point.row);
}