===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-fn.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- src/usr.bin/tmux/server-fn.c	2009/10/04 10:55:30	1.24
+++ src/usr.bin/tmux/server-fn.c	2009/10/10 10:02:48	1.25
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-fn.c,v 1.24 2009/10/04 10:55:30 nicm Exp $ */
+/* $OpenBSD: server-fn.c,v 1.25 2009/10/10 10:02:48 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -105,6 +105,19 @@
 }
 
 void
+server_redraw_session_group(struct session *s)
+{
+	struct session_group	*sg;
+
+	if ((sg = session_group_find(s)) == NULL)
+		server_redraw_session(s);
+	else {
+		TAILQ_FOREACH(s, &sg->sessions, gentry)
+			server_redraw_session(s);
+	}
+}
+
+void
 server_status_session(struct session *s)
 {
 	struct client	*c;
@@ -120,6 +133,19 @@
 }
 
 void
+server_status_session_group(struct session *s)
+{
+	struct session_group	*sg;
+
+	if ((sg = session_group_find(s)) == NULL)
+		server_status_session(s);
+	else {
+		TAILQ_FOREACH(s, &sg->sessions, gentry)
+			server_status_session(s);
+	}
+}
+
+void
 server_redraw_window(struct window *w)
 {
 	struct client	*c;
@@ -220,19 +246,28 @@
 			continue;
 		
 		if (session_detach(s, wl))
-			server_destroy_session(s);
-		else
+			server_destroy_session_group(s);
+		else {
 			server_redraw_session(s);
+			server_status_session_group(s);
+		}
 	}
 }
 
 int
-server_link_window(
-    struct winlink *srcwl, struct session *dst, int dstidx,
-    int killflag, int selectflag, char **cause)
+server_link_window(struct session *src, struct winlink *srcwl,
+    struct session *dst, int dstidx, int killflag, int selectflag, char **cause)
 {
-	struct winlink	*dstwl;
+	struct winlink		*dstwl;
+	struct session_group	*srcsg, *dstsg;
 
+	srcsg = session_group_find(src);
+	dstsg = session_group_find(dst);
+	if (src != dst && srcsg != NULL && dstsg != NULL && srcsg == dstsg) {
+		xasprintf(cause, "sessions are grouped");
+		return (-1);
+	}
+
 	dstwl = NULL;
 	if (dstidx != -1)
 		dstwl = winlink_find_by_index(&dst->windows, dstidx);
@@ -260,12 +295,9 @@
 	if (dstwl == NULL)
 		return (-1);
 
-	if (!selectflag)
-		server_status_session(dst);
-	else {
+	if (selectflag)
 		session_select(dst, dstwl->idx);
-		server_redraw_session(dst);
-	}
+	server_redraw_session_group(dst);
 
 	return (0);
 }
@@ -274,9 +306,24 @@
 server_unlink_window(struct session *s, struct winlink *wl)
 {
 	if (session_detach(s, wl))
-		server_destroy_session(s);
+		server_destroy_session_group(s);
 	else
-		server_redraw_session(s);
+		server_redraw_session_group(s);
+}
+
+void
+server_destroy_session_group(struct session *s)
+{
+	struct session_group	*sg;
+
+	if ((sg = session_group_find(s)) == NULL)
+		server_destroy_session(s);
+	else {
+		TAILQ_FOREACH(s, &sg->sessions, gentry)
+			server_destroy_session(s);
+		TAILQ_REMOVE(&session_groups, sg, entry);
+		xfree(sg);
+	}
 }
 
 void