mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Instead of every command resolving the target (-t or -s) itself, prepare
the state (client, session, winlink, pane) for it it before entering the command. Each command provides some flags that tell the prepare step what it is expecting. This is a requirement for having hooks on commands (for example, if you hook "select-window -t1:2", the hook command should to operate on window 1:2 not whatever it thinks is the current window), and should allow some other target improvements. The old cmd_find_* functions remain for the moment but that layer will be dropped later. Joint work with Thomas Adam.
This commit is contained in:
		@@ -32,7 +32,7 @@ const struct cmd_entry cmd_rename_session_entry = {
 | 
			
		||||
	"rename-session", "rename",
 | 
			
		||||
	"t:", 1, 1,
 | 
			
		||||
	CMD_TARGET_SESSION_USAGE " new-name",
 | 
			
		||||
	0,
 | 
			
		||||
	CMD_SESSION_T,
 | 
			
		||||
	cmd_rename_session_exec
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@@ -40,7 +40,7 @@ enum cmd_retval
 | 
			
		||||
cmd_rename_session_exec(struct cmd *self, struct cmd_q *cmdq)
 | 
			
		||||
{
 | 
			
		||||
	struct args	*args = self->args;
 | 
			
		||||
	struct session	*s;
 | 
			
		||||
	struct session	*s = cmdq->state.tflag.s;
 | 
			
		||||
	const char	*newname;
 | 
			
		||||
 | 
			
		||||
	newname = args->argv[0];
 | 
			
		||||
@@ -53,9 +53,6 @@ cmd_rename_session_exec(struct cmd *self, struct cmd_q *cmdq)
 | 
			
		||||
		return (CMD_RETURN_ERROR);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
 | 
			
		||||
		return (CMD_RETURN_ERROR);
 | 
			
		||||
 | 
			
		||||
	RB_REMOVE(sessions, &sessions, s);
 | 
			
		||||
	free(s->name);
 | 
			
		||||
	s->name = xstrdup(newname);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user