===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.336
retrieving revision 1.337
diff -c -r1.336 -r1.337
*** src/usr.bin/tmux/tmux.h	2012/05/22 14:11:30	1.336
--- src/usr.bin/tmux/tmux.h	2012/05/22 14:32:28	1.337
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.336 2012/05/22 14:11:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.337 2012/05/22 14:32:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1100,1105 ****
--- 1100,1107 ----
  LIST_HEAD(tty_terms, tty_term);
  
  struct tty {
+ 	struct client	*client;
+ 
  	char		*path;
  	u_int		 xterm_version;
  
***************
*** 1138,1146 ****
  
  	int		 term_flags;
  
! 	struct mouse_event mouse_event;
! 	void		 (*key_callback)(int, struct mouse_event *, void *);
! 	void		*key_data;
  	struct event	 key_timer;
  	struct tty_key	*key_tree;
  };
--- 1140,1147 ----
  
  	int		 term_flags;
  
! 	struct mouse_event mouse;
! 
  	struct event	 key_timer;
  	struct tty_key	*key_tree;
  };
***************
*** 1533,1539 ****
  void	tty_puts(struct tty *, const char *);
  void	tty_putc(struct tty *, u_char);
  void	tty_pututf8(struct tty *, const struct grid_utf8 *);
! void	tty_init(struct tty *, int, char *);
  int	tty_resize(struct tty *);
  int	tty_set_size(struct tty *, u_int, u_int);
  void	tty_start_tty(struct tty *);
--- 1534,1540 ----
  void	tty_puts(struct tty *, const char *);
  void	tty_putc(struct tty *, u_char);
  void	tty_pututf8(struct tty *, const struct grid_utf8 *);
! void	tty_init(struct tty *, struct client *, int, char *);
  int	tty_resize(struct tty *);
  int	tty_set_size(struct tty *, u_int, u_int);
  void	tty_start_tty(struct tty *);
***************
*** 1764,1769 ****
--- 1765,1771 ----
  void	 server_add_accept(int);
  
  /* server-client.c */
+ void	 server_client_handle_key(struct client *, int);
  void	 server_client_create(int);
  int      server_client_open(struct client *, struct session *, char **);
  void	 server_client_lost(struct client *);