mirror of
https://github.com/tmux/tmux.git
synced 2024-11-16 01:18:52 +00:00
Squash a function that is only called in a callback into the callback
function.
This commit is contained in:
parent
56481a46bf
commit
7425122c1c
1
tmux.h
1
tmux.h
@ -1828,7 +1828,6 @@ void window_pane_alternate_off(
|
|||||||
int window_pane_set_mode(
|
int window_pane_set_mode(
|
||||||
struct window_pane *, const struct window_mode *);
|
struct window_pane *, const struct window_mode *);
|
||||||
void window_pane_reset_mode(struct window_pane *);
|
void window_pane_reset_mode(struct window_pane *);
|
||||||
void window_pane_parse(struct window_pane *);
|
|
||||||
void window_pane_key(struct window_pane *, struct client *, int);
|
void window_pane_key(struct window_pane *, struct client *, int);
|
||||||
void window_pane_mouse(struct window_pane *,
|
void window_pane_mouse(struct window_pane *,
|
||||||
struct client *, struct mouse_event *);
|
struct client *, struct mouse_event *);
|
||||||
|
31
window.c
31
window.c
@ -586,9 +586,19 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
|
|||||||
void
|
void
|
||||||
window_pane_read_callback(unused struct bufferevent *bufev, void *data)
|
window_pane_read_callback(unused struct bufferevent *bufev, void *data)
|
||||||
{
|
{
|
||||||
struct window_pane *wp = data;
|
struct window_pane *wp = data;
|
||||||
|
char *new_data;
|
||||||
|
size_t new_size;
|
||||||
|
|
||||||
window_pane_parse(wp);
|
new_size = EVBUFFER_LENGTH(wp->event->input) - wp->pipe_off;
|
||||||
|
if (wp->pipe_fd != -1 && new_size > 0) {
|
||||||
|
new_data = EVBUFFER_DATA(wp->event->input);
|
||||||
|
bufferevent_write(wp->pipe_event, new_data, new_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
input_parse(wp);
|
||||||
|
|
||||||
|
wp->pipe_off = EVBUFFER_LENGTH(wp->event->input);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ARGSUSED */
|
/* ARGSUSED */
|
||||||
@ -726,23 +736,6 @@ window_pane_reset_mode(struct window_pane *wp)
|
|||||||
wp->flags |= PANE_REDRAW;
|
wp->flags |= PANE_REDRAW;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
window_pane_parse(struct window_pane *wp)
|
|
||||||
{
|
|
||||||
char *data;
|
|
||||||
size_t new_size;
|
|
||||||
|
|
||||||
new_size = EVBUFFER_LENGTH(wp->event->input) - wp->pipe_off;
|
|
||||||
if (wp->pipe_fd != -1 && new_size > 0) {
|
|
||||||
data = EVBUFFER_DATA(wp->event->input);
|
|
||||||
bufferevent_write(wp->pipe_event, data, new_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
input_parse(wp);
|
|
||||||
|
|
||||||
wp->pipe_off = EVBUFFER_LENGTH(wp->event->input);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
window_pane_key(struct window_pane *wp, struct client *c, int key)
|
window_pane_key(struct window_pane *wp, struct client *c, int key)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user