diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-02-06 19:05:56 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-02-06 19:07:43 +0000 |
| commit | 833fe5bdee449b04afe8844774be66374e1baf9c (patch) | |
| tree | 11b21f479421b08f67776c832543becaa0b12fb8 /server-client.c | |
| parent | 93c3fb78a3593afd23e85352213236131dd5958f (diff) | |
| parent | 313f2263f8bb3336893527f65789f820ba7eaf0f (diff) | |
| download | rtmux-833fe5bdee449b04afe8844774be66374e1baf9c.tar.gz rtmux-833fe5bdee449b04afe8844774be66374e1baf9c.tar.bz2 rtmux-833fe5bdee449b04afe8844774be66374e1baf9c.zip | |
Merge branch 'obsd-master'
Conflicts:
cmd-pipe-pane.c
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/server-client.c b/server-client.c index 18eea9d9..3ca99077 100644 --- a/server-client.c +++ b/server-client.c @@ -782,19 +782,25 @@ server_client_check_redraw(struct client *c) void server_client_set_title(struct client *c) { - struct session *s = c->session; - const char *template; - char *title; + struct session *s = c->session; + const char *template; + char *title; + struct format_tree *ft; template = options_get_string(&s->options, "set-titles-string"); - title = status_replace(c, NULL, NULL, NULL, template, time(NULL), 1); + ft = format_create(); + format_defaults(ft, c, NULL, NULL, NULL); + + title = format_expand_time(ft, template, time(NULL)); if (c->title == NULL || strcmp(title, c->title) != 0) { free(c->title); c->title = xstrdup(title); tty_set_title(&c->tty, c->title); } free(title); + + format_free(ft); } /* Dispatch message from client. */ |