summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/tty-keys.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2012-05-22 14:32:28 +0000
committernicm <nicm@openbsd.org>2012-05-22 14:32:28 +0000
commit1603c5c1c85a5dd43e85abce89d1f65924bcfafe (patch)
tree10d76dfb8812955b879f64e81b2e3b44bf022ad2 /usr.bin/tmux/tty-keys.c
parentStore mouse data in tty structure not on the stack. (diff)
downloadwireguard-openbsd-1603c5c1c85a5dd43e85abce89d1f65924bcfafe.tar.xz
wireguard-openbsd-1603c5c1c85a5dd43e85abce89d1f65924bcfafe.zip
Store client in tty struct directly instead of using a callback function
pointer.
Diffstat (limited to 'usr.bin/tmux/tty-keys.c')
-rw-r--r--usr.bin/tmux/tty-keys.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tmux/tty-keys.c b/usr.bin/tmux/tty-keys.c
index efecf4b0080..b8012f0c041 100644
--- a/usr.bin/tmux/tty-keys.c
+++ b/usr.bin/tmux/tty-keys.c
@@ -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 @@ handle_key:
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 @@ tty_keys_callback(unused int fd, unused short events, void *data)
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;