src/usr.bin/tmux/status.c - diff - 1.160

Return to status.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/status.c between version 1.159 and 1.160

version 1.159, 2017/01/13 11:56:43

version 1.160, 2017/02/03 11:57:27

Line 500

Line 500

{

{

struct format_tree *ft;

struct format_tree *ft;

char *expanded;

char *expanded;

u_int tag;

if (fmt == NULL)

if (fmt == NULL)

return (xstrdup(""));

return (xstrdup(""));

if (wl != NULL)

tag = FORMAT_WINDOW|wl->window->id;

else

tag = FORMAT_NONE;

if (c->flags & CLIENT_STATUSFORCE)

if (c->flags & CLIENT_STATUSFORCE)

ft = format_create(NULL, FORMAT_STATUS|FORMAT_FORCE);

ft = format_create(NULL, tag, FORMAT_STATUS|FORMAT_FORCE);

else

else

ft = format_create(NULL, FORMAT_STATUS);

ft = format_create(NULL, tag, FORMAT_STATUS);

format_defaults(ft, c, NULL, wl, NULL);

format_defaults(ft, c, NULL, wl, NULL);

expanded = format_expand_time(ft, fmt, t);

expanded = format_expand_time(ft, fmt, t);

Line 665

Line 670

time_t t;

time_t t;

char *tmp;

char *tmp;

ft = format_create(NULL, 0);

ft = format_create(NULL, FORMAT_NONE, 0);

format_defaults(ft, c, NULL, NULL, NULL);

format_defaults(ft, c, NULL, NULL, NULL);

t = time(NULL);

t = time(NULL);

Line 726

Line 731

time_t t;

time_t t;

char *tmp;

char *tmp;

ft = format_create(NULL, 0);

ft = format_create(NULL, FORMAT_NONE, 0);

format_defaults(ft, c, NULL, NULL, NULL);

format_defaults(ft, c, NULL, NULL, NULL);

t = time(NULL);

t = time(NULL);