summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/cmd-new-session.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2016-10-16 17:55:15 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2016-10-16 17:55:15 +0000
commite642c0db3cd87ff0bbb46b1773a45d805b5a0f96 (patch)
tree6c5e61a462443375725c23c72bd64617a08d738b /usr.bin/tmux/cmd-new-session.c
parent31dcef6aecdf49dc9f5f9931fecbcb6a386f26e0 (diff)
Rewrite command queue handling. Each client still has a command queue,
but there is also now a global command queue. Instead of command queues being dispatched on demand from wherever the command happens to be added, they are now all dispatched from the top level server loop. Command queues may now also include callbacks as well as commands, and items may be inserted after the current command as well as at the end. This all makes command queues significantly more predictable and easier to use, and avoids the complex multiple nested command queues used by source-file, if-shell and friends. A mass rename of struct cmdq to a better name (cmdq_item probably) is coming.
Diffstat (limited to 'usr.bin/tmux/cmd-new-session.c')
-rw-r--r--usr.bin/tmux/cmd-new-session.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tmux/cmd-new-session.c b/usr.bin/tmux/cmd-new-session.c
index 3a6608b0c2b..30c89cdec3c 100644
--- a/usr.bin/tmux/cmd-new-session.c
+++ b/usr.bin/tmux/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-new-session.c,v 1.90 2016/10/13 22:48:51 nicm Exp $ */
+/* $OpenBSD: cmd-new-session.c,v 1.91 2016/10/16 17:55:14 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -312,14 +312,14 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
}
if (!detached)
- cmdq->client_exit = 0;
+ c->flags |= CLIENT_ATTACHED;
if (to_free != NULL)
free((void *)to_free);
cmd_find_from_session(&fs, s);
- if (hooks_wait(s->hooks, cmdq, &fs, "after-new-session") == 0)
- return (CMD_RETURN_WAIT);
+ hooks_insert(s->hooks, cmdq, &fs, "after-new-session");
+
return (CMD_RETURN_NORMAL);
error: