From 295879cced7fc430c751b6d3b2c9d7d253cb0dc0 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 9 Jul 2009 18:04:53 +0000 Subject: 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. --- screen-write.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) (limited to 'screen-write.c') diff --git a/screen-write.c b/screen-write.c index 2e71c738..9f37561f 100644 --- a/screen-write.c +++ b/screen-write.c @@ -1,4 +1,4 @@ -/* $Id: screen-write.c,v 1.57 2009-07-09 18:04:17 nicm Exp $ */ +/* $Id: screen-write.c,v 1.58 2009-07-09 18:04:53 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -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 (ny == 0) + 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; -- cgit