===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-choose-window.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- src/usr.bin/tmux/Attic/cmd-choose-window.c	2010/12/20 00:03:55	1.16
+++ src/usr.bin/tmux/Attic/cmd-choose-window.c	2010/12/30 21:35:17	1.17
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-choose-window.c,v 1.16 2010/12/20 00:03:55 nicm Exp $ */
+/* $OpenBSD: cmd-choose-window.c,v 1.17 2010/12/30 21:35:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -57,7 +57,7 @@
 	struct winlink			*wl, *wm;
 	struct window			*w;
 	u_int			 	 idx, cur;
-	char				 flag, *title;
+	char				*flags, *title;
 	const char			*left, *right;
 
 	if (ctx->curclient == NULL) {
@@ -80,20 +80,7 @@
 			cur = idx;
 		idx++;
 
-		flag = ' ';
-		if (wm->flags & WINLINK_ACTIVITY)
-			flag = '#';
-		else if (wm->flags & WINLINK_BELL)
-			flag = '!';
-		else if (wm->flags & WINLINK_CONTENT)
-			flag = '+';
-		else if (wm->flags & WINLINK_SILENCE)
-			flag = '~';
-		else if (wm == s->curw)
-			flag = '*';
-		else if (wm == TAILQ_FIRST(&s->lastw))
-			flag = '-';
-
+		flags = window_printable_flags(s, wm);
 		title = w->active->screen->title;
 		if (wm == wl)
 			title = w->active->base.title;
@@ -103,10 +90,12 @@
 			left = right = "";
 
 		window_choose_add(wl->window->active,
-		    wm->idx, "%3d: %s%c [%ux%u] (%u panes%s)%s%s%s",
-		    wm->idx, w->name, flag, w->sx, w->sy, window_count_panes(w),
+		    wm->idx, "%3d: %s%s [%ux%u] (%u panes%s)%s%s%s",
+		    wm->idx, w->name, flags, w->sx, w->sy, window_count_panes(w),
 		    w->active->fd == -1 ? ", dead" : "",
 		    left, title, right);
+
+		xfree(flags);
 	}
 
 	cdata = xmalloc(sizeof *cdata);