From 7501a610222e2eb1f99ed40c70dfc9cbb7cd9827 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Fri, 25 Apr 2014 22:13:52 -0400 Subject: handle large counts for insert/delete characters --- src/screen.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/screen.c b/src/screen.c index 1917e16..bd9b461 100644 --- a/src/screen.c +++ b/src/screen.c @@ -209,12 +209,17 @@ void runes_screen_insert_characters(RunesTerm *t, int count) RunesScreen *scr = &t->scr; struct runes_row *row = &scr->rows[scr->cur.row]; - memmove( - &row->cells[scr->cur.col + count], &row->cells[scr->cur.col], - (scr->max.col - scr->cur.col - count) * sizeof(struct runes_cell)); - memset( - &row->cells[scr->cur.col], 0, - count * sizeof(struct runes_cell)); + if (count >= scr->max.col - scr->cur.col) { + runes_screen_kill_line_forward(t); + } + else { + memmove( + &row->cells[scr->cur.col + count], &row->cells[scr->cur.col], + (scr->max.col - scr->cur.col - count) * sizeof(struct runes_cell)); + memset( + &row->cells[scr->cur.col], 0, + count * sizeof(struct runes_cell)); + } } void runes_screen_insert_lines(RunesTerm *t, int count) @@ -229,12 +234,17 @@ void runes_screen_delete_characters(RunesTerm *t, int count) RunesScreen *scr = &t->scr; struct runes_row *row = &scr->rows[scr->cur.row]; - memmove( - &row->cells[scr->cur.col], &row->cells[scr->cur.col + count], - (scr->max.col - scr->cur.col - count) * sizeof(struct runes_cell)); - memset( - &row->cells[scr->max.col - count], 0, - count * sizeof(struct runes_cell)); + if (count >= scr->max.col - scr->cur.col) { + runes_screen_kill_line_forward(t); + } + else { + memmove( + &row->cells[scr->cur.col], &row->cells[scr->cur.col + count], + (scr->max.col - scr->cur.col - count) * sizeof(struct runes_cell)); + memset( + &row->cells[scr->max.col - count], 0, + count * sizeof(struct runes_cell)); + } } void runes_screen_delete_lines(RunesTerm *t, int count) -- cgit v1.2.3