===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -c -r1.55 -r1.56
*** src/usr.bin/tmux/window-copy.c	2010/04/28 18:19:16	1.55
--- src/usr.bin/tmux/window-copy.c	2010/05/23 19:42:19	1.56
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.55 2010/04/28 18:19:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.56 2010/05/23 19:42:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 26,36 ****
  struct screen *window_copy_init(struct window_pane *);
  void	window_copy_free(struct window_pane *);
  void	window_copy_resize(struct window_pane *, u_int, u_int);
! void	window_copy_key(struct window_pane *, struct client *, int);
  int	window_copy_key_input(struct window_pane *, int);
  int	window_copy_key_numeric_prefix(struct window_pane *, int);
  void	window_copy_mouse(
! 	    struct window_pane *, struct client *, struct mouse_event *);
  
  void	window_copy_redraw_lines(struct window_pane *, u_int, u_int);
  void	window_copy_redraw_screen(struct window_pane *);
--- 26,36 ----
  struct screen *window_copy_init(struct window_pane *);
  void	window_copy_free(struct window_pane *);
  void	window_copy_resize(struct window_pane *, u_int, u_int);
! void	window_copy_key(struct window_pane *, struct session *, int);
  int	window_copy_key_input(struct window_pane *, int);
  int	window_copy_key_numeric_prefix(struct window_pane *, int);
  void	window_copy_mouse(
! 	    struct window_pane *, struct session *, struct mouse_event *);
  
  void	window_copy_redraw_lines(struct window_pane *, u_int, u_int);
  void	window_copy_redraw_screen(struct window_pane *);
***************
*** 52,58 ****
  void	window_copy_update_cursor(struct window_pane *, u_int, u_int);
  void	window_copy_start_selection(struct window_pane *);
  int	window_copy_update_selection(struct window_pane *);
! void	window_copy_copy_selection(struct window_pane *, struct client *);
  void	window_copy_clear_selection(struct window_pane *);
  void	window_copy_copy_line(
  	    struct window_pane *, char **, size_t *, u_int, u_int, u_int);
--- 52,58 ----
  void	window_copy_update_cursor(struct window_pane *, u_int, u_int);
  void	window_copy_start_selection(struct window_pane *);
  int	window_copy_update_selection(struct window_pane *);
! void	window_copy_copy_selection(struct window_pane *, struct session *);
  void	window_copy_clear_selection(struct window_pane *);
  void	window_copy_copy_line(
  	    struct window_pane *, char **, size_t *, u_int, u_int, u_int);
***************
*** 340,347 ****
  		data->cy = sy - 1;
  	if (data->cx > sx)
  		data->cx = sx;
- 	if (data->oy > screen_hsize(data->backing))
- 		data->oy = screen_hsize(data->backing);
  
  	window_copy_clear_selection(wp);
  
--- 340,345 ----
***************
*** 353,359 ****
  }
  
  void
! window_copy_key(struct window_pane *wp, struct client *c, int key)
  {
  	const char			*word_separators;
  	struct window_copy_mode_data	*data = wp->modedata;
--- 351,357 ----
  }
  
  void
! window_copy_key(struct window_pane *wp, struct session *sess, int key)
  {
  	const char			*word_separators;
  	struct window_copy_mode_data	*data = wp->modedata;
***************
*** 503,510 ****
  		window_copy_redraw_screen(wp);
  		break;
  	case MODEKEYCOPY_COPYSELECTION:
! 		if (c != NULL && c->session != NULL) {
! 			window_copy_copy_selection(wp, c);
  			window_pane_reset_mode(wp);
  			return;
  		}
--- 501,508 ----
  		window_copy_redraw_screen(wp);
  		break;
  	case MODEKEYCOPY_COPYSELECTION:
! 		if (sess != NULL) {
! 			window_copy_copy_selection(wp, sess);
  			window_pane_reset_mode(wp);
  			return;
  		}
***************
*** 758,764 ****
  /* ARGSUSED */
  void
  window_copy_mouse(
!     struct window_pane *wp, unused struct client *c, struct mouse_event *m)
  {
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
--- 756,762 ----
  /* ARGSUSED */
  void
  window_copy_mouse(
!     struct window_pane *wp, unused struct session *sess, struct mouse_event *m)
  {
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
***************
*** 1169,1175 ****
  }
  
  void
! window_copy_copy_selection(struct window_pane *wp, struct client *c)
  {
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
--- 1167,1173 ----
  }
  
  void
! window_copy_copy_selection(struct window_pane *wp, struct session *sess)
  {
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
***************
*** 1264,1271 ****
  	off--;	/* remove final \n */
  
  	/* Add the buffer to the stack. */
! 	limit = options_get_number(&c->session->options, "buffer-limit");
! 	paste_add(&c->session->buffers, buf, off, limit);
  }
  
  void
--- 1262,1269 ----
  	off--;	/* remove final \n */
  
  	/* Add the buffer to the stack. */
! 	limit = options_get_number(&sess->options, "buffer-limit");
! 	paste_add(&sess->buffers, buf, off, limit);
  }
  
  void