diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2012-03-18 01:38:27 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2012-03-18 01:38:27 +0000 |
| commit | 3893cc17a4797ce06346244ea57ec16793259ea9 (patch) | |
| tree | ec73b3cd661cbaa3a7f370fc1a928d1c4d674c3a | |
| parent | 4d1c513968a403d7c89fb93204d2f41f474c1da2 (diff) | |
| download | rtmux-3893cc17a4797ce06346244ea57ec16793259ea9.tar.gz rtmux-3893cc17a4797ce06346244ea57ec16793259ea9.tar.bz2 rtmux-3893cc17a4797ce06346244ea57ec16793259ea9.zip | |
Sync OpenBSD patchset 1049:
Add -P/-F flags to break-pane too, from George Nachman.
| -rw-r--r-- | cmd-break-pane.c | 25 | ||||
| -rw-r--r-- | tmux.1 | 10 |
2 files changed, 32 insertions, 3 deletions
diff --git a/cmd-break-pane.c b/cmd-break-pane.c index aabc0f1c..9d3cbbf9 100644 --- a/cmd-break-pane.c +++ b/cmd-break-pane.c @@ -30,8 +30,8 @@ int cmd_break_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_break_pane_entry = { "break-pane", "breakp", - "dt:", 0, 0, - "[-d] " CMD_TARGET_PANE_USAGE, + "dPF:t:", 0, 0, + "[-dP] [-F format] " CMD_TARGET_PANE_USAGE, 0, NULL, NULL, @@ -49,6 +49,10 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_ctx *ctx) char *name; char *cause; int base_idx; + struct client *c; + struct format_tree *ft; + const char *template; + char *cp; if ((wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp)) == NULL) return (-1); @@ -88,5 +92,22 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_ctx *ctx) server_redraw_session(s); server_status_session_group(s); + if (args_has(args, 'P')) { + template = "#{session_name}:#{window_index}"; + if (args_has(args, 'F')) + template = args_get(args, 'F'); + ft = format_create(); + if ((c = cmd_find_client(ctx, NULL)) != NULL) + format_client(ft, c); + format_session(ft, s); + format_winlink(ft, s, wl); + format_window_pane(ft, wp); + + cp = format_expand(ft, template); + ctx->print(ctx, "%s", cp); + xfree(cp); + + format_free(ft); + } return (0); } @@ -1000,7 +1000,8 @@ from which the layout was originally defined. Commands related to windows and panes are as follows: .Bl -tag -width Ds .It Xo Ic break-pane -.Op Fl d +.Op Fl dP +.Op Fl F Ar format .Op Fl t Ar target-pane .Xc .D1 (alias: Ic breakp ) @@ -1010,6 +1011,13 @@ off from its containing window to make it the only pane in a new window. If .Fl d is given, the new window does not become the current window. +The +.Fl P +option prints information about the new window after it has been created. +By default, it uses the format +.Ql #{session_name}:#{window_index} +but a different format may be specified with +.Fl F . .It Xo Ic capture-pane .Op Fl b Ar buffer-index .Op Fl E Ar end-line |