aboutsummaryrefslogtreecommitdiff
path: root/grid-view.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-07-09 18:04:53 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-07-09 18:04:53 +0000
commit295879cced7fc430c751b6d3b2c9d7d253cb0dc0 (patch)
treeffaa2bbbf57c045631e0fd891b042170f941432c /grid-view.c
parente073441c36b4cc22e0a750f4d3e539c41893a65d (diff)
downloadrtmux-295879cced7fc430c751b6d3b2c9d7d253cb0dc0.tar.gz
rtmux-295879cced7fc430c751b6d3b2c9d7d253cb0dc0.tar.bz2
rtmux-295879cced7fc430c751b6d3b2c9d7d253cb0dc0.zip
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.
Diffstat (limited to 'grid-view.c')
-rw-r--r--grid-view.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/grid-view.c b/grid-view.c
index 9ec9772d..705918ac 100644
--- a/grid-view.c
+++ b/grid-view.c
@@ -1,4 +1,4 @@
-/* $Id: grid-view.c,v 1.16 2009-07-09 18:04:17 nicm Exp $ */
+/* $Id: grid-view.c,v 1.17 2009-07-09 18:04:53 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -134,13 +134,17 @@ grid_view_insert_lines(struct grid *gd, u_int py, u_int ny)
void
grid_view_insert_lines_region(struct grid *gd, u_int rlower, u_int py, u_int ny)
{
+ u_int ny2;
+
GRID_DEBUG(gd, "rlower=%u, py=%u, ny=%u", rlower, py, ny);
rlower = grid_view_y(gd, rlower);
py = grid_view_y(gd, py);
- grid_move_lines(gd, py + ny, py, (rlower + 1) - py - ny);
+ ny2 = rlower + 1 - py - ny;
+ grid_move_lines(gd, rlower + 1 - ny2, py, ny2);
+ grid_clear(gd, 0, py + ny2, gd->sx, ny - ny2);
}
/* Delete lines. */
@@ -156,20 +160,24 @@ grid_view_delete_lines(struct grid *gd, u_int py, u_int ny)
sy = grid_view_y(gd, gd->sy);
grid_move_lines(gd, py, py + ny, sy - py - ny);
- grid_clear(gd, 0, sy - ny, gd->sx, py + ny - (sy - ny));
+ grid_clear(gd, 0, sy - ny, gd->sx, py + ny - (sy - ny));
}
/* Delete lines inside scroll region. */
void
grid_view_delete_lines_region(struct grid *gd, u_int rlower, u_int py, u_int ny)
{
+ u_int ny2;
+
GRID_DEBUG(gd, "rlower=%u, py=%u, ny=%u", rlower, py, ny);
rlower = grid_view_y(gd, rlower);
py = grid_view_y(gd, py);
- grid_move_lines(gd, py, py + ny, (rlower + 1) - py - ny);
+ ny2 = rlower + 1 - py - ny;
+ grid_move_lines(gd, py, py + ny, ny2);
+ grid_clear(gd, 0, py + ny2, gd->sx, ny - ny2);
}
/* Insert characters. */