From 7a0468c95c58d91795630f204cab8362ffd44ed2 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Mon, 6 Dec 2010 21:56:32 +0000
Subject: [PATCH] PatchSet 788 Date: 2010/11/15 06:52:11 Author: nicm Branch:
 HEAD Tag: (none) Log: Show more window and pane flags in list-* output, and
 put layout on the same line.

Members:
        cmd-list-panes.c:1.5->1.6
        cmd-list-windows.c:1.9->1.10
---
 cmd-list-panes.c   | 7 ++++---
 cmd-list-windows.c | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmd-list-panes.c b/cmd-list-panes.c
index 2399263f..0c1b8ada 100644
--- a/cmd-list-panes.c
+++ b/cmd-list-panes.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-panes.c,v 1.5 2010-08-11 22:14:23 tcunha Exp $ */
+/* $Id: cmd-list-panes.c,v 1.6 2010-12-06 21:56:32 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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 1bd49bb9..14415047 100644
--- a/cmd-list-windows.c
+++ b/cmd-list-windows.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-windows.c,v 1.43 2010-07-02 02:54:52 tcunha Exp $ */
+/* $Id: cmd-list-windows.c,v 1.44 2010-12-06 21:56:32 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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);
 	}