Fix two errors with character/line insertion and deletion: the maximum number

of characters which may be inserted or deleted is the screen width, not one
less (and similarly for lines and height); and if characters or lines are
deleted by moving the ones that follow, the space at the end needs to be
cleared.

This appears to solve long-standing redraw issues most visible when using the
force-width option then scrolling in view(1) or unwrapping lines in emacs.

1 files changed, 5 insertions, 3 deletions

diff --git a/usr.bin/tmux/grid-view.c b/usr.bin/tmux/grid-view.c
index 8154495b544..8e6c1dc0354 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.2 2009/06/24 22:04:18 nicm Exp $ */
+/* $OpenBSD: grid-view.c,v 1.3 2009/06/29 21:30:50 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -158,6 +158,7 @@ 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));
 }
 
 /* Delete lines inside scroll region. */
@@ -191,7 +192,7 @@ grid_view_insert_cells(struct grid *gd, u_int px, u_int py, u_int nx)
 	if (px == sx - 1)
 		grid_clear(gd, px, py, 1, 1);
 	else
-		grid_move_cells(gd, px + nx, px, py, (sx - 1) - (px + nx));
+		grid_move_cells(gd, px + nx, px, py, sx - px - nx);
 }
 
 /* Delete characters. */
@@ -207,7 +208,8 @@ grid_view_delete_cells(struct grid *gd, u_int px, u_int py, u_int nx)
 
 	sx = grid_view_x(gd, gd->sx);
 
-	grid_move_cells(gd, px, px + nx, py, (sx - 1) - (px + nx));
+	grid_move_cells(gd, px, px + nx, py, sx - px - nx);
+	grid_clear(gd, sx - nx, py, px + nx - (sx - nx), 1);
 }
 
 /* Convert cells into a string. */