diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-07-17 20:37:04 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-07-17 20:37:04 +0000 |
| commit | 4bc25501db8414c43e694bbd75cc3e2c8e3c40d5 (patch) | |
| tree | dd5fc5c9f31edad51426459d45326b13a8a1df23 /usr.bin/tmux/cmd-kill-window.c | |
| parent | ac7475a98ccdb093fb64cb987f661dda0598b077 (diff) | |
Make it so using kill-pane to destroy the last pane in a window destroys the
window instead of being an error.
Diffstat (limited to 'usr.bin/tmux/cmd-kill-window.c')
| -rw-r--r-- | usr.bin/tmux/cmd-kill-window.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/usr.bin/tmux/cmd-kill-window.c b/usr.bin/tmux/cmd-kill-window.c index a083e0caf4f..f5ded5e6342 100644 --- a/usr.bin/tmux/cmd-kill-window.c +++ b/usr.bin/tmux/cmd-kill-window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-kill-window.c,v 1.3 2009/07/15 08:00:49 nicm Exp $ */ +/* $OpenBSD: cmd-kill-window.c,v 1.4 2009/07/17 20:37:03 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -44,37 +44,11 @@ cmd_kill_window_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_target_data *data = self->data; struct winlink *wl; - struct window *w; - struct session *s; - struct client *c; - u_int i, j; - int destroyed; if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) return (-1); - w = wl->window; - for (i = 0; i < ARRAY_LENGTH(&sessions); i++) { - s = ARRAY_ITEM(&sessions, i); - if (s == NULL || !session_has(s, w)) - continue; - if ((wl = winlink_find_by_window(&s->windows, w)) == NULL) - continue; - - destroyed = session_detach(s, wl); - for (j = 0; j < ARRAY_LENGTH(&clients); j++) { - c = ARRAY_ITEM(&clients, j); - if (c == NULL || c->session != s) - continue; - - if (destroyed) { - c->session = NULL; - server_write_client(c, MSG_EXIT, NULL, 0); - } else - server_redraw_client(c); - } - } - recalculate_sizes(); + server_kill_window(wl->window); return (0); } |