X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.c;h=d2048e1c3561591bd615a82fcb57ef58b36e27b0;hp=4dba0ad1d8d6680e7c21cd189e2642e0e5c167f8;hb=445f43743b73fbd63cccba7fa7ae890c907fe6dd;hpb=d57d1c9c4cd7365063da7aa1f018736166bb3a50 diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c index 4dba0ad..d2048e1 100644 --- a/ui/ncurses/nc-menu.c +++ b/ui/ncurses/nc-menu.c @@ -16,9 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#if defined(HAVE_CONFIG_H) #include "config.h" - -#define _GNU_SOURCE +#endif #include #include @@ -27,6 +27,7 @@ #include "log/log.h" #include "talloc/talloc.h" #include "ui/common/ui-system.h" +#include "nc-cui.h" #include "nc-menu.h" /** @@ -237,11 +238,18 @@ static void pmenu_process_key(struct nc_scr *scr, int key) if (menu->on_new) menu->on_new(menu); break; + case ' ': case '\n': case '\r': if (item->on_execute) item->on_execute(item); break; + case 'i': + cui_show_sysinfo(cui_from_arg(scr->ui_ctx)); + break; + case 'c': + cui_show_config(cui_from_arg(scr->ui_ctx)); + break; default: menu_driver(menu->ncm, key); break; @@ -378,6 +386,8 @@ int pmenu_setup(struct pmenu *menu) /* Makes menu scrollable. */ set_menu_format(menu->ncm, LINES - nc_scr_frame_lines, 1); + set_menu_grey(menu->ncm, A_NORMAL); + return 0; }