X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fgeneric-main.c;h=aa5c2a59093bf669290e47b447bcd24135057883;hp=9236a800beac18a11d1041037955687f109364c6;hb=445f43743b73fbd63cccba7fa7ae890c907fe6dd;hpb=307b4b091e0bc298964e90888bf179431e32c134

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 9236a80..aa5c2a5 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -18,9 +18,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 <assert.h>
 #include <errno.h>
@@ -126,6 +126,18 @@ struct pb_cui {
 	struct cui *cui;
 };
 
+static int pmenu_sysinfo(struct pmenu_item *item)
+{
+	cui_show_sysinfo(cui_from_item(item));
+	return 0;
+}
+
+static int pmenu_config(struct pmenu_item *item)
+{
+	cui_show_config(cui_from_item(item));
+	return 0;
+}
+
 /**
  * pb_mm_init - Setup the main menu instance.
  */
@@ -136,22 +148,29 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 	struct pmenu *m;
 	struct pmenu_item *i;
 
-	m = pmenu_init(pb_cui->cui, 1, cui_on_exit);
+	m = pmenu_init(pb_cui->cui, 4, cui_on_exit);
 
 	if (!m) {
 		pb_log("%s: failed\n", __func__);
 		return NULL;
 	}
 
-	m->on_open = cui_on_open;
+	m->on_new = cui_item_new;
 
-	m->scr.frame.title = talloc_asprintf(m,
+	m->scr.frame.ltitle = talloc_asprintf(m,
 		"Petitboot (" PACKAGE_VERSION ")");
+	m->scr.frame.rtitle = NULL;
 	m->scr.frame.help = talloc_strdup(m,
-		"ESC=exit, Enter=accept, e=edit, o=open");
+		"Enter=accept, e=edit, n=new, x=exit");
 	m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot");
 
-	i = pmenu_item_init(m, 0, "Exit to Shell");
+	i = pmenu_item_init(m, 0, " ");
+	item_opts_off(i->nci, O_SELECTABLE);
+	i = pmenu_item_init(m, 1, "System information");
+	i->on_execute = pmenu_sysinfo;
+	i = pmenu_item_init(m, 2, "System configuration");
+	i->on_execute = pmenu_config;
+	i = pmenu_item_init(m, 3, "Exit to shell");
 	i->on_execute = pmenu_exit_cb;
 
 	result = pmenu_setup(m);