From 071494d8faff83287088bbdcc38db1414c0123b9 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 30 Jul 2009 13:45:56 +0000 Subject: Merge pane number into the target specification for pane commands. Instead of using -p index, a target pane is now addressed with the normal -t window form but suffixed with a period and a pane index, for example :0.2 or mysess:mywin.1. An unadorned number such as -t 1 is tried as a pane index in the current window, if that fails the same rules are followed as for a target window and the current pane in that window used. As a side-effect this now means that swap-pane can swap panes between different windows. Note that this changes the syntax of the break-pane, clear-history, kill-pane, resize-pane, select-pane and swap-pane commands. --- cmd-resize-pane.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'cmd-resize-pane.c') diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c index f7928803..30fbc76a 100644 --- a/cmd-resize-pane.c +++ b/cmd-resize-pane.c @@ -31,22 +31,22 @@ int cmd_resize_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_resize_pane_entry = { "resize-pane", "resizep", - CMD_PANE_WINDOW_USAGE "[-DU] [adjustment]", + "[-DU] " CMD_TARGET_PANE_USAGE " [adjustment]", CMD_ARG01, CMD_CHFLAG('D')|CMD_CHFLAG('L')|CMD_CHFLAG('R')|CMD_CHFLAG('U'), cmd_resize_pane_init, - cmd_pane_parse, + cmd_target_parse, cmd_resize_pane_exec, - cmd_pane_free, - cmd_pane_print + cmd_target_free, + cmd_target_print }; void cmd_resize_pane_init(struct cmd *self, int key) { - struct cmd_pane_data *data; + struct cmd_target_data *data; - cmd_pane_init(self, key); + cmd_target_init(self, key); data = self->data; if (key == (KEYC_UP | KEYC_CTRL)) @@ -79,23 +79,14 @@ cmd_resize_pane_init(struct cmd *self, int key) int cmd_resize_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; const char *errstr; struct window_pane *wp; u_int adjust; - 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 (data->arg == NULL) adjust = 1; -- cgit v1.2.3