diff options
Diffstat (limited to 'format.c')
| -rw-r--r-- | format.c | 23 |
1 files changed, 18 insertions, 5 deletions
@@ -487,9 +487,22 @@ format_cb_pane_tabs(struct format_tree *ft, struct format_entry *fe) evbuffer_free(buffer); } +/* Merge a format tree. */ +static void +format_merge(struct format_tree *ft, struct format_tree *from) +{ + struct format_entry *fe; + + RB_FOREACH(fe, format_entry_tree, &from->tree) { + if (fe->value != NULL) + format_add(ft, fe->key, "%s", fe->value); + } + +} + /* Create a new tree. */ struct format_tree * -format_create(struct cmd_q *cmdq, int flags) +format_create(struct cmdq_item *item, int flags) { struct format_tree *ft; @@ -508,10 +521,10 @@ format_create(struct cmd_q *cmdq, int flags) format_add(ft, "socket_path", "%s", socket_path); format_add_tv(ft, "start_time", &start_time); - if (cmdq != NULL && cmdq->cmd != NULL) - format_add(ft, "command", "%s", cmdq->cmd->entry->name); - if (cmdq != NULL && cmdq->hook != NULL) - format_add(ft, "hook", "%s", cmdq->hook); + if (item != NULL && item->cmd != NULL) + format_add(ft, "command", "%s", item->cmd->entry->name); + if (item != NULL && item->formats != NULL) + format_merge(ft, item->formats); return (ft); } |