===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -c -r1.73 -r1.74
*** src/usr.bin/tmux/server-client.c	2012/05/21 18:27:42	1.73
--- src/usr.bin/tmux/server-client.c	2012/05/22 14:32:28	1.74
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.73 2012/05/21 18:27:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.74 2012/05/22 14:32:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 27,35 ****
  
  #include "tmux.h"
  
! void	server_client_check_mouse(struct client *c,
! 	    struct window_pane *wp, struct mouse_event *mouse);
! void	server_client_handle_key(int, struct mouse_event *, void *);
  void	server_client_repeat_timer(int, short, void *);
  void	server_client_check_exit(struct client *);
  void	server_client_check_redraw(struct client *);
--- 27,34 ----
  
  #include "tmux.h"
  
! void	server_client_check_mouse(struct client *, struct window_pane *,
! 	    struct mouse_event *);
  void	server_client_repeat_timer(int, short, void *);
  void	server_client_check_exit(struct client *);
  void	server_client_check_redraw(struct client *);
***************
*** 338,346 ****
  
  /* Handle data key input from client. */
  void
! server_client_handle_key(int key, struct mouse_event *mouse, void *data)
  {
- 	struct client		*c = data;
  	struct session		*s;
  	struct window		*w;
  	struct window_pane	*wp;
--- 337,344 ----
  
  /* Handle data key input from client. */
  void
! server_client_handle_key(struct client *c, int key)
  {
  	struct session		*s;
  	struct window		*w;
  	struct window_pane	*wp;
***************
*** 391,397 ****
  	if (key == KEYC_MOUSE) {
  		if (c->flags & CLIENT_READONLY)
  			return;
! 		server_client_check_mouse(c, wp, mouse);
  		return;
  	}
  
--- 389,395 ----
  	if (key == KEYC_MOUSE) {
  		if (c->flags & CLIENT_READONLY)
  			return;
! 		server_client_check_mouse(c, wp, &c->tty.mouse);
  		return;
  	}
  
***************
*** 899,913 ****
  	if (!isatty(fd))
  	    return;
  	data->term[(sizeof data->term) - 1] = '\0';
! 	tty_init(&c->tty, fd, data->term);
  	if (data->flags & IDENTIFY_UTF8)
  		c->tty.flags |= TTY_UTF8;
  	if (data->flags & IDENTIFY_256COLOURS)
  		c->tty.term_flags |= TERM_256COLOURS;
  	else if (data->flags & IDENTIFY_88COLOURS)
  		c->tty.term_flags |= TERM_88COLOURS;
- 	c->tty.key_callback = server_client_handle_key;
- 	c->tty.key_data = c;
  
  	tty_resize(&c->tty);
  
--- 897,909 ----
  	if (!isatty(fd))
  	    return;
  	data->term[(sizeof data->term) - 1] = '\0';
! 	tty_init(&c->tty, c, fd, data->term);
  	if (data->flags & IDENTIFY_UTF8)
  		c->tty.flags |= TTY_UTF8;
  	if (data->flags & IDENTIFY_256COLOURS)
  		c->tty.term_flags |= TERM_256COLOURS;
  	else if (data->flags & IDENTIFY_88COLOURS)
  		c->tty.term_flags |= TERM_88COLOURS;
  
  	tty_resize(&c->tty);