===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-windows.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/usr.bin/tmux/cmd-list-windows.c	2011/01/04 00:42:46	1.11
+++ src/usr.bin/tmux/cmd-list-windows.c	2011/03/28 23:13:00	1.12
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-list-windows.c,v 1.11 2011/01/04 00:42:46 nicm Exp $ */
+/* $OpenBSD: cmd-list-windows.c,v 1.12 2011/03/28 23:13:00 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -28,10 +28,13 @@
 
 int	cmd_list_windows_exec(struct cmd *, struct cmd_ctx *);
 
+void	cmd_list_windows_server(struct cmd_ctx *);
+void	cmd_list_windows_session(struct session *, struct cmd_ctx *);
+
 const struct cmd_entry cmd_list_windows_entry = {
 	"list-windows", "lsw",
-	"t:", 0, 0,
-	CMD_TARGET_SESSION_USAGE,
+	"at:", 0, 0,
+	"[-a] " CMD_TARGET_SESSION_USAGE,
 	0,
 	NULL,
 	NULL,
@@ -43,12 +46,34 @@
 {
 	struct args	*args = self->args;
 	struct session	*s;
+
+	if (args_has(args, 'a'))
+		cmd_list_windows_server(ctx);
+	else {
+		s = cmd_find_session(ctx, args_get(args, 't'));
+		if (s == NULL)
+			return (-1);
+		cmd_list_windows_session(s, ctx);
+	}
+
+	return (0);
+}
+
+void
+cmd_list_windows_server(struct cmd_ctx *ctx)
+{
+	struct session	*s;
+
+	RB_FOREACH(s, sessions, &sessions)
+		cmd_list_windows_session(s, ctx);
+}
+
+void
+cmd_list_windows_session(struct session *s, struct cmd_ctx *ctx)
+{
 	struct winlink	*wl;
 	char		*layout;
 
-	if ((s = cmd_find_session(ctx, args_get(args, 't'))) == NULL)
-		return (-1);
-
 	RB_FOREACH(wl, winlinks, &s->windows) {
 		layout = layout_dump(wl->window);
 		ctx->print(ctx, "%d: %s [%ux%u] [layout %s]%s",
@@ -56,6 +81,4 @@
 		    layout, wl == s->curw ? " (active)" : "");
 		xfree(layout);
 	}
-
-	return (0);
 }