From 20636d956dd36c1f14152569a4d44a50eea9083d Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sun, 24 Mar 2013 09:54:10 +0000 Subject: 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. --- cmd-resize-pane.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cmd-resize-pane.c') diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c index dbcebbcf..f31e3258 100644 --- a/cmd-resize-pane.c +++ b/cmd-resize-pane.c @@ -27,7 +27,7 @@ */ void cmd_resize_pane_key_binding(struct cmd *, int); -enum cmd_retval cmd_resize_pane_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_resize_pane_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_resize_pane_entry = { "resize-pane", "resizep", @@ -82,7 +82,7 @@ cmd_resize_pane_key_binding(struct cmd *self, int key) } enum cmd_retval -cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx) +cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; struct winlink *wl; @@ -92,7 +92,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx) u_int adjust; int x, y; - if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL) + if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL) return (CMD_RETURN_ERROR); if (args->argc == 0) @@ -100,7 +100,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx) else { adjust = strtonum(args->argv[0], 1, INT_MAX, &errstr); if (errstr != NULL) { - ctx->error(ctx, "adjustment %s", errstr); + cmdq_error(cmdq, "adjustment %s", errstr); return (CMD_RETURN_ERROR); } } @@ -109,7 +109,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx) x = args_strtonum(self->args, 'x', PANE_MINIMUM, INT_MAX, &cause); if (cause != NULL) { - ctx->error(ctx, "width %s", cause); + cmdq_error(cmdq, "width %s", cause); free(cause); return (CMD_RETURN_ERROR); } @@ -119,7 +119,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx) y = args_strtonum(self->args, 'y', PANE_MINIMUM, INT_MAX, &cause); if (cause != NULL) { - ctx->error(ctx, "height %s", cause); + cmdq_error(cmdq, "height %s", cause); free(cause); return (CMD_RETURN_ERROR); } -- cgit v1.2.3