Improve join-pane, move-pane and break-pane:

- There is no need for join-pane and move-pane to be different.
- break-pane can just behave like move-window if the source has only one
  pane, instead of failing.
- Add -a to break-pane like move-window.

Also add missing man page bits for previous window-tree.c changes.

GitHub issue 2176.

1 files changed, 22 insertions, 8 deletions

diff --git a/usr.bin/tmux/cmd-break-pane.c b/usr.bin/tmux/cmd-break-pane.c
index 3aea48411af..e0b1ad89b59 100644
--- a/usr.bin/tmux/cmd-break-pane.c
+++ b/usr.bin/tmux/cmd-break-pane.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-break-pane.c,v 1.55 2020/04/13 20:51:57 nicm Exp $ */
+/* $OpenBSD: cmd-break-pane.c,v 1.56 2020/04/22 21:15:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -34,8 +34,8 @@ const struct cmd_entry cmd_break_pane_entry = {
 	.name = "break-pane",
 	.alias = "breakp",
 
-	.args = { "dPF:n:s:t:", 0, 0 },
-	.usage = "[-dP] [-F format] [-n window-name] [-s src-pane] "
+	.args = { "adPF:n:s:t:", 0, 0 },
+	.usage = "[-adP] [-F format] [-n window-name] [-s src-pane] "
 		 "[-t dst-window]",
 
 	.source = { 's', CMD_FIND_PANE, 0 },
@@ -63,16 +63,30 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
 	const char		*template;
 	char			*cp;
 
-	if (idx != -1 && winlink_find_by_index(&dst_s->windows, idx) != NULL) {
-		cmdq_error(item, "index %d already in use", idx);
-		return (CMD_RETURN_ERROR);
+	if (args_has(args, 'a')) {
+		if (target->wl != NULL)
+			idx = winlink_shuffle_up(dst_s, target->wl);
+		else
+			idx = winlink_shuffle_up(dst_s, dst_s->curw);
+		if (idx == -1)
+			return (CMD_RETURN_ERROR);
 	}
+	server_unzoom_window(w);
 
 	if (window_count_panes(w) == 1) {
-		cmdq_error(item, "can't break with only one pane");
+		if (server_link_window(src_s, wl, dst_s, idx, 0,
+		    !args_has(args, 'd'), &cause) != 0) {
+			cmdq_error(item, "%s", cause);
+			free(cause);
+			return (CMD_RETURN_ERROR);
+		}
+		server_unlink_window(src_s, wl);
+		return (CMD_RETURN_NORMAL);
+	}
+	if (idx != -1 && winlink_find_by_index(&dst_s->windows, idx) != NULL) {
+		cmdq_error(item, "index in use: %d", idx);
 		return (CMD_RETURN_ERROR);
 	}
-	server_unzoom_window(w);
 
 	TAILQ_REMOVE(&w->panes, wp, entry);
 	window_lost_pane(w, wp);