===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-keys.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- src/usr.bin/tmux/tty-keys.c	2012/05/22 14:11:30	1.40
+++ src/usr.bin/tmux/tty-keys.c	2012/05/22 14:32:28	1.41
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-keys.c,v 1.40 2012/05/22 14:11:30 nicm Exp $ */
+/* $OpenBSD: tty-keys.c,v 1.41 2012/05/22 14:32:28 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -580,7 +580,7 @@
 		evtimer_del(&tty->key_timer);
 
 	if (key != KEYC_NONE)
-		tty->key_callback(key, &tty->mouse_event, tty->key_data);
+		server_client_handle_key(tty->client, key);
 
 	tty->flags &= ~TTY_ESCAPE;
 	return (1);
@@ -607,7 +607,7 @@
 int
 tty_keys_mouse(struct tty *tty, const char *buf, size_t len, size_t *size)
 {
-	struct mouse_event	*m = &tty->mouse_event;
+	struct mouse_event	*m = &tty->mouse;
 	struct utf8_data	 utf8data;
 	u_int			 i, value;