summaryrefslogtreecommitdiffstats
path: root/server-fn.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2013-03-24 09:54:10 +0000
committerNicholas Marriott <nicm@openbsd.org>2013-03-24 09:54:10 +0000
commit20636d956dd36c1f14152569a4d44a50eea9083d (patch)
treedbbbee5d7ce1e3b12c3067c305d07d2d98e39900 /server-fn.c
parent66edb3392b234ccd9a940039936edb34258c2102 (diff)
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 'server-fn.c')
-rw-r--r--server-fn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/server-fn.c b/server-fn.c
index 6d66a9f0..b9217ef2 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -194,7 +194,7 @@ server_status_window(struct window *w)
/*
* This is slightly different. We want to redraw the status line of any
- * clients containing this window rather than any where it is the
+ * clients containing this window rather than anywhere it is the
* current window.
*/
@@ -563,7 +563,7 @@ int
server_set_stdin_callback(struct client *c, void (*cb)(struct client *, int,
void *), void *cb_data, char **cause)
{
- if (c == NULL) {
+ if (c == NULL || c->session != NULL) {
*cause = xstrdup("no client with stdin");
return (-1);
}