aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-11-04 22:02:38 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-11-04 22:02:38 +0000
commit91ad830c8863ab66038226f9e16bc87cbbdb6d95 (patch)
tree46c71a1d7cd642eb7d0ed3ba2fcdda1071a416b4 /window.c
parent7342615c7ddd9b99820bd9c03fda2afe7bc868d3 (diff)
downloadrtmux-91ad830c8863ab66038226f9e16bc87cbbdb6d95.tar.gz
rtmux-91ad830c8863ab66038226f9e16bc87cbbdb6d95.tar.bz2
rtmux-91ad830c8863ab66038226f9e16bc87cbbdb6d95.zip
Switch window pane pipe redirect fd over to a bufferevent.
Diffstat (limited to 'window.c')
-rw-r--r--window.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/window.c b/window.c
index 8f62c0e4..293a1c63 100644
--- a/window.c
+++ b/window.c
@@ -426,8 +426,8 @@ window_pane_create(struct window *w, u_int sx, u_int sy, u_int hlimit)
wp->sy = sy;
wp->pipe_fd = -1;
- wp->pipe_buf = NULL;
wp->pipe_off = 0;
+ wp->pipe_event = NULL;
wp->saved_grid = NULL;
@@ -453,9 +453,8 @@ window_pane_destroy(struct window_pane *wp)
grid_destroy(wp->saved_grid);
if (wp->pipe_fd != -1) {
- buffer_destroy(wp->pipe_buf);
close(wp->pipe_fd);
- event_del(&wp->pipe_event);
+ bufferevent_free(wp->pipe_event);
}
buffer_destroy(wp->in);
@@ -639,7 +638,7 @@ window_pane_parse(struct window_pane *wp)
new_size = BUFFER_USED(wp->in) - wp->pipe_off;
if (wp->pipe_fd != -1 && new_size > 0)
- buffer_write(wp->pipe_buf, BUFFER_OUT(wp->in), new_size);
+ bufferevent_write(wp->pipe_event, BUFFER_OUT(wp->in), new_size);
input_parse(wp);