When clearing the entire screen, clear lines that are used into the

history like xterm does. Requested ages ago by someone I've forgotten.

3 files changed, 43 insertions, 7 deletions

diff --git a/usr.bin/tmux/grid-view.c b/usr.bin/tmux/grid-view.c
index dbf42980fe4..f9e603f2700 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.8 2009/12/03 22:50:10 nicm Exp $ */
+/* $OpenBSD: grid-view.c,v 1.9 2011/01/25 23:40:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -74,6 +74,30 @@ grid_view_set_utf8(
 	grid_set_utf8(gd, grid_view_x(gd, px), grid_view_y(gd, py), gu);
 }
 
+/* Clear into history. */
+void
+grid_view_clear_history(struct grid *gd)
+{
+	struct grid_line	*gl;
+	u_int			 yy, last;
+
+	GRID_DEBUG(gd, "");
+
+	/* Find the last used line. */
+	last = 0;
+	for (yy = 0; yy < gd->sy; yy++) {
+		gl = &gd->linedata[grid_view_y(gd, yy)];
+		if (gl->cellsize != 0 || gl->utf8size != 0)
+			last = yy + 1;
+	}
+	if (last == 0)
+		return;
+
+	/* Scroll the lines into the history. */
+	for (yy = 0; yy < last; yy++)
+		grid_scroll_history(gd);
+}
+
 /* Clear area. */
 void
 grid_view_clear(struct grid *gd, u_int px, u_int py, u_int nx, u_int ny)
diff --git a/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c
index 17efd6e4fb7..7ee7404b02b 100644
--- a/usr.bin/tmux/screen-write.c
+++ b/usr.bin/tmux/screen-write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-write.c,v 1.45 2011/01/03 23:35:21 nicm Exp $ */
+/* $OpenBSD: screen-write.c,v 1.46 2011/01/25 23:40:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -931,9 +931,14 @@ screen_write_clearendofscreen(struct screen_write_ctx *ctx)
 	sx = screen_size_x(s);
 	sy = screen_size_y(s);
 
-	if (s->cx <= sx - 1)
-		grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1);
-	grid_view_clear(s->grid, 0, s->cy + 1, sx, sy - (s->cy + 1));
+	/* Scroll into history if it is enabled and clearing entire screen. */
+	if (s->cy == 0 && s->grid->flags & GRID_HISTORY)
+		grid_view_clear_history(s->grid);
+	else {
+		if (s->cx <= sx - 1)
+			grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1);
+		grid_view_clear(s->grid, 0, s->cy + 1, sx, sy - (s->cy + 1));
+	}
 
 	tty_write(tty_cmd_clearendofscreen, &ttyctx);
 }
@@ -969,7 +974,13 @@ screen_write_clearscreen(struct screen_write_ctx *ctx)
 
 	screen_write_initctx(ctx, &ttyctx, 0);
 
-	grid_view_clear(s->grid, 0, 0, screen_size_x(s), screen_size_y(s));
+	/* Scroll into history if it is enabled. */
+	if (s->grid->flags & GRID_HISTORY)
+		grid_view_clear_history(s->grid);
+	else {
+		grid_view_clear(
+		    s->grid, 0, 0, screen_size_x(s), screen_size_y(s));
+	}
 
 	tty_write(tty_cmd_clearscreen, &ttyctx);
 }
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 7607d717f23..f6c9e881b8f 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.268 2011/01/25 22:31:50 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.269 2011/01/25 23:40:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1741,6 +1741,7 @@ const struct grid_utf8 *grid_view_peek_utf8(struct grid *, u_int, u_int);
 struct grid_utf8 *grid_view_get_utf8(struct grid *, u_int, u_int);
 void	 grid_view_set_utf8(
 	     struct grid *, u_int, u_int, const struct grid_utf8 *);
+void	 grid_view_clear_history(struct grid *);
 void	 grid_view_clear(struct grid *, u_int, u_int, u_int, u_int);
 void	 grid_view_scroll_region_up(struct grid *, u_int, u_int);
 void	 grid_view_scroll_region_down(struct grid *, u_int, u_int);