summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-04-07 05:00:15 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-10 10:00:07 +0200
commit4da4b4df109e4ca958b5717a60de3ffb4f6900f4 (patch)
tree0b4a613fd375e004be8da255831b9bbc58e106dc /common
parent6da43a09a93773f877b27a0857db858fd636f18f (diff)
downloadbarebox-4da4b4df109e4ca958b5717a60de3ffb4f6900f4.tar.gz
menu: add color fancy support
You can now use AINSI color in the display of the menu or menu_entry. As the length of the string is not any more the same as the display simplify the invertion display managemnent. We just now invert the fontground and backgound on the string itself as done in Kconfig. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
-rw-r--r--common/menu.c50
1 files changed, 45 insertions, 5 deletions
diff --git a/common/menu.c b/common/menu.c
index e85a320..50af36e 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -31,6 +31,7 @@
#include <readkey.h>
#include <clock.h>
#include <linux/err.h>
+#include <libbb.h>
static LIST_HEAD(menus);
@@ -52,6 +53,7 @@ void menu_free(struct menu *m)
free(m->name);
free(m->display);
free(m->auto_display);
+ free(m->display_buffer);
list_for_each_entry_safe(me, tmp, &m->entries, list)
menu_entry_free(me);
@@ -162,8 +164,6 @@ static void print_menu_entry(struct menu *m, struct menu_entry *me,
int selected)
{
gotoXY(me->num + 1, 3);
- if (selected)
- printf("\e[7m");
if (me->type == MENU_ENTRY_BOX) {
if (me->box_state)
@@ -174,10 +174,15 @@ static void print_menu_entry(struct menu *m, struct menu_entry *me,
puts(" ");
}
- printf(" %d: %-*s", me->num, m->width, me->display);
+ 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 (selected)
- printf("\e[m");
+ puts("\e[m");
}
int menu_set_selected_entry(struct menu *m, struct menu_entry* me)
@@ -231,7 +236,9 @@ static void print_menu(struct menu *m)
clear();
gotoXY(1, 2);
if(m->display) {
- puts(m->display);
+ process_escape_sequence(m->display, m->display_buffer,
+ m->display_buffer_size);
+ puts(m->display_buffer);
} else {
puts("Menu : ");
puts(m->name);
@@ -250,6 +257,34 @@ static void print_menu(struct menu *m)
print_menu_entry(m, m->selected, 1);
}
+static int menu_alloc_display_buffer(struct menu *m)
+{
+ int min_size;
+
+ if (m->display)
+ min_size = max((int)strlen(m->display), m->width);
+ else
+ min_size = m->width;
+
+
+ if (m->display_buffer) {
+ if (m->display_buffer_size >= min_size)
+ return 0;
+ m->display_buffer = realloc(m->display_buffer, min_size * sizeof(char));
+ } else {
+ m->display_buffer = calloc(min_size, sizeof(char));
+ }
+
+ if (!m->display_buffer) {
+ perror("display_buffer");
+ return -ENOMEM;
+ }
+
+ m->display_buffer_size = min_size;
+
+ return 0;
+}
+
int menu_show(struct menu *m)
{
int ch;
@@ -257,10 +292,15 @@ int menu_show(struct menu *m)
int countdown;
int auto_display_len = 16;
uint64_t start, second;
+ int ret;
if(!m || list_empty(&m->entries))
return -EINVAL;
+ ret = menu_alloc_display_buffer(m);
+ if (ret)
+ return ret;
+
print_menu(m);
countdown = m->auto_select;