diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-08-09 16:41:17 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-08-09 16:41:17 +0000 |
| commit | d8a2ceea438df9fcf235ce7e1b2700d734fd5d77 (patch) | |
| tree | 6061b934720a4f9902f1d755a442330e1c6f1e61 /cmd-choose-window.c | |
| parent | c32ca6a8e66fc1a1e56587eefbae3d9bcc18b6b1 (diff) | |
Sync OpenBSD patchset 217:
Show the bell/activity/current status and the window title in the choice list.
Diffstat (limited to 'cmd-choose-window.c')
| -rw-r--r-- | cmd-choose-window.c | 29 |
1 files 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); |