mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Add a command queue to standardize and simplify commands that call other
commands and allow a command to block execution of subsequent commands. This allows run-shell and if-shell to be synchronous which has been much requested. Each client has a default command queue and commands are consumed one at a time from it. A command may suspend execution from the queue by returning CMD_RETURN_WAIT and then resume it by calling cmd_continue() - for example run-shell does this from the callback that is fired after the job is freed. When the command queue becomes empty, command clients are automatically exited (unless attaching). A callback is also fired - this is used for nested commands in, for example, if-shell which can block execution of the client's cmdq until a new cmdq becomes empty. Also merge all the old error/info/print functions together and lose the old curclient/cmdclient distinction - a cmdq is bound to one client (or none if in the configuration file), this is a command client if c->session is NULL otherwise an attached client.
This commit is contained in:
		@@ -27,11 +27,11 @@
 | 
			
		||||
 * List windows on given session.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
enum cmd_retval	 cmd_list_windows_exec(struct cmd *, struct cmd_ctx *);
 | 
			
		||||
enum cmd_retval	 cmd_list_windows_exec(struct cmd *, struct cmd_q *);
 | 
			
		||||
 | 
			
		||||
void	cmd_list_windows_server(struct cmd *, struct cmd_ctx *);
 | 
			
		||||
void	cmd_list_windows_server(struct cmd *, struct cmd_q *);
 | 
			
		||||
void	cmd_list_windows_session(
 | 
			
		||||
	    struct cmd *, struct session *, struct cmd_ctx *, int);
 | 
			
		||||
	    struct cmd *, struct session *, struct cmd_q *, int);
 | 
			
		||||
 | 
			
		||||
const struct cmd_entry cmd_list_windows_entry = {
 | 
			
		||||
	"list-windows", "lsw",
 | 
			
		||||
@@ -44,35 +44,35 @@ const struct cmd_entry cmd_list_windows_entry = {
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
enum cmd_retval
 | 
			
		||||
cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx)
 | 
			
		||||
cmd_list_windows_exec(struct cmd *self, struct cmd_q *cmdq)
 | 
			
		||||
{
 | 
			
		||||
	struct args	*args = self->args;
 | 
			
		||||
	struct session	*s;
 | 
			
		||||
 | 
			
		||||
	if (args_has(args, 'a'))
 | 
			
		||||
		cmd_list_windows_server(self, ctx);
 | 
			
		||||
		cmd_list_windows_server(self, cmdq);
 | 
			
		||||
	else {
 | 
			
		||||
		s = cmd_find_session(ctx, args_get(args, 't'), 0);
 | 
			
		||||
		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
 | 
			
		||||
		if (s == NULL)
 | 
			
		||||
			return (CMD_RETURN_ERROR);
 | 
			
		||||
		cmd_list_windows_session(self, s, ctx, 0);
 | 
			
		||||
		cmd_list_windows_session(self, s, cmdq, 0);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return (CMD_RETURN_NORMAL);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
cmd_list_windows_server(struct cmd *self, struct cmd_ctx *ctx)
 | 
			
		||||
cmd_list_windows_server(struct cmd *self, struct cmd_q *cmdq)
 | 
			
		||||
{
 | 
			
		||||
	struct session	*s;
 | 
			
		||||
 | 
			
		||||
	RB_FOREACH(s, sessions, &sessions)
 | 
			
		||||
		cmd_list_windows_session(self, s, ctx, 1);
 | 
			
		||||
		cmd_list_windows_session(self, s, cmdq, 1);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
cmd_list_windows_session(
 | 
			
		||||
    struct cmd *self, struct session *s, struct cmd_ctx *ctx, int type)
 | 
			
		||||
    struct cmd *self, struct session *s, struct cmd_q *cmdq, int type)
 | 
			
		||||
{
 | 
			
		||||
	struct args		*args = self->args;
 | 
			
		||||
	struct winlink		*wl;
 | 
			
		||||
@@ -102,7 +102,7 @@ cmd_list_windows_session(
 | 
			
		||||
		format_window_pane(ft, wl->window->active);
 | 
			
		||||
 | 
			
		||||
		line = format_expand(ft, template);
 | 
			
		||||
		ctx->print(ctx, "%s", line);
 | 
			
		||||
		cmdq_print(cmdq, "%s", line);
 | 
			
		||||
		free(line);
 | 
			
		||||
 | 
			
		||||
		format_free(ft);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user