===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -c -r1.30 -r1.31
*** src/usr.bin/tmux/server-client.c	2010/02/06 22:55:31	1.30
--- src/usr.bin/tmux/server-client.c	2010/05/23 19:42:19	1.31
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.30 2010/02/06 22:55:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.31 2010/05/23 19:42:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 300,306 ****
  			server_redraw_window_borders(w);
  			wp = w->active;
  		}
! 		window_pane_mouse(wp, c, mouse);
  		return;
  	}
  
--- 300,306 ----
  			server_redraw_window_borders(w);
  			wp = w->active;
  		}
! 		window_pane_mouse(wp, c->session, mouse);
  		return;
  	}
  
***************
*** 322,328 ****
  			/* Try as a non-prefix key binding. */
  			if ((bd = key_bindings_lookup(key)) == NULL) {
  				if (!(c->flags & CLIENT_READONLY))
! 					window_pane_key(wp, c, key);
  			} else
  				key_bindings_dispatch(bd, c);
  		}
--- 322,328 ----
  			/* Try as a non-prefix key binding. */
  			if ((bd = key_bindings_lookup(key)) == NULL) {
  				if (!(c->flags & CLIENT_READONLY))
! 					window_pane_key(wp, c->session, key);
  			} else
  				key_bindings_dispatch(bd, c);
  		}
***************
*** 338,344 ****
  			if (isprefix)
  				c->flags |= CLIENT_PREFIX;
  			else if (!(c->flags & CLIENT_READONLY))
! 				window_pane_key(wp, c, key);
  		}
  		return;
  	}
--- 338,344 ----
  			if (isprefix)
  				c->flags |= CLIENT_PREFIX;
  			else if (!(c->flags & CLIENT_READONLY))
! 				window_pane_key(wp, c->session, key);
  		}
  		return;
  	}
***************
*** 349,355 ****
  		if (isprefix)
  			c->flags |= CLIENT_PREFIX;
  		else if (!(c->flags & CLIENT_READONLY))
! 			window_pane_key(wp, c, key);
  		return;
  	}
  
--- 349,355 ----
  		if (isprefix)
  			c->flags |= CLIENT_PREFIX;
  		else if (!(c->flags & CLIENT_READONLY))
! 			window_pane_key(wp, c->session, key);
  		return;
  	}