Change inserting and deleting lines inside the scroll region to properly clear

lines that should be inserted/deleted but not moved. Fixes problems with mutt
reported by Brian Lewis, thanks.
This commit is contained in:
Nicholas Marriott
2009-07-09 07:58:14 +00:00
parent 643c219d18
commit 86c93c6e34
2 changed files with 44 additions and 8 deletions

View File

@ -369,11 +369,25 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny)
if (ny == 0)
ny = 1;
if (ny > screen_size_y(s) - s->cy)
ny = screen_size_y(s) - s->cy;
if (s->cy < s->rupper || s->cy > s->rlower) {
if (ny > screen_size_y(s) - s->cy)
ny = screen_size_y(s) - s->cy;
if (ny == 0)
return;
screen_write_save(ctx);
grid_view_insert_lines(s->grid, s->cy, ny);
tty_write_cmd(ctx->wp, TTY_INSERTLINE, ny);
return;
}
if (ny > s->rlower + 1 - s->cy)
ny = s->rlower + 1 - s->cy;
if (ny == 0)
return;
screen_write_save(ctx);
if (s->cy < s->rupper || s->cy > s->rlower)
@ -393,8 +407,22 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny)
if (ny == 0)
ny = 1;
if (ny > screen_size_y(s) - s->cy)
ny = screen_size_y(s) - s->cy;
if (s->cy < s->rupper || s->cy > s->rlower) {
if (ny > screen_size_y(s) - s->cy)
ny = screen_size_y(s) - s->cy;
if (ny == 0)
return;
screen_write_save(ctx);
grid_view_delete_lines(s->grid, s->cy, ny);
tty_write_cmd(ctx->wp, TTY_DELETELINE, ny);
return;
}
if (ny > s->rlower + 1 - s->cy)
ny = s->rlower + 1 - s->cy;
if (ny == 0)
return;