mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-03 16:46:18 +00:00 
			
		
		
		
	Allow panes to be empty (no command), output can be piped to them with
split-window or display-message -I.
This commit is contained in:
		@@ -40,9 +40,10 @@ const struct cmd_entry cmd_split_window_entry = {
 | 
			
		||||
	.name = "split-window",
 | 
			
		||||
	.alias = "splitw",
 | 
			
		||||
 | 
			
		||||
	.args = { "bc:de:fF:l:hp:Pt:v", 0, -1 },
 | 
			
		||||
	.usage = "[-bdefhvP] [-c start-directory] [-e environment] [-F format] "
 | 
			
		||||
		 "[-p percentage|-l size] " CMD_TARGET_PANE_USAGE " [command]",
 | 
			
		||||
	.args = { "bc:de:fF:hIl:p:Pt:v", 0, -1 },
 | 
			
		||||
	.usage = "[-bdefhIPv] [-c start-directory] [-e environment] "
 | 
			
		||||
		 "[-F format] [-p percentage|-l size] " CMD_TARGET_PANE_USAGE
 | 
			
		||||
		 " [command]",
 | 
			
		||||
 | 
			
		||||
	.target = { 't', CMD_FIND_PANE, 0 },
 | 
			
		||||
 | 
			
		||||
@@ -63,7 +64,7 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 | 
			
		||||
	enum layout_type	 type;
 | 
			
		||||
	struct layout_cell	*lc;
 | 
			
		||||
	struct cmd_find_state	 fs;
 | 
			
		||||
	int			 size, percentage, flags;
 | 
			
		||||
	int			 size, percentage, flags, input;
 | 
			
		||||
	const char		*template, *add;
 | 
			
		||||
	char			*cause, *cp;
 | 
			
		||||
	struct args_value	*value;
 | 
			
		||||
@@ -94,12 +95,15 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 | 
			
		||||
		size = -1;
 | 
			
		||||
 | 
			
		||||
	server_unzoom_window(wp->window);
 | 
			
		||||
	input = (args_has(args, 'I') && args->argc == 0);
 | 
			
		||||
 | 
			
		||||
	flags = 0;
 | 
			
		||||
	if (args_has(args, 'b'))
 | 
			
		||||
		flags |= SPAWN_BEFORE;
 | 
			
		||||
	if (args_has(args, 'f'))
 | 
			
		||||
		flags |= SPAWN_FULLSIZE;
 | 
			
		||||
	if (input || (args->argc == 1 && *args->argv[0] == '\0'))
 | 
			
		||||
		flags |= SPAWN_EMPTY;
 | 
			
		||||
 | 
			
		||||
	lc = layout_split_pane(wp, type, size, flags);
 | 
			
		||||
	if (lc == NULL) {
 | 
			
		||||
@@ -134,10 +138,18 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 | 
			
		||||
		sc.flags |= SPAWN_DETACHED;
 | 
			
		||||
 | 
			
		||||
	if ((new_wp = spawn_pane(&sc, &cause)) == NULL) {
 | 
			
		||||
		layout_close_pane(new_wp);
 | 
			
		||||
		cmdq_error(item, "create pane failed: %s", cause);
 | 
			
		||||
		free(cause);
 | 
			
		||||
		return (CMD_RETURN_ERROR);
 | 
			
		||||
	}
 | 
			
		||||
	if (input && window_pane_start_input(new_wp, item, &cause) != 0) {
 | 
			
		||||
		layout_close_pane(new_wp);
 | 
			
		||||
		window_remove_pane(wp->window, new_wp);
 | 
			
		||||
		cmdq_error(item, "%s", cause);
 | 
			
		||||
		free(cause);
 | 
			
		||||
		return (CMD_RETURN_ERROR);
 | 
			
		||||
	}
 | 
			
		||||
	if (!args_has(args, 'd'))
 | 
			
		||||
		cmd_find_from_winlink_pane(current, wl, new_wp, 0);
 | 
			
		||||
	server_redraw_window(wp->window);
 | 
			
		||||
@@ -155,5 +167,7 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 | 
			
		||||
	cmdq_insert_hook(s, item, &fs, "after-split-window");
 | 
			
		||||
 | 
			
		||||
	environ_free(sc.environ);
 | 
			
		||||
	if (input)
 | 
			
		||||
		return (CMD_RETURN_WAIT);
 | 
			
		||||
	return (CMD_RETURN_NORMAL);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user