===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/window-choose.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/tmux/Attic/window-choose.c	2010/02/01 22:15:51	1.15
--- src/usr.bin/tmux/Attic/window-choose.c	2010/05/23 19:42:19	1.16
***************
*** 1,4 ****
! /* $OpenBSD: window-choose.c,v 1.15 2010/02/01 22:15:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-choose.c,v 1.16 2010/05/23 19:42:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 25,33 ****
  struct screen *window_choose_init(struct window_pane *);
  void	window_choose_free(struct window_pane *);
  void	window_choose_resize(struct window_pane *, u_int, u_int);
! void	window_choose_key(struct window_pane *, struct client *, int);
  void	window_choose_mouse(
! 	    struct window_pane *, struct client *, struct mouse_event *);
  
  void	window_choose_redraw_screen(struct window_pane *);
  void	window_choose_write_line(
--- 25,33 ----
  struct screen *window_choose_init(struct window_pane *);
  void	window_choose_free(struct window_pane *);
  void	window_choose_resize(struct window_pane *, u_int, u_int);
! void	window_choose_key(struct window_pane *, struct session *, int);
  void	window_choose_mouse(
! 	    struct window_pane *, struct session *, struct mouse_event *);
  
  void	window_choose_redraw_screen(struct window_pane *);
  void	window_choose_write_line(
***************
*** 171,177 ****
  
  /* ARGSUSED */
  void
! window_choose_key(struct window_pane *wp, unused struct client *c, int key)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
--- 171,177 ----
  
  /* ARGSUSED */
  void
! window_choose_key(struct window_pane *wp, unused struct session *sess, int key)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
***************
*** 304,310 ****
  /* ARGSUSED */
  void
  window_choose_mouse(
!     struct window_pane *wp, unused struct client *c, struct mouse_event *m)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
--- 304,310 ----
  /* ARGSUSED */
  void
  window_choose_mouse(
!     struct window_pane *wp, unused struct session *sess, struct mouse_event *m)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;