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.
This commit is contained in:
Nicholas Marriott
2010-05-23 19:42:19 +00:00
parent 0ed727a012
commit 4f5c5b37b8
8 changed files with 33 additions and 34 deletions

View File

@ -25,9 +25,9 @@
struct screen *window_choose_init(struct window_pane *);
void window_choose_free(struct window_pane *);
void window_choose_resize(struct window_pane *, u_int, u_int);
void window_choose_key(struct window_pane *, struct client *, int);
void window_choose_key(struct window_pane *, struct session *, int);
void window_choose_mouse(
struct window_pane *, struct client *, struct mouse_event *);
struct window_pane *, struct session *, struct mouse_event *);
void window_choose_redraw_screen(struct window_pane *);
void window_choose_write_line(
@ -171,7 +171,7 @@ window_choose_resize(struct window_pane *wp, u_int sx, u_int sy)
/* ARGSUSED */
void
window_choose_key(struct window_pane *wp, unused struct client *c, int key)
window_choose_key(struct window_pane *wp, unused struct session *sess, int key)
{
struct window_choose_mode_data *data = wp->modedata;
struct screen *s = &data->screen;
@ -304,7 +304,7 @@ window_choose_key(struct window_pane *wp, unused struct client *c, int key)
/* ARGSUSED */
void
window_choose_mouse(
struct window_pane *wp, unused struct client *c, struct mouse_event *m)
struct window_pane *wp, unused struct session *sess, struct mouse_event *m)
{
struct window_choose_mode_data *data = wp->modedata;
struct screen *s = &data->screen;