mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	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.
This commit is contained in:
		@@ -30,39 +30,30 @@ int	cmd_break_pane_exec(struct cmd *, struct cmd_ctx *);
 | 
			
		||||
 | 
			
		||||
const struct cmd_entry cmd_break_pane_entry = {
 | 
			
		||||
	"break-pane", "breakp",
 | 
			
		||||
	CMD_PANE_WINDOW_USAGE " [-d]",
 | 
			
		||||
	CMD_TARGET_PANE_USAGE " [-d]",
 | 
			
		||||
	0, CMD_CHFLAG('d'),
 | 
			
		||||
	cmd_pane_init,
 | 
			
		||||
	cmd_pane_parse,
 | 
			
		||||
	cmd_target_init,
 | 
			
		||||
	cmd_target_parse,
 | 
			
		||||
	cmd_break_pane_exec,
 | 
			
		||||
	cmd_pane_free,
 | 
			
		||||
	cmd_pane_print
 | 
			
		||||
	cmd_target_free,
 | 
			
		||||
	cmd_target_print
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
int
 | 
			
		||||
cmd_break_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;
 | 
			
		||||
	struct session		*s;
 | 
			
		||||
	struct window_pane	*wp;
 | 
			
		||||
	struct window		*w;
 | 
			
		||||
	char			*cause;
 | 
			
		||||
 | 
			
		||||
	if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL)
 | 
			
		||||
	if ((wl = cmd_find_pane(ctx, data->target, &s, &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 (window_count_panes(wl->window) == 1) {
 | 
			
		||||
		ctx->error(ctx, "can't break pane: %d", data->pane);
 | 
			
		||||
		ctx->error(ctx, "can't break with only one pane");
 | 
			
		||||
		return (-1);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user