Add some additional format helper functions.

This commit is contained in:
Nicholas Marriott
2020-04-27 14:33:17 +01:00
parent e62db55713
commit c30e765c7b
3 changed files with 52 additions and 11 deletions

4
menu.c
View File

@ -73,7 +73,7 @@ menu_add_item(struct menu *menu, const struct menu_item *item,
return;
if (fs != NULL)
s = format_single(qitem, item->name, c, fs->s, fs->wl, fs->wp);
s = format_single_from_state(qitem, item->name, c, fs);
else
s = format_single(qitem, item->name, c, NULL, NULL, NULL);
if (*s == '\0') { /* no item if empty after format expanded */
@ -91,7 +91,7 @@ menu_add_item(struct menu *menu, const struct menu_item *item,
cmd = item->command;
if (cmd != NULL) {
if (fs != NULL)
s = format_single(qitem, cmd, c, fs->s, fs->wl, fs->wp);
s = format_single_from_state(qitem, cmd, c, fs);
else
s = format_single(qitem, cmd, c, NULL, NULL, NULL);
} else