mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 09:26:05 +00:00 
			
		
		
		
	Add a -P option to new-window and split-window to print the new window
or pane index in target form (useful to pass it into other commands).
This commit is contained in:
		@@ -39,11 +39,12 @@ struct cmd_new_window_data {
 | 
			
		||||
	int	 flag_insert_after;
 | 
			
		||||
	int	 flag_detached;
 | 
			
		||||
	int	 flag_kill;
 | 
			
		||||
	int      flag_print;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const struct cmd_entry cmd_new_window_entry = {
 | 
			
		||||
	"new-window", "neww",
 | 
			
		||||
	"[-adk] [-n window-name] [-t target-window] [command]",
 | 
			
		||||
	"[-adkP] [-n window-name] [-t target-window] [command]",
 | 
			
		||||
	0, "",
 | 
			
		||||
	cmd_new_window_init,
 | 
			
		||||
	cmd_new_window_parse,
 | 
			
		||||
@@ -65,6 +66,7 @@ cmd_new_window_init(struct cmd *self, unused int arg)
 | 
			
		||||
	data->flag_insert_after = 0;
 | 
			
		||||
	data->flag_detached = 0;
 | 
			
		||||
	data->flag_kill = 0;
 | 
			
		||||
	data->flag_print = 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int
 | 
			
		||||
@@ -76,7 +78,7 @@ cmd_new_window_parse(struct cmd *self, int argc, char **argv, char **cause)
 | 
			
		||||
	self->entry->init(self, KEYC_NONE);
 | 
			
		||||
	data = self->data;
 | 
			
		||||
 | 
			
		||||
	while ((opt = getopt(argc, argv, "adkt:n:")) != -1) {
 | 
			
		||||
	while ((opt = getopt(argc, argv, "adkt:n:P")) != -1) {
 | 
			
		||||
		switch (opt) {
 | 
			
		||||
		case 'a':
 | 
			
		||||
			data->flag_insert_after = 1;
 | 
			
		||||
@@ -95,6 +97,9 @@ cmd_new_window_parse(struct cmd *self, int argc, char **argv, char **cause)
 | 
			
		||||
			if (data->name == NULL)
 | 
			
		||||
				data->name = xstrdup(optarg);
 | 
			
		||||
			break;
 | 
			
		||||
		case 'P':
 | 
			
		||||
			data->flag_print = 1;
 | 
			
		||||
			break;
 | 
			
		||||
		default:
 | 
			
		||||
			goto usage;
 | 
			
		||||
		}
 | 
			
		||||
@@ -198,6 +203,8 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 | 
			
		||||
	} else
 | 
			
		||||
		server_status_session_group(s);
 | 
			
		||||
 | 
			
		||||
	if (data->flag_print)
 | 
			
		||||
		ctx->print(ctx, "%s:%u", s->name, wl->idx);
 | 
			
		||||
	return (0);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -226,6 +233,8 @@ cmd_new_window_print(struct cmd *self, char *buf, size_t len)
 | 
			
		||||
		return (off);
 | 
			
		||||
	if (off < len && data->flag_detached)
 | 
			
		||||
		off += xsnprintf(buf + off, len - off, " -d");
 | 
			
		||||
	if (off < len && data->flag_print)
 | 
			
		||||
		off += xsnprintf(buf + off, len - off, " -P");
 | 
			
		||||
	if (off < len && data->target != NULL)
 | 
			
		||||
		off += cmd_prarg(buf + off, len - off, " -t ", data->target);
 | 
			
		||||
	if (off < len && data->name != NULL)
 | 
			
		||||
 
 | 
			
		||||
@@ -39,13 +39,14 @@ struct cmd_split_window_data {
 | 
			
		||||
	char	*cmd;
 | 
			
		||||
	int	 flag_detached;
 | 
			
		||||
	int	 flag_horizontal;
 | 
			
		||||
	int	 flag_print;
 | 
			
		||||
	int	 percentage;
 | 
			
		||||
	int	 size;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const struct cmd_entry cmd_split_window_entry = {
 | 
			
		||||
	"split-window", "splitw",
 | 
			
		||||
	"[-dhv] [-p percentage|-l size] [-t target-pane] [command]",
 | 
			
		||||
	"[-dhvP] [-p percentage|-l size] [-t target-pane] [command]",
 | 
			
		||||
	0, "",
 | 
			
		||||
	cmd_split_window_init,
 | 
			
		||||
	cmd_split_window_parse,
 | 
			
		||||
@@ -64,6 +65,7 @@ cmd_split_window_init(struct cmd *self, int key)
 | 
			
		||||
	data->cmd = NULL;
 | 
			
		||||
	data->flag_detached = 0;
 | 
			
		||||
	data->flag_horizontal = 0;
 | 
			
		||||
	data->flag_print = 0;
 | 
			
		||||
	data->percentage = -1;
 | 
			
		||||
	data->size = -1;
 | 
			
		||||
 | 
			
		||||
@@ -87,7 +89,7 @@ cmd_split_window_parse(struct cmd *self, int argc, char **argv, char **cause)
 | 
			
		||||
	self->entry->init(self, KEYC_NONE);
 | 
			
		||||
	data = self->data;
 | 
			
		||||
 | 
			
		||||
	while ((opt = getopt(argc, argv, "dhl:p:t:v")) != -1) {
 | 
			
		||||
	while ((opt = getopt(argc, argv, "dhl:p:Pt:v")) != -1) {
 | 
			
		||||
		switch (opt) {
 | 
			
		||||
		case 'd':
 | 
			
		||||
			data->flag_detached = 1;
 | 
			
		||||
@@ -117,6 +119,9 @@ cmd_split_window_parse(struct cmd *self, int argc, char **argv, char **cause)
 | 
			
		||||
				goto error;
 | 
			
		||||
			}
 | 
			
		||||
			break;
 | 
			
		||||
		case 'P':
 | 
			
		||||
			data->flag_print = 1;
 | 
			
		||||
			break;
 | 
			
		||||
		case 'v':
 | 
			
		||||
			data->flag_horizontal = 0;
 | 
			
		||||
			break;
 | 
			
		||||
@@ -153,7 +158,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 | 
			
		||||
	struct environ			 env;
 | 
			
		||||
	char		 		*cmd, *cwd, *cause;
 | 
			
		||||
	const char			*shell;
 | 
			
		||||
	u_int				 hlimit;
 | 
			
		||||
	u_int				 hlimit, paneidx;
 | 
			
		||||
	int				 size;
 | 
			
		||||
	enum layout_type		 type;
 | 
			
		||||
	struct layout_cell		*lc;
 | 
			
		||||
@@ -217,6 +222,11 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 | 
			
		||||
		server_status_session(s);
 | 
			
		||||
 | 
			
		||||
	environ_free(&env);
 | 
			
		||||
 | 
			
		||||
	if (data->flag_print) {
 | 
			
		||||
		paneidx = window_pane_index(wl->window, new_wp);
 | 
			
		||||
		ctx->print(ctx, "%s:%u.%u", s->name, wl->idx, paneidx);
 | 
			
		||||
	}
 | 
			
		||||
	return (0);
 | 
			
		||||
 | 
			
		||||
error:
 | 
			
		||||
@@ -253,6 +263,8 @@ cmd_split_window_print(struct cmd *self, char *buf, size_t len)
 | 
			
		||||
		off += xsnprintf(buf + off, len - off, " -d");
 | 
			
		||||
	if (off < len && data->flag_horizontal)
 | 
			
		||||
		off += xsnprintf(buf + off, len - off, " -h");
 | 
			
		||||
	if (off < len && data->flag_print)
 | 
			
		||||
		off += xsnprintf(buf + off, len - off, " -P");
 | 
			
		||||
	if (off < len && data->size > 0)
 | 
			
		||||
		off += xsnprintf(buf + off, len - off, " -l %d", data->size);
 | 
			
		||||
	if (off < len && data->percentage > 0) {
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								tmux.1
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								tmux.1
									
									
									
									
									
								
							@@ -1097,7 +1097,7 @@ except the window at
 | 
			
		||||
is moved to
 | 
			
		||||
.Ar dst-window .
 | 
			
		||||
.It Xo Ic new-window
 | 
			
		||||
.Op Fl adk
 | 
			
		||||
.Op Fl adkP
 | 
			
		||||
.Op Fl n Ar window-name
 | 
			
		||||
.Op Fl t Ar target-window
 | 
			
		||||
.Op Ar shell-command
 | 
			
		||||
@@ -1145,6 +1145,10 @@ New windows will automatically have
 | 
			
		||||
.Dq TERM=screen
 | 
			
		||||
added to their environment, but care must be taken not to reset this in shell
 | 
			
		||||
start-up files.
 | 
			
		||||
.Pp
 | 
			
		||||
The
 | 
			
		||||
.Fl P
 | 
			
		||||
option prints the location of the new window after it has been created.
 | 
			
		||||
.It Ic next-layout Op Fl t Ar target-window
 | 
			
		||||
.D1 (alias: Ic nextl )
 | 
			
		||||
Move a window to the next layout and rearrange the panes to fit.
 | 
			
		||||
@@ -1281,7 +1285,7 @@ target pane is used.
 | 
			
		||||
Select the window at
 | 
			
		||||
.Ar target-window .
 | 
			
		||||
.It Xo Ic split-window
 | 
			
		||||
.Op Fl dhv
 | 
			
		||||
.Op Fl dhvP
 | 
			
		||||
.Oo Fl l
 | 
			
		||||
.Ar size |
 | 
			
		||||
.Fl p Ar percentage Oc
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user