circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/35/merge
Thomas Adam 2015-06-17 22:01:13 +01:00
parent 21a2ccc5f1 85120b37ea
commit 86018a3947
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd-break-pane.c
View File

@ -32,8 +32,8 @@ enum cmd_retval cmd_break_pane_exec(struct cmd *, struct cmd_q *);
const struct cmd_entry cmd_break_pane_entry = { const struct cmd_entry cmd_break_pane_entry = {
"break-pane", "breakp", "break-pane", "breakp",
"dPF:t:", 0, 0, "dPF:s:t:", 0, 0,
"[-dP] [-F format] " CMD_TARGET_PANE_USAGE, "[-dP] [-F format] " CMD_SRCDST_PANE_USAGE,
0, 0,
cmd_break_pane_exec cmd_break_pane_exec
}; };
@ -48,13 +48,19 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_q *cmdq)
struct window *w; struct window *w;
char *name; char *name;
char *cause; char *cause;
int base_idx; int idx;
struct format_tree *ft; struct format_tree *ft;
const char *template; const char *template;
char *cp; char *cp;
if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp)) == NULL) if ((wl = cmd_find_pane(cmdq, args_get(args, 's'), &s, &wp)) == NULL)
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
if ((idx = cmd_find_index(cmdq, args_get(args, 't'), &s)) == -2)
return (CMD_RETURN_ERROR);
if (idx != -1 && winlink_find_by_index(&s->windows, idx) != NULL) {
cmdq_error(cmdq, "index %d already in use", idx);
return (CMD_RETURN_ERROR);
}
if (window_count_panes(wl->window) == 1) { if (window_count_panes(wl->window) == 1) {
cmdq_error(cmdq, "can't break with only one pane"); cmdq_error(cmdq, "can't break with only one pane");
@ -76,8 +82,9 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_q *cmdq)
free(name); free(name);
layout_init(w, wp); layout_init(w, wp);
base_idx = options_get_number(&s->options, "base-index"); if (idx == -1)
wl = session_attach(s, w, -1 - base_idx, &cause); /* can't fail */ idx = -1 - options_get_number(&s->options, "base-index");
wl = session_attach(s, w, idx, &cause); /* can't fail */
if (!args_has(self->args, 'd')) if (!args_has(self->args, 'd'))
session_select(s, wl->idx); session_select(s, wl->idx);

8
tmux.1
View File

@ -1237,12 +1237,14 @@ Commands related to windows and panes are as follows:
.It Xo Ic break-pane .It Xo Ic break-pane
.Op Fl dP .Op Fl dP
.Op Fl F Ar format .Op Fl F Ar format
.Op Fl t Ar target-pane .Op Fl s Ar src-pane
.Op Fl t Ar dst-pane
.Xc .Xc
.D1 (alias: Ic breakp ) .D1 (alias: Ic breakp )
Break Break
.Ar target-pane .Ar src-pane
off from its containing window to make it the only pane in a new window. off from its containing window to make it the only pane in
.Ar dst-window .
If If
.Fl d .Fl d
is given, the new window does not become the current window. is given, the new window does not become the current window.