window_printable_flags needs an additional argument.

This commit is contained in:
Nicholas Marriott 2018-09-25 09:55:49 +01:00
parent b4e74f4310
commit 83b2d5c513

View File

@ -52,7 +52,7 @@ static int format_replace(struct format_tree *, const char *, size_t,
static void format_defaults_session(struct format_tree *, static void format_defaults_session(struct format_tree *,
struct session *); struct session *);
static void format_defaults_client(struct format_tree *, struct client *); static void format_defaults_client(struct format_tree *, struct client *);
static void format_defaults_winlink(struct format_tree *, static void format_defaults_winlink(struct format_tree *, struct client *,
struct winlink *); struct winlink *);
/* Entry in format job tree. */ /* Entry in format job tree. */
@ -1347,7 +1347,7 @@ format_defaults(struct format_tree *ft, struct client *c, struct session *s,
if (s != NULL) if (s != NULL)
format_defaults_session(ft, s); format_defaults_session(ft, s);
if (wl != NULL) if (wl != NULL)
format_defaults_winlink(ft, wl); format_defaults_winlink(ft, c, wl);
if (wp != NULL) if (wp != NULL)
format_defaults_pane(ft, wp); format_defaults_pane(ft, wp);
} }
@ -1462,7 +1462,8 @@ format_defaults_window(struct format_tree *ft, struct window *w)
/* Set default format keys for a winlink. */ /* Set default format keys for a winlink. */
static void static void
format_defaults_winlink(struct format_tree *ft, struct winlink *wl) format_defaults_winlink(struct format_tree *ft, struct client *c,
struct winlink *wl)
{ {
struct session *s = wl->session; struct session *s = wl->session;
struct window *w = wl->window; struct window *w = wl->window;
@ -1475,7 +1476,7 @@ format_defaults_winlink(struct format_tree *ft, struct winlink *wl)
format_add(ft, "window_index", "%d", wl->idx); format_add(ft, "window_index", "%d", wl->idx);
format_add_cb(ft, "window_stack_index", format_cb_window_stack_index); format_add_cb(ft, "window_stack_index", format_cb_window_stack_index);
format_add(ft, "window_flags", "%s", window_printable_flags(wl)); format_add(ft, "window_flags", "%s", window_printable_flags(wl, c));
format_add(ft, "window_active", "%d", wl == s->curw); format_add(ft, "window_active", "%d", wl == s->curw);
format_add(ft, "window_bell_flag", "%d", format_add(ft, "window_bell_flag", "%d",