Tidy up new-session and attach-session and change them to work from inside

tmux, switching the current client to the new or requested session.

Written with Josh Elsasser.

1 files changed, 11 insertions, 1 deletions

diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index ba67dc05c81..70f423d7cf3 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.34 2009/07/17 07:05:58 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.35 2009/07/17 15:03:11 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -835,8 +835,18 @@ struct client_ctx {
 struct cmd_ctx {
 	struct client  *cmdclient;
 
+	/*
+	 * curclient is the client where this command was executed if inside
+	 * tmux. This is NULL if the command came from the command-line.
+	 *
+	 * cmdclient is the client which sent the MSG_COMMAND to the server, if
+	 * any. This is NULL unless the command came from the command-line.
+	 *
+	 * One of curclient or cmdclient is always NULL and the other not.
+	 */
 	struct client  *curclient;
 	struct session *cursession;
+
 	struct msg_command_data	*msgdata;
 
 	void		(*print)(struct cmd_ctx *, const char *, ...);