summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-11-04 20:50:12 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-11-04 20:50:12 +0000
commit891ac5e256beff387c5a745dc912f221cc17024e (patch)
treebfc8c4cbc6c1f75a512e6e7d9d8b73e6b5d7de93 /usr.bin/tmux/window.c
parente50bf28f99a17da4b270d84d66bd20c7e271f67b (diff)
Initial changes to move tmux to libevent.
This moves the client-side loops are pretty much fully over to event-based only (tmux.c and client.c) but server-side (server.c and friends) treats libevent as a sort of clever poll, waking up after every event to run various things. Moving the server stuff over to bufferevents and timers and so on will come later.
Diffstat (limited to 'usr.bin/tmux/window.c')
-rw-r--r--usr.bin/tmux/window.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/tmux/window.c b/usr.bin/tmux/window.c
index 1246d3761ba..90fec083417 100644
--- a/usr.bin/tmux/window.c
+++ b/usr.bin/tmux/window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.34 2009/10/22 12:30:00 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.35 2009/11/04 20:50:11 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -455,10 +455,12 @@ window_pane_destroy(struct window_pane *wp)
if (wp->pipe_fd != -1) {
buffer_destroy(wp->pipe_buf);
close(wp->pipe_fd);
+ event_del(&wp->pipe_event);
}
buffer_destroy(wp->in);
buffer_destroy(wp->out);
+ event_del(&wp->event);
if (wp->cwd != NULL)
xfree(wp->cwd);
@@ -543,7 +545,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
setenv(envent->name, envent->value, 1);
}
- sigreset();
+ server_signal_clear();
log_close();
if (*wp->cmd != '\0') {