diff options
| -rw-r--r-- | cmd-respawn-window.c | 1 | ||||
| -rw-r--r-- | server-fn.c | 21 | ||||
| -rw-r--r-- | server-window.c | 62 | ||||
| -rw-r--r-- | server.c | 6 | ||||
| -rw-r--r-- | tmux.h | 1 | ||||
| -rw-r--r-- | window.c | 4 |
6 files changed, 26 insertions, 69 deletions
diff --git a/cmd-respawn-window.c b/cmd-respawn-window.c index 540931aa..227754c1 100644 --- a/cmd-respawn-window.c +++ b/cmd-respawn-window.c @@ -80,6 +80,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx) ctx->error(ctx, "respawn window failed: %s", cause); xfree(cause); environ_free(&env); + server_destroy_pane(wp); return (-1); } layout_init(w); diff --git a/server-fn.c b/server-fn.c index f31e1337..ae1340e7 100644 --- a/server-fn.c +++ b/server-fn.c @@ -317,6 +317,27 @@ server_unlink_window(struct session *s, struct winlink *wl) } void +server_destroy_pane(struct window_pane *wp) +{ + struct window *w = wp->window; + + close(wp->fd); + bufferevent_free(wp->event); + wp->fd = -1; + + if (options_get_number(&w->options, "remain-on-exit")) + return; + + layout_close_pane(wp); + window_remove_pane(w, wp); + + if (TAILQ_EMPTY(&w->panes)) + server_kill_window(w); + else + server_redraw_window(w); +} + +void server_destroy_session_group(struct session *s) { struct session_group *sg; diff --git a/server-window.c b/server-window.c index cb819dfe..319c4478 100644 --- a/server-window.c +++ b/server-window.c @@ -28,7 +28,6 @@ int server_window_check_bell(struct session *, struct window *); int server_window_check_activity(struct session *, struct window *); int server_window_check_content( struct session *, struct window *, struct window_pane *); -void server_window_check_alive(struct window *); /* Check if this window should suspend reading. */ int @@ -90,8 +89,6 @@ server_window_loop(void) server_window_check_content(s, w, wp); } w->flags &= ~(WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_CONTENT); - - server_window_check_alive(w); } } @@ -228,62 +225,3 @@ server_window_check_content( return (1); } - -/* Check if window still exists. */ -void -server_window_check_alive(struct window *w) -{ - struct window_pane *wp, *wq; - struct options *oo = &w->options; - struct session *s; - struct winlink *wl; - u_int i; - int destroyed; - - destroyed = 1; - - wp = TAILQ_FIRST(&w->panes); - while (wp != NULL) { - wq = TAILQ_NEXT(wp, entry); - /* - * If the pane has died and the remain-on-exit flag is not set, - * remove the pane; otherwise, if the flag is set, don't allow - * the window to be destroyed (or it'll close when the last - * pane dies). - */ - if (wp->fd == -1 && !options_get_number(oo, "remain-on-exit")) { - layout_close_pane(wp); - window_remove_pane(w, wp); - server_redraw_window(w); - } else - destroyed = 0; - wp = wq; - } - - if (!destroyed) - return; - - for (i = 0; i < ARRAY_LENGTH(&sessions); i++) { - s = ARRAY_ITEM(&sessions, i); - if (s == NULL) - continue; - if (!session_has(s, w)) - continue; - - restart: - /* Detach window and either redraw or kill clients. */ - RB_FOREACH(wl, winlinks, &s->windows) { - if (wl->window != w) - continue; - if (session_detach(s, wl)) { - server_destroy_session_group(s); - break; - } - server_redraw_session(s); - server_status_session_group(s); - goto restart; - } - } - - recalculate_sizes(); -} @@ -335,7 +335,6 @@ server_accept_callback(int fd, short events, unused void *data) return; } server_client_create(newfd); - } /* Set up server signal handling. */ @@ -449,9 +448,8 @@ server_child_exited(pid_t pid, int status) continue; TAILQ_FOREACH(wp, &w->panes, entry) { if (wp->pid == pid) { - close(wp->fd); - bufferevent_free(wp->event); - wp->fd = -1; + server_destroy_pane(wp); + break; } } } @@ -1590,6 +1590,7 @@ void server_kill_window(struct window *); int server_link_window(struct session *, struct winlink *, struct session *, int, int, int, char **); void server_unlink_window(struct session *, struct winlink *); +void server_destroy_pane(struct window_pane *); void server_destroy_session_group(struct session *); void server_destroy_session(struct session *); void server_set_identify(struct client *); @@ -594,9 +594,7 @@ window_pane_error_callback( { struct window_pane *wp = data; - close(wp->fd); - bufferevent_free(wp->event); - wp->fd = -1; + server_destroy_pane(wp); } void |