===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/window-scroll.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/tmux/Attic/window-scroll.c	2009/08/05 16:26:38	1.6
--- src/usr.bin/tmux/Attic/window-scroll.c	2009/08/13 22:11:43	1.7
***************
*** 1,4 ****
! /* $OpenBSD: window-scroll.c,v 1.6 2009/08/05 16:26:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-scroll.c,v 1.7 2009/08/13 22:11:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 101,111 ****
  {
  	struct window_scroll_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
  
! 	if (data->oy + screen_size_y(s) > screen_hsize(&wp->base))
  		data->oy = screen_hsize(&wp->base);
  	else
! 		data->oy += screen_size_y(s);
  
  	window_scroll_redraw_screen(wp);
  }
--- 101,115 ----
  {
  	struct window_scroll_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
+ 	u_int				 n;
  
! 	n = 1;
! 	if (screen_size_y(s) > 2)
! 		n = screen_size_y(s) - 2;
! 	if (data->oy + n > screen_hsize(&wp->base))
  		data->oy = screen_hsize(&wp->base);
  	else
! 		data->oy += n;
  
  	window_scroll_redraw_screen(wp);
  }
***************
*** 130,135 ****
--- 134,140 ----
  {
  	struct window_scroll_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
+ 	u_int				 n;
  
  	switch (mode_key_lookup(&data->mdata, key)) {
  	case MODEKEYCOPY_CANCEL:
***************
*** 151,160 ****
  		window_scroll_pageup(wp);
  		break;
  	case MODEKEYCOPY_NEXTPAGE:
! 		if (data->oy < screen_size_y(s))
  			data->oy = 0;
  		else
! 			data->oy -= screen_size_y(s);
  		window_scroll_redraw_screen(wp);
  		break;
  	default:
--- 156,168 ----
  		window_scroll_pageup(wp);
  		break;
  	case MODEKEYCOPY_NEXTPAGE:
! 		n = 1;
! 		if (screen_size_y(s) > 2)
! 			n = screen_size_y(s) - 2;
! 		if (data->oy < n)
  			data->oy = 0;
  		else
! 			data->oy -= n;
  		window_scroll_redraw_screen(wp);
  		break;
  	default: