diff options
| author |   nicm <nicm@openbsd.org> | 2009-07-09 07:58:14 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2009-07-09 07:58:14 +0000 |
| commit | a6133b88c6ae21c8eeaf942041ced1bbb9bb805d (patch) | |
| tree | 48317435751c5d37f93730b3aead3236815f43c6 /usr.bin/tmux/grid-view.c | |
| parent | unsigned -> unsigned int (diff) | |
| download | wireguard-openbsd-a6133b88c6ae21c8eeaf942041ced1bbb9bb805d.tar.xz wireguard-openbsd-a6133b88c6ae21c8eeaf942041ced1bbb9bb805d.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 'usr.bin/tmux/grid-view.c')
| -rw-r--r-- | usr.bin/tmux/grid-view.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/usr.bin/tmux/grid-view.c b/usr.bin/tmux/grid-view.c index 4475c9bffd9..76017828c50 100644 --- a/usr.bin/tmux/grid-view.c +++ b/usr.bin/tmux/grid-view.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grid-view.c,v 1.4 2009/07/09 00:29:32 nicm Exp $ */ +/* $OpenBSD: grid-view.c,v 1.5 2009/07/09 07:58:14 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. */ |