X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fgeneric-main.c;h=2cfb9c319f634d2570662b350d3ef598e8a9056c;hp=6280a341987617a45c6d869beb0c935191a7944e;hb=bebb24a9f49cb4eb81df2aa3dd9de94db965536d;hpb=78c82fbd0a481249de1763b5d43bb9876ea612bd

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 6280a34..2cfb9c3 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
+#include <assert.h>
 #include <errno.h>
 #include <getopt.h>
 #include <signal.h>
@@ -36,6 +36,8 @@
 #include "ui/common/discover-client.h"
 #include "nc-cui.h"
 
+extern const char *main_menu_help_text;
+
 static void print_version(void)
 {
 	printf("petitboot-nc (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
@@ -126,6 +128,24 @@ 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;
+}
+
+static int pmenu_reinit(struct pmenu_item *item)
+{
+	cui_send_reinit(cui_from_item(item));
+	return 0;
+}
+
 /**
  * pb_mm_init - Setup the main menu instance.
  */
@@ -136,22 +156,31 @@ 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, 5, 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, h=help");
 	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, "Rescan devices");
+	i->on_execute = pmenu_reinit;
+	i = pmenu_item_init(m, 4, "Exit to shell");
 	i->on_execute = pmenu_exit_cb;
 
 	result = pmenu_setup(m);
@@ -162,6 +191,9 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 		goto fail_setup;
 	}
 
+	m->help_title = "main menu";
+	m->help_text = main_menu_help_text;
+
 	menu_opts_off(m->ncm, O_SHOWDESC);
 	set_menu_mark(m->ncm, " *");
 	set_current_item(m->ncm, i->nci);
@@ -206,6 +238,7 @@ int main(int argc, char *argv[])
 	int result;
 	int cui_result;
 	struct opts opts;
+	FILE *log;
 
 	result = opts_parse(&opts, argc, argv);
 
@@ -224,20 +257,15 @@ int main(int argc, char *argv[])
 		return EXIT_SUCCESS;
 	}
 
+	log = stderr;
 	if (strcmp(opts.log_file, "-")) {
-		FILE *log = fopen(opts.log_file, "a");
+		log = fopen(opts.log_file, "a");
 
 		if (!log)
 			log = fopen("/dev/null", "a");
+	}
 
-		assert(log);
-		pb_log_set_stream(log);
-	} else
-		pb_log_set_stream(stderr);
-
-#if defined(DEBUG)
-	pb_log_always_flush(1);
-#endif
+	pb_log_init(log);
 
 	pb_log("--- petitboot-nc ---\n");