From d8a2ceea438df9fcf235ce7e1b2700d734fd5d77 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Sun, 9 Aug 2009 16:41:17 +0000
Subject: [PATCH] Sync OpenBSD patchset 217:

Show the bell/activity/current status and the window title in the choice list.
---
 cmd-choose-window.c | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/cmd-choose-window.c b/cmd-choose-window.c
index 3d5a74c5..f1bdfb18 100644
--- a/cmd-choose-window.c
+++ b/cmd-choose-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-choose-window.c,v 1.13 2009-07-28 22:12:16 tcunha Exp $ */
+/* $Id: cmd-choose-window.c,v 1.14 2009-08-09 16:41:17 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -52,6 +52,8 @@ cmd_choose_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct winlink			*wl, *wm;
 	struct window			*w;
 	u_int			 	 idx, cur;
+	char				 flag, *title;
+	const char			*left, *right;
 
 	if (ctx->curclient == NULL) {
 		ctx->error(ctx, "must be run interactively");
@@ -73,9 +75,30 @@ cmd_choose_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 			cur = idx;
 		idx++;
 
+		flag = ' ';
+		if (session_alert_has(s, wm, WINDOW_ACTIVITY))
+			flag = '#';
+		else if (session_alert_has(s, wm, WINDOW_BELL))
+			flag = '!';
+		else if (session_alert_has(s, wm, WINDOW_CONTENT))
+			flag = '+';
+		else if (wm == s->curw)
+			flag = '*';
+		else if (wm == SLIST_FIRST(&s->lastw))
+			flag = '-';
+
+		title = w->active->screen->title;
+		if (wm == wl)
+			title = w->active->base.title;
+		left = " \"";
+		right = "\"";
+		if (*title == '\0')
+			left = right = "";
+
 		window_choose_add(wl->window->active,
-		    wm->idx, "%3d: %s [%ux%u] (%u panes)",
-		    wm->idx, w->name, w->sx, w->sy, window_count_panes(w));
+		    wm->idx, "%3d: %s%c [%ux%u] (%u panes)%s%s%s",
+		    wm->idx, w->name, flag, w->sx, w->sy, window_count_panes(w),
+		    left, title, right);
 	}
 
 	cdata = xmalloc(sizeof *cdata);