diff options
| author |   nicm <nicm@openbsd.org> | 2020-03-19 14:03:48 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2020-03-19 14:03:48 +0000 |
| commit | 29ebed3733c53f26b45edd4bc4795dfaa9d323c8 (patch) | |
| tree | 68852ebf2f494759269bd49a1cc27fdf7874fc88 /usr.bin/tmux/window.c | |
| parent | Separate variable declaration and assignment. No functional change. (diff) | |
| download | wireguard-openbsd-29ebed3733c53f26b45edd4bc4795dfaa9d323c8.tar.xz wireguard-openbsd-29ebed3733c53f26b45edd4bc4795dfaa9d323c8.zip | |
Change input path so it doesn't require a pane.
Diffstat (limited to 'usr.bin/tmux/window.c')
| -rw-r--r-- | usr.bin/tmux/window.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/tmux/window.c b/usr.bin/tmux/window.c index 8ade155a82f..0b21dd1057b 100644 --- a/usr.bin/tmux/window.c +++ b/usr.bin/tmux/window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window.c,v 1.249 2020/03/16 08:23:24 nicm Exp $ */ +/* $OpenBSD: window.c,v 1.250 2020/03/19 14:03:49 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -891,7 +891,7 @@ window_pane_create(struct window *w, u_int sx, u_int sy, u_int hlimit) if (gethostname(host, sizeof host) == 0) screen_set_title(&wp->base, host); - input_init(wp); + wp->ictx = input_init(wp); return (wp); } @@ -907,7 +907,7 @@ window_pane_destroy(struct window_pane *wp) close(wp->fd); } - input_free(wp); + input_free(wp->ictx); screen_free(&wp->status_screen); @@ -949,7 +949,7 @@ window_pane_read_callback(__unused struct bufferevent *bufev, void *data) } log_debug("%%%u has %zu bytes", wp->id, size); - input_parse(wp); + input_parse_pane(wp); wp->pipe_off = EVBUFFER_LENGTH(evb); } @@ -1257,7 +1257,7 @@ window_pane_key(struct window_pane *wp, struct client *c, struct session *s, if (wp->fd == -1 || wp->flags & PANE_INPUTOFF) return (0); - if (input_key(wp, key, m) != 0) + if (input_key_pane(wp, key, m) != 0) return (-1); if (KEYC_IS_MOUSE(key)) @@ -1269,7 +1269,7 @@ window_pane_key(struct window_pane *wp, struct client *c, struct session *s, wp2->fd != -1 && (~wp2->flags & PANE_INPUTOFF) && window_pane_visible(wp2)) - input_key(wp2, key, NULL); + input_key_pane(wp2, key, NULL); } } return (0); |