summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2012-04-23 22:10:45 +0000
committerNicholas Marriott <nicm@openbsd.org>2012-04-23 22:10:45 +0000
commited58b2d3534dfa6c2f8203710d2fbd3c76d46532 (patch)
tree55c41dc8eb83f440ab0c782bb836c2abf6f9d653
parent5cbca2e70f146ea90748fcec6056babcf671ad3f (diff)
Add -a flag to kill-window, from Thomas Adam.
-rw-r--r--cmd-kill-window.c16
-rw-r--r--tmux.19
2 files changed, 19 insertions, 6 deletions
diff --git a/cmd-kill-window.c b/cmd-kill-window.c
index 30f4c40e..f734eeaf 100644
--- a/cmd-kill-window.c
+++ b/cmd-kill-window.c
@@ -28,8 +28,8 @@ int cmd_kill_window_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_kill_window_entry = {
"kill-window", "killw",
- "t:", 0, 0,
- CMD_TARGET_WINDOW_USAGE,
+ "at:", 0, 0,
+ "[-a] " CMD_TARGET_WINDOW_USAGE,
0,
NULL,
NULL,
@@ -40,13 +40,19 @@ int
cmd_kill_window_exec(struct cmd *self, struct cmd_ctx *ctx)
{
struct args *args = self->args;
- struct winlink *wl;
+ struct winlink *wl, *wl2;
if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
return (-1);
- server_kill_window(wl->window);
- recalculate_sizes();
+ if (args_has(args, 'a')) {
+ RB_FOREACH(wl2, winlinks, &ctx->curclient->session->windows) {
+ if (wl != wl2)
+ server_kill_window(wl2->window);
+ }
+ } else
+ server_kill_window(wl->window);
+ recalculate_sizes();
return (0);
}
diff --git a/tmux.1 b/tmux.1
index d6cc5a68..cd28e7da 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1157,11 +1157,18 @@ The
.Fl a
option kills all but the pane given with
.Fl t .
-.It Ic kill-window Op Fl t Ar target-window
+.It Xo Ic kill-window
+.Op Fl a
+.Op Fl t Ar target-window
+.Xc
.D1 (alias: Ic killw )
Kill the current window or the window at
.Ar target-window ,
removing it from any sessions to which it is linked.
+The
+.Fl a
+option kills all but the window given with
+.Fl t .
.It Ic last-pane Op Fl t Ar target-window
.D1 (alias: Ic lastp )
Select the last (previously selected) pane.