diff options
Diffstat (limited to 'usr.bin/tmux/cmd-kill-pane.c')
| -rw-r--r-- | usr.bin/tmux/cmd-kill-pane.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/usr.bin/tmux/cmd-kill-pane.c b/usr.bin/tmux/cmd-kill-pane.c index c63125ce962..cda85b40e2e 100644 --- a/usr.bin/tmux/cmd-kill-pane.c +++ b/usr.bin/tmux/cmd-kill-pane.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-kill-pane.c,v 1.5 2009/07/26 12:58:44 nicm Exp $ */ +/* $OpenBSD: cmd-kill-pane.c,v 1.6 2009/07/30 13:45:56 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -30,33 +30,24 @@ int cmd_kill_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_kill_pane_entry = { "kill-pane", "killp", - CMD_PANE_WINDOW_USAGE, + CMD_TARGET_PANE_USAGE, 0, 0, - cmd_pane_init, - cmd_pane_parse, + cmd_target_init, + cmd_target_parse, cmd_kill_pane_exec, - cmd_pane_free, - cmd_pane_print + cmd_target_free, + cmd_target_print }; int cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx) { - struct cmd_pane_data *data = self->data; + struct cmd_target_data *data = self->data; struct winlink *wl; struct window_pane *wp; - if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) + if ((wl = cmd_find_pane(ctx, data->target, NULL, &wp)) == NULL) return (-1); - if (data->pane == -1) - wp = wl->window->active; - else { - wp = window_pane_at_index(wl->window, data->pane); - if (wp == NULL) { - ctx->error(ctx, "no pane: %d", data->pane); - return (-1); - } - } if (window_count_panes(wl->window) == 1) { /* Only one pane, kill the window. */ |