diff options
| author |   nicm <nicm@openbsd.org> | 2010-05-23 19:42:19 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-05-23 19:42:19 +0000 |
| commit | a0b28a81ed50cec04a78a044c2bed344a18ae74a (patch) | |
| tree | 0bf255c040c646ccea0e76b7b9efbeaa5444268d /usr.bin/tmux/server-client.c | |
| parent | When executing external mda, call dup2, closefrom, and chdir before (diff) | |
| download | wireguard-openbsd-a0b28a81ed50cec04a78a044c2bed344a18ae74a.tar.xz wireguard-openbsd-a0b28a81ed50cec04a78a044c2bed344a18ae74a.zip | |
Pass in the session, rather than the client, to window modes' key()
function. We were only ever using the client to find the session anyway.
This allows send-key to work properly for manipulating copy mode from
outside tmux.
From Micah Cowan.
Diffstat (limited to 'usr.bin/tmux/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 45533c72ec1..622b93f9432 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.30 2010/02/06 22:55:31 nicm Exp $ */ +/* $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,7 +300,7 @@ server_client_handle_key(int key, struct mouse_event *mouse, void *data) server_redraw_window_borders(w); wp = w->active; } - window_pane_mouse(wp, c, mouse); + window_pane_mouse(wp, c->session, mouse); return; } @@ -322,7 +322,7 @@ server_client_handle_key(int key, struct mouse_event *mouse, void *data) /* 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); + window_pane_key(wp, c->session, key); } else key_bindings_dispatch(bd, c); } @@ -338,7 +338,7 @@ server_client_handle_key(int key, struct mouse_event *mouse, void *data) if (isprefix) c->flags |= CLIENT_PREFIX; else if (!(c->flags & CLIENT_READONLY)) - window_pane_key(wp, c, key); + window_pane_key(wp, c->session, key); } return; } @@ -349,7 +349,7 @@ server_client_handle_key(int key, struct mouse_event *mouse, void *data) if (isprefix) c->flags |= CLIENT_PREFIX; else if (!(c->flags & CLIENT_READONLY)) - window_pane_key(wp, c, key); + window_pane_key(wp, c->session, key); return; } |