===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** src/usr.bin/tmux/server.c	2009/10/11 00:53:14	1.51
--- src/usr.bin/tmux/server.c	2009/10/11 07:01:10	1.52
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.51 2009/10/11 00:53:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.52 2009/10/11 07:01:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 880,888 ****
  	struct timeval	 	 tv;
  	struct key_binding	*bd;
  	struct keylist		*keylist;
  	int		 	 key, status, xtimeout, mode, isprefix;
  	u_int			 i;
- 	u_char			 mouse[3];
  
  	xtimeout = options_get_number(&c->session->options, "repeat-time");
  	if (xtimeout != 0 && c->flags & CLIENT_REPEAT) {
--- 880,888 ----
  	struct timeval	 	 tv;
  	struct key_binding	*bd;
  	struct keylist		*keylist;
+ 	struct mouse_event	 mouse;
  	int		 	 key, status, xtimeout, mode, isprefix;
  	u_int			 i;
  
  	xtimeout = options_get_number(&c->session->options, "repeat-time");
  	if (xtimeout != 0 && c->flags & CLIENT_REPEAT) {
***************
*** 894,900 ****
  
  	/* Process keys. */
  	keylist = options_get_data(&c->session->options, "prefix");
! 	while (tty_keys_next(&c->tty, &key, mouse) == 0) {
  		if (c->session == NULL)
  			return;
  
--- 894,900 ----
  
  	/* Process keys. */
  	keylist = options_get_data(&c->session->options, "prefix");
! 	while (tty_keys_next(&c->tty, &key, &mouse) == 0) {
  		if (c->session == NULL)
  			return;
  
***************
*** 922,931 ****
  		/* Check for mouse keys. */
  		if (key == KEYC_MOUSE) {
  			if (options_get_number(oo, "mouse-select-pane")) {
! 				window_set_active_at(w, mouse[1], mouse[2]);
  				wp = w->active;
  			}
! 			window_pane_mouse(wp, c, mouse[0], mouse[1], mouse[2]);
  			continue;
  		}
  
--- 922,931 ----
  		/* Check for mouse keys. */
  		if (key == KEYC_MOUSE) {
  			if (options_get_number(oo, "mouse-select-pane")) {
! 				window_set_active_at(w, mouse.x, mouse.y);
  				wp = w->active;
  			}
! 			window_pane_mouse(wp, c, &mouse);
  			continue;
  		}