From 9a1b4f9ed3285d3b9b0e8d22b0bdb1a97df7e949 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Mon, 15 Nov 2010 06:52:11 +0000
Subject: [PATCH] Show more window and pane flags in list-* output, and put
 layout on the same line.

---
 cmd-list-panes.c   | 5 +++--
 cmd-list-windows.c | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmd-list-panes.c b/cmd-list-panes.c
index ba70faa1..e96d596b 100644
--- a/cmd-list-panes.c
+++ b/cmd-list-panes.c
@@ -65,9 +65,10 @@ cmd_list_panes_exec(struct cmd *self, struct cmd_ctx *ctx)
 		}
 		size += gd->hsize * sizeof *gd->linedata;
 
-		ctx->print(ctx, "%u: [%ux%u] [history %u/%u, %llu bytes]%s",
+		ctx->print(ctx, "%u: [%ux%u] [history %u/%u, %llu bytes]%s%s",
 		    n, wp->sx, wp->sy, gd->hsize, gd->hlimit, size,
-		    wp == wp->window->active ? " (active)" : "");
+		    wp == wp->window->active ? " (active)" : "",
+		    wp->fd == -1 ? " (dead)" : "");
 		n++;
 	}
 
diff --git a/cmd-list-windows.c b/cmd-list-windows.c
index cc12b0f4..7a4a28c2 100644
--- a/cmd-list-windows.c
+++ b/cmd-list-windows.c
@@ -51,10 +51,10 @@ cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);
 
 	RB_FOREACH(wl, winlinks, &s->windows) {
-		ctx->print(ctx, "%d: %s [%ux%u]",
-		    wl->idx, wl->window->name, wl->window->sx, wl->window->sy);
 		layout = layout_dump(wl->window);
-		ctx->print(ctx, "    layout: %s", layout);
+		ctx->print(ctx, "%d: %s [%ux%u] [layout %s]%s",
+		    wl->idx, wl->window->name, wl->window->sx, wl->window->sy,
+		    layout, wl == s->curw ? " (active)" : "");
 		xfree(layout);
 	}