=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- src/usr.bin/tmux/window.c 2019/04/26 10:24:26 1.227 +++ src/usr.bin/tmux/window.c 2019/05/03 20:44:24 1.228 @@ -1,4 +1,4 @@ -/* $OpenBSD: window.c,v 1.227 2019/04/26 10:24:26 nicm Exp $ */ +/* $OpenBSD: window.c,v 1.228 2019/05/03 20:44:24 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -72,6 +72,11 @@ NULL }; +struct window_pane_input_data { + struct cmdq_item *item; + u_int wp; +}; + static struct window_pane *window_pane_create(struct window *, u_int, u_int, u_int); static void window_pane_destroy(struct window_pane *); @@ -1465,4 +1470,46 @@ } return (idx); +} + +static void +window_pane_input_callback(struct client *c, int closed, void *data) +{ + struct window_pane_input_data *cdata = data; + struct window_pane *wp; + + wp = window_pane_find_by_id(cdata->wp); + if (wp == NULL || closed || c->flags & CLIENT_DEAD) { + c->stdin_callback = NULL; + server_client_unref(c); + + cdata->item->flags &= ~CMDQ_WAITING; + free(cdata); + + return; + } + + if (evbuffer_add_buffer(wp->event->input, c->stdin_data) != 0) + evbuffer_drain(c->stdin_data, EVBUFFER_LENGTH(c->stdin_data)); + input_parse(wp); +} + +int +window_pane_start_input(struct window_pane *wp, struct cmdq_item *item, + char **cause) +{ + struct client *c = item->client; + struct window_pane_input_data *cdata; + + if (~wp->flags & PANE_EMPTY) { + *cause = xstrdup("pane is not empty"); + return (-1); + } + + cdata = xmalloc(sizeof *cdata); + cdata->item = item; + cdata->wp = wp->id; + + return (server_set_stdin_callback(c, window_pane_input_callback, cdata, + cause)); }