aboutsummaryrefslogtreecommitdiff
path: root/cmd-has-session.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-02-23 22:25:58 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-02-23 22:25:58 +0000
commit3964309c67a683e5132662e38b5ff932af5cbeea (patch)
treef8566b756787ef7ceeed61e63f61b2a0ece4c751 /cmd-has-session.c
parent357da035b9d052b4cba8db806c6237272ade6673 (diff)
downloadrtmux-3964309c67a683e5132662e38b5ff932af5cbeea.tar.gz
rtmux-3964309c67a683e5132662e38b5ff932af5cbeea.tar.bz2
rtmux-3964309c67a683e5132662e38b5ff932af5cbeea.zip
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.
Diffstat (limited to 'cmd-has-session.c')
-rw-r--r--cmd-has-session.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-has-session.c b/cmd-has-session.c
index 9f19c4db..c4286b86 100644
--- a/cmd-has-session.c
+++ b/cmd-has-session.c
@@ -24,7 +24,7 @@
* Cause client to report an error and exit with 1 if session doesn't exist.
*/
-enum cmd_retval cmd_has_session_exec(struct cmd *, struct cmd_ctx *);
+enum cmd_retval cmd_has_session_exec(struct cmd *, struct cmd_q *);
const struct cmd_entry cmd_has_session_entry = {
"has-session", "has",
@@ -37,11 +37,11 @@ const struct cmd_entry cmd_has_session_entry = {
};
enum cmd_retval
-cmd_has_session_exec(struct cmd *self, struct cmd_ctx *ctx)
+cmd_has_session_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
- if (cmd_find_session(ctx, args_get(args, 't'), 0) == NULL)
+ if (cmd_find_session(cmdq, args_get(args, 't'), 0) == NULL)
return (CMD_RETURN_ERROR);
return (CMD_RETURN_NORMAL);