diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-04-14 18:02:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-15 18:29:52 +0200 |
| commit | 6f9eaaa00041eb2869ac701d851c358f14e726d5 (patch) | |
| tree | de56906fdcff6d1afbc5c56519e985197ccabda1 | |
| parent | ff879a2d4cc73046460e1fc88e5d1251bdc6dd1d (diff) | |
| download | barebox-6f9eaaa00041eb2869ac701d851c358f14e726d5.tar.gz barebox-6f9eaaa00041eb2869ac701d851c358f14e726d5.tar.xz | |
menu: enable the fancy color support only if HUSH is enabled
So we can use the menu for the xloader too.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | common/menu.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/common/menu.c b/common/menu.c index 50af36eebe..83821ec285 100644 --- a/common/menu.c +++ b/common/menu.c @@ -174,12 +174,17 @@ static void print_menu_entry(struct menu *m, struct menu_entry *me, puts(" "); } - process_escape_sequence(me->display, m->display_buffer, - m->display_buffer_size); + if (IS_ENABLED(CONFIG_SHELL_HUSH)) + process_escape_sequence(me->display, m->display_buffer, + m->display_buffer_size); + printf(" %d: ", me->num); if (selected) puts("\e[7m"); - puts(m->display_buffer); + if (IS_ENABLED(CONFIG_SHELL_HUSH)) + puts(m->display_buffer); + else + puts(me->display); if (selected) puts("\e[m"); @@ -236,9 +241,13 @@ static void print_menu(struct menu *m) clear(); gotoXY(1, 2); if(m->display) { - process_escape_sequence(m->display, m->display_buffer, - m->display_buffer_size); - puts(m->display_buffer); + if (IS_ENABLED(CONFIG_SHELL_HUSH)) { + process_escape_sequence(m->display, m->display_buffer, + m->display_buffer_size); + puts(m->display_buffer); + } else { + puts(m->display); + } } else { puts("Menu : "); puts(m->name); |