===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid-view.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** src/usr.bin/tmux/grid-view.c	2017/02/16 12:43:08	1.28
--- src/usr.bin/tmux/grid-view.c	2017/05/12 13:00:56	1.29
***************
*** 1,4 ****
! /* $OpenBSD: grid-view.c,v 1.28 2017/02/16 12:43:08 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: grid-view.c,v 1.29 2017/05/12 13:00:56 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 96,127 ****
  
  /* Scroll region up. */
  void
! grid_view_scroll_region_up(struct grid *gd, u_int rupper, u_int rlower)
  {
  	if (gd->flags & GRID_HISTORY) {
! 		grid_collect_history(gd, 8);
  		if (rupper == 0 && rlower == gd->sy - 1)
! 			grid_scroll_history(gd, 8);
  		else {
  			rupper = grid_view_y(gd, rupper);
  			rlower = grid_view_y(gd, rlower);
! 			grid_scroll_history_region(gd, rupper, rlower);
  		}
  	} else {
  		rupper = grid_view_y(gd, rupper);
  		rlower = grid_view_y(gd, rlower);
! 		grid_move_lines(gd, rupper, rupper + 1, rlower - rupper, 8);
  	}
  }
  
  /* Scroll region down. */
  void
! grid_view_scroll_region_down(struct grid *gd, u_int rupper, u_int rlower)
  {
  	rupper = grid_view_y(gd, rupper);
  	rlower = grid_view_y(gd, rlower);
  
! 	grid_move_lines(gd, rupper + 1, rupper, rlower - rupper, 8);
  }
  
  /* Insert lines. */
--- 96,129 ----
  
  /* Scroll region up. */
  void
! grid_view_scroll_region_up(struct grid *gd, u_int rupper, u_int rlower,
!     u_int bg)
  {
  	if (gd->flags & GRID_HISTORY) {
! 		grid_collect_history(gd, bg);
  		if (rupper == 0 && rlower == gd->sy - 1)
! 			grid_scroll_history(gd, bg);
  		else {
  			rupper = grid_view_y(gd, rupper);
  			rlower = grid_view_y(gd, rlower);
! 			grid_scroll_history_region(gd, rupper, rlower, bg);
  		}
  	} else {
  		rupper = grid_view_y(gd, rupper);
  		rlower = grid_view_y(gd, rlower);
! 		grid_move_lines(gd, rupper, rupper + 1, rlower - rupper, bg);
  	}
  }
  
  /* Scroll region down. */
  void
! grid_view_scroll_region_down(struct grid *gd, u_int rupper, u_int rlower,
!     u_int bg)
  {
  	rupper = grid_view_y(gd, rupper);
  	rlower = grid_view_y(gd, rlower);
  
! 	grid_move_lines(gd, rupper + 1, rupper, rlower - rupper, bg);
  }
  
  /* Insert lines. */