aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-07-10 12:57:26 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-07-10 12:57:26 +0000
commit0bc3b29b0fef9c3dc8fd1e54f56438d809e45a91 (patch)
treef2a7653f5f5e4a4ff00725609e0bfbaf095839c8 /terminal.c
parentinput: fix backspace escape sequences (diff)
parentscrollback: disable debug logging (diff)
Merge branch 'scrollback'
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/terminal.c b/terminal.c
index 1cf15cfb..8804140b 100644
--- a/terminal.c
+++ b/terminal.c
@@ -22,6 +22,13 @@ term_damage_all(struct terminal *term)
}
void
+term_damage_view(struct terminal *term)
+{
+ for (int i = 0; i < term->rows; i++)
+ grid_row_in_view(term->grid, i)->dirty = true;
+}
+
+void
term_damage_scroll(struct terminal *term, enum damage_type damage_type,
struct scroll_region region, int lines)
{
@@ -152,11 +159,18 @@ term_scroll_partial(struct terminal *term, struct scroll_region region, int rows
grid_swap_row(term->grid, i, i + rows);
/* Offset grid origin */
+ bool view_follows = term->grid->view == term->grid->offset;
term->grid->offset += rows;
term->grid->offset %= term->grid->num_rows;
- for (int r = max(region.end - rows, 0); r < region.end; r++)
- erase_line(term, grid_row(term->grid, r));
+ if (view_follows)
+ term->grid->view = term->grid->offset;
+
+ for (int r = max(region.end - rows, 0); r < region.end; r++) {
+ struct row *row = grid_row(term->grid, r);
+ erase_line(term, row);
+ row->initialized = true;
+ }
term_damage_scroll(term, DAMAGE_SCROLL, region, rows);
term->grid->cur_row = grid_row(term->grid, term->cursor.row);
@@ -174,9 +188,14 @@ term_scroll_reverse_partial(struct terminal *term,
{
assert(rows < term->rows && "unimplemented");
+ bool view_follows = term->grid->view == term->grid->offset;
+
term->grid->offset += term->grid->num_rows - rows;
term->grid->offset %= term->grid->num_rows;
+ if (view_follows)
+ term->grid->view = term->grid->offset;
+
/* Bottom non-scrolling region */
for (int i = region.end + rows; i < term->rows + rows; i++)
grid_swap_row(term->grid, i, i - rows);