diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-02-03 14:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-02-03 14:01:13 +0000 |
| commit | 6c333cc4864c11283704b069fa6477876fd48f70 (patch) | |
| tree | 97f9033c539139408a55c59c0580d1321af0fb64 /status.c | |
| parent | 9b1f620aa017bb3634b3806e959580cde75ec655 (diff) | |
| parent | 7d23d019c0df197d724ced7fec21dc2047634c9b (diff) | |
| download | rtmux-6c333cc4864c11283704b069fa6477876fd48f70.tar.gz rtmux-6c333cc4864c11283704b069fa6477876fd48f70.tar.bz2 rtmux-6c333cc4864c11283704b069fa6477876fd48f70.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'status.c')
| -rw-r--r-- | status.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -500,14 +500,19 @@ status_replace(struct client *c, struct winlink *wl, const char *fmt, time_t t) { struct format_tree *ft; char *expanded; + u_int tag; if (fmt == NULL) return (xstrdup("")); + if (wl != NULL) + tag = FORMAT_WINDOW|wl->window->id; + else + tag = FORMAT_NONE; if (c->flags & CLIENT_STATUSFORCE) - ft = format_create(NULL, FORMAT_STATUS|FORMAT_FORCE); + ft = format_create(NULL, tag, FORMAT_STATUS|FORMAT_FORCE); else - ft = format_create(NULL, FORMAT_STATUS); + ft = format_create(NULL, tag, FORMAT_STATUS); format_defaults(ft, c, NULL, wl, NULL); expanded = format_expand_time(ft, fmt, t); @@ -665,7 +670,7 @@ status_prompt_set(struct client *c, const char *msg, const char *input, time_t t; char *tmp; - ft = format_create(NULL, 0); + ft = format_create(NULL, FORMAT_NONE, 0); format_defaults(ft, c, NULL, NULL, NULL); t = time(NULL); @@ -726,7 +731,7 @@ status_prompt_update(struct client *c, const char *msg, const char *input) time_t t; char *tmp; - ft = format_create(NULL, 0); + ft = format_create(NULL, FORMAT_NONE, 0); format_defaults(ft, c, NULL, NULL, NULL); t = time(NULL); |