diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2011-01-01 01:33:07 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2011-01-01 01:33:07 +0000 |
commit | b6950ed8aa4487f0c1a45cbf202a97d9fa22d485 (patch) | |
tree | 2af9b1768a0bf061340f130025806f6e83f231a3 /cmd-split-window.c | |
parent | 04b32fa734d491e7ae9b915dc309858310d96185 (diff) |
Add a -P option to new-window and split-window to print the new window
or pane index in target form (useful to pass it into other commands).
Diffstat (limited to 'cmd-split-window.c')
-rw-r--r-- | cmd-split-window.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/cmd-split-window.c b/cmd-split-window.c index e4f46c34..e9a6eb4e 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -39,13 +39,14 @@ struct cmd_split_window_data { char *cmd; int flag_detached; int flag_horizontal; + int flag_print; int percentage; int size; }; const struct cmd_entry cmd_split_window_entry = { "split-window", "splitw", - "[-dhv] [-p percentage|-l size] [-t target-pane] [command]", + "[-dhvP] [-p percentage|-l size] [-t target-pane] [command]", 0, "", cmd_split_window_init, cmd_split_window_parse, @@ -64,6 +65,7 @@ cmd_split_window_init(struct cmd *self, int key) data->cmd = NULL; data->flag_detached = 0; data->flag_horizontal = 0; + data->flag_print = 0; data->percentage = -1; data->size = -1; @@ -87,7 +89,7 @@ cmd_split_window_parse(struct cmd *self, int argc, char **argv, char **cause) self->entry->init(self, KEYC_NONE); data = self->data; - while ((opt = getopt(argc, argv, "dhl:p:t:v")) != -1) { + while ((opt = getopt(argc, argv, "dhl:p:Pt:v")) != -1) { switch (opt) { case 'd': data->flag_detached = 1; @@ -117,6 +119,9 @@ cmd_split_window_parse(struct cmd *self, int argc, char **argv, char **cause) goto error; } break; + case 'P': + data->flag_print = 1; + break; case 'v': data->flag_horizontal = 0; break; @@ -153,7 +158,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx) struct environ env; char *cmd, *cwd, *cause; const char *shell; - u_int hlimit; + u_int hlimit, paneidx; int size; enum layout_type type; struct layout_cell *lc; @@ -217,6 +222,11 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx) server_status_session(s); environ_free(&env); + + if (data->flag_print) { + paneidx = window_pane_index(wl->window, new_wp); + ctx->print(ctx, "%s:%u.%u", s->name, wl->idx, paneidx); + } return (0); error: @@ -253,6 +263,8 @@ cmd_split_window_print(struct cmd *self, char *buf, size_t len) off += xsnprintf(buf + off, len - off, " -d"); if (off < len && data->flag_horizontal) off += xsnprintf(buf + off, len - off, " -h"); + if (off < len && data->flag_print) + off += xsnprintf(buf + off, len - off, " -P"); if (off < len && data->size > 0) off += xsnprintf(buf + off, len - off, " -l %d", data->size); if (off < len && data->percentage > 0) { |