aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-11-08 22:40:36 +0000
committerTiago Cunha <tcunha@gmx.com>2009-11-08 22:40:36 +0000
commitdd36982ad51632bc47ce7b73cad0696e85d593c3 (patch)
treeedb86b1ff2689f20522150f2e1fbeb0600f7a58c /window.c
parent5ce49941fb8ab4ce65df4ef872028ab89fd855ae (diff)
downloadrtmux-dd36982ad51632bc47ce7b73cad0696e85d593c3.tar.gz
rtmux-dd36982ad51632bc47ce7b73cad0696e85d593c3.tar.bz2
rtmux-dd36982ad51632bc47ce7b73cad0696e85d593c3.zip
Sync OpenBSD patchset 491:
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 'window.c')
-rw-r--r--window.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/window.c b/window.c
index 1830617e..a9995399 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.117 2009-10-23 17:41:20 tcunha Exp $ */
+/* $Id: window.c,v 1.118 2009-11-08 22:40:36 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -453,10 +453,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);
@@ -541,7 +543,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') {