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.

1 files changed, 21 insertions, 21 deletions

diff --git a/cmd-show-options.c b/cmd-show-options.c
index b42c65cb..9b42ed46 100644
--- a/cmd-show-options.c
+++ b/cmd-show-options.c
@@ -27,11 +27,11 @@
  * Show options.
  */
 
-enum cmd_retval	 cmd_show_options_exec(struct cmd *, struct cmd_ctx *);
+enum cmd_retval	 cmd_show_options_exec(struct cmd *, struct cmd_q *);
 
-enum cmd_retval	cmd_show_options_one(struct cmd *, struct cmd_ctx *,
+enum cmd_retval	cmd_show_options_one(struct cmd *, struct cmd_q *,
 		    struct options *);
-enum cmd_retval cmd_show_options_all(struct cmd *, struct cmd_ctx *,
+enum cmd_retval cmd_show_options_all(struct cmd *, struct cmd_q *,
 		    const struct options_table_entry *, struct options *);
 
 const struct cmd_entry cmd_show_options_entry = {
@@ -55,7 +55,7 @@ const struct cmd_entry cmd_show_window_options_entry = {
 };
 
 enum cmd_retval
-cmd_show_options_exec(struct cmd *self, struct cmd_ctx *ctx)
+cmd_show_options_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args				*args = self->args;
 	struct session				*s;
@@ -72,7 +72,7 @@ cmd_show_options_exec(struct cmd *self, struct cmd_ctx *ctx)
 		if (args_has(self->args, 'g'))
 			oo = &global_w_options;
 		else {
-			wl = cmd_find_window(ctx, args_get(args, 't'), NULL);
+			wl = cmd_find_window(cmdq, args_get(args, 't'), NULL);
 			if (wl == NULL)
 				return (CMD_RETURN_ERROR);
 			oo = &wl->window->options;
@@ -82,7 +82,7 @@ cmd_show_options_exec(struct cmd *self, struct cmd_ctx *ctx)
 		if (args_has(self->args, 'g'))
 			oo = &global_s_options;
 		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);
 			oo = &s->options;
@@ -90,13 +90,13 @@ cmd_show_options_exec(struct cmd *self, struct cmd_ctx *ctx)
 	}
 
 	if (args->argc != 0)
-		return (cmd_show_options_one(self, ctx, oo));
+		return (cmd_show_options_one(self, cmdq, oo));
 	else
-		return (cmd_show_options_all(self, ctx, table, oo));
+		return (cmd_show_options_all(self, cmdq, table, oo));
 }
 
 enum cmd_retval
-cmd_show_options_one(struct cmd *self, struct cmd_ctx *ctx,
+cmd_show_options_one(struct cmd *self, struct cmd_q *cmdq,
     struct options *oo)
 {
 	struct args				*args = self->args;
@@ -106,37 +106,37 @@ cmd_show_options_one(struct cmd *self, struct cmd_ctx *ctx,
 
 	if (*args->argv[0] == '@') {
 		if ((o = options_find1(oo, args->argv[0])) == NULL) {
-			ctx->error(ctx, "unknown option: %s", args->argv[0]);
+			cmdq_error(cmdq, "unknown option: %s", args->argv[0]);
 			return (CMD_RETURN_ERROR);
 		}
 		if (args_has(self->args, 'v'))
-			ctx->print(ctx, "%s", o->str);
+			cmdq_print(cmdq, "%s", o->str);
 		else
-			ctx->print(ctx, "%s \"%s\"", o->name, o->str);
+			cmdq_print(cmdq, "%s \"%s\"", o->name, o->str);
 		return (CMD_RETURN_NORMAL);
 	}
 
 	table = oe = NULL;
 	if (options_table_find(args->argv[0], &table, &oe) != 0) {
-		ctx->error(ctx, "ambiguous option: %s", args->argv[0]);
+		cmdq_error(cmdq, "ambiguous option: %s", args->argv[0]);
 		return (CMD_RETURN_ERROR);
 	}
 	if (oe == NULL) {
-		ctx->error(ctx, "unknown option: %s", args->argv[0]);
+		cmdq_error(cmdq, "unknown option: %s", args->argv[0]);
 		return (CMD_RETURN_ERROR);
 	}
 	if ((o = options_find1(oo, oe->name)) == NULL)
 		return (CMD_RETURN_NORMAL);
 	optval = options_table_print_entry(oe, o, args_has(self->args, 'v'));
 	if (args_has(self->args, 'v'))
-		ctx->print(ctx, "%s", optval);
+		cmdq_print(cmdq, "%s", optval);
 	else
-		ctx->print(ctx, "%s %s", oe->name, optval);
+		cmdq_print(cmdq, "%s %s", oe->name, optval);
 	return (CMD_RETURN_NORMAL);
 }
 
 enum cmd_retval
-cmd_show_options_all(struct cmd *self, struct cmd_ctx *ctx,
+cmd_show_options_all(struct cmd *self, struct cmd_q *cmdq,
     const struct options_table_entry *table, struct options *oo)
 {
 	const struct options_table_entry	*oe;
@@ -146,9 +146,9 @@ cmd_show_options_all(struct cmd *self, struct cmd_ctx *ctx,
 	RB_FOREACH(o, options_tree, &oo->tree) {
 		if (*o->name == '@') {
 			if (args_has(self->args, 'v'))
-				ctx->print(ctx, "%s", o->str);
+				cmdq_print(cmdq, "%s", o->str);
 			else
-				ctx->print(ctx, "%s \"%s\"", o->name, o->str);
+				cmdq_print(cmdq, "%s \"%s\"", o->name, o->str);
 		}
 	}
 
@@ -158,9 +158,9 @@ cmd_show_options_all(struct cmd *self, struct cmd_ctx *ctx,
 		optval = options_table_print_entry(oe, o,
 		    args_has(self->args, 'v'));
 		if (args_has(self->args, 'v'))
-			ctx->print(ctx, "%s", optval);
+			cmdq_print(cmdq, "%s", optval);
 		else
-			ctx->print(ctx, "%s %s", oe->name, optval);
+			cmdq_print(cmdq, "%s %s", oe->name, optval);
 	}
 
 	return (CMD_RETURN_NORMAL);