From 457147d59d3e807309b7fdb2583d29278ae6acaa Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Mon, 11 Apr 2011 06:44:56 +0000
Subject: [PATCH] Add -s option to detach all clients attached to a session,
 from Zac Sprackett.

---
 cmd-detach-client.c | 32 +++++++++++++++++++++++++-------
 tmux.1              |  9 ++++++---
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/cmd-detach-client.c b/cmd-detach-client.c
index 6052a790..66ed67bb 100644
--- a/cmd-detach-client.c
+++ b/cmd-detach-client.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-detach-client.c,v 1.13 2011-03-19 23:27:35 tcunha Exp $ */
+/* $Id: cmd-detach-client.c,v 1.14 2011-04-11 06:44:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -28,7 +28,7 @@ int	cmd_detach_client_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_detach_client_entry = {
 	"detach-client", "detach",
-	"t:P", 0, 0,
+	"s:t:P", 0, 0,
 	"[-P] " CMD_TARGET_CLIENT_USAGE,
 	CMD_READONLY,
 	NULL,
@@ -41,14 +41,32 @@ cmd_detach_client_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct client	*c;
-
-	if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
-		return (-1);
+	struct session 	*s;
+	enum msgtype     msgtype;
+	u_int 		 i;
 
 	if (args_has(args, 'P'))
-		server_write_client(c, MSG_DETACHKILL, NULL, 0);
+		msgtype = MSG_DETACHKILL;
 	else
-		server_write_client(c, MSG_DETACH, NULL, 0);
+		msgtype = MSG_DETACH;
+
+	if (args_has(args, 's')) {
+		s = cmd_find_session(ctx, args_get(args, 's'), 0);
+		if (s == NULL)
+			return (-1);
+
+		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+			c = ARRAY_ITEM(&clients, i);
+			if (c != NULL && c->session == s)
+				server_write_client(c, msgtype, NULL, 0);
+		}
+	} else {
+		c = cmd_find_client(ctx, args_get(args, 't'));
+		if (c == NULL)
+			return (-1);
+
+		server_write_client(c, msgtype, NULL, 0);
+	}
 
 	return (0);
 }
diff --git a/tmux.1 b/tmux.1
index f9c3b6b4..4e96a6fe 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.303 2011-04-06 22:31:23 nicm Exp $
+.\" $Id: tmux.1,v 1.304 2011-04-11 06:44:56 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -580,10 +580,13 @@ session.
 .It Xo Ic detach-client
 .Op Fl P
 .Op Fl t Ar target-client
+.Op Fl s Ar target-session
 .Xc
 .D1 (alias: Ic detach )
-Detach the current client if bound to a key, or the specified client with
-.Fl t .
+Detach the current client if bound to a key, the client specified with
+.Fl t ,
+or all clients currently attached to to the session specified by
+.Fl s .
 If
 .Fl P
 is given, send SIGHUP to the parent process of the client, typically causing it