X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fgeneric-main.c;h=7616788d6b7ea9dd583af198a982f24091794713;hb=90d16d056b4d7c6b8e2afb6b3406babd38f6c9e5;hp=5d8debbbacd09ba3a53c9f49ab7e219f11e386aa;hpb=dbf139003bd6c8c6ca03ae7f533aa74afd8060c6;p=petitboot

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 5d8debb..7616788 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,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 +150,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, 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, "Exit to shell");
 	i->on_execute = pmenu_exit_cb;
 
 	result = pmenu_setup(m);
@@ -162,6 +183,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);
@@ -180,10 +204,6 @@ static void sig_handler(int signum)
 	DBGS("%d\n", signum);
 
 	switch (signum) {
-	case SIGALRM:
-		if (pb.cui)
-			ui_timer_sigalrm(&pb.cui->timer);
-		break;
 	case SIGWINCH:
 		if (pb.cui)
 			cui_resize(pb.cui);
@@ -210,6 +230,7 @@ int main(int argc, char *argv[])
 	int result;
 	int cui_result;
 	struct opts opts;
+	FILE *log;
 
 	result = opts_parse(&opts, argc, argv);
 
@@ -228,17 +249,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");
 
-		assert(log);
-		pb_log_set_stream(log);
-	} else
-		pb_log_set_stream(stderr);
+		if (!log)
+			log = fopen("/dev/null", "a");
+	}
 
-#if defined(DEBUG)
-	pb_log_always_flush(1);
-#endif
+	pb_log_init(log);
 
 	pb_log("--- petitboot-nc ---\n");
 
@@ -260,7 +279,6 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 
 	pb.mm = pb_mm_init(&pb);
-	ui_timer_disable(&pb.cui->timer);
 
 	cui_result = cui_run(pb.cui, pb.mm, 0);