From 85ae64b9813c61a299e868aac892a80d61f847d8 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 25 Oct 2009 10:41:03 +0000 Subject: Sync OpenBSD patchset 442: -a option to kill all except current pane. From Tiago Cunha, thanks! --- cmd-kill-pane.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'cmd-kill-pane.c') diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c index 4fc6cb5c..26270128 100644 --- a/cmd-kill-pane.c +++ b/cmd-kill-pane.c @@ -1,4 +1,4 @@ -/* $Id: cmd-kill-pane.c,v 1.13 2009-09-20 22:15:32 tcunha Exp $ */ +/* $Id: cmd-kill-pane.c,v 1.14 2009-10-25 10:41:03 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -30,8 +30,8 @@ int cmd_kill_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_kill_pane_entry = { "kill-pane", "killp", - CMD_TARGET_PANE_USAGE, - 0, 0, + "[-a] " CMD_TARGET_PANE_USAGE, + 0, CMD_CHFLAG('a'), cmd_target_init, cmd_target_parse, cmd_kill_pane_exec, @@ -44,7 +44,7 @@ cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_target_data *data = self->data; struct winlink *wl; - struct window_pane *wp; + struct window_pane *loopwp, *nextwp, *wp; if ((wl = cmd_find_pane(ctx, data->target, NULL, &wp)) == NULL) return (-1); @@ -56,8 +56,21 @@ cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx) return (0); } - layout_close_pane(wp); - window_remove_pane(wl->window, wp); + if (data->chflags & CMD_CHFLAG('a')) { + loopwp = TAILQ_FIRST(&wl->window->panes); + while (loopwp != NULL) { + nextwp = TAILQ_NEXT(loopwp, entry); + if (loopwp != wp) { + layout_close_pane(loopwp); + window_remove_pane(wl->window, loopwp); + } + loopwp = nextwp; + } + } else { + layout_close_pane(wp); + window_remove_pane(wl->window, wp); + } server_redraw_window(wl->window); + return (0); } -- cgit