X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fgeneric-main.c;h=70627966a78653da5a77e0ba35147740798530ed;hp=f253469f18832da67ff44102c6d3f5fbfa2616aa;hb=af51ccb8b8664eb9462aa4a6e7e2a9f52430647f;hpb=4e30f260106ac5f7007e213db1d1e54298393290

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index f253469..7062796 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -40,8 +40,6 @@
 #include "ui/common/discover-client.h"
 #include "nc-cui.h"
 
-extern const struct help_text main_menu_help_text;
-
 static void print_version(void)
 {
 	printf("petitboot-nc (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
@@ -51,8 +49,8 @@ static void print_usage(void)
 {
 	print_version();
 	printf(
-"%s: petitboot-nc [-h, --help] [-l, --log log-file]\n"
-"                    [-s, --start-daemon] [-v, --verbose] [-V, --version]\n",
+"%s: petitboot-nc [-h, --help] [-l, --log log-file] [-s, --start-daemon]\n"
+"                    [-t, --timeout] [-v, --verbose] [-V, --version]\n",
 			_("Usage"));
 }
 
@@ -70,6 +68,7 @@ struct opts {
 	enum opt_value show_help;
 	const char *log_file;
 	enum opt_value start_daemon;
+	enum opt_value timeout;
 	enum opt_value verbose;
 	enum opt_value show_version;
 };
@@ -84,11 +83,12 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 		{"help",         no_argument,       NULL, 'h'},
 		{"log",          required_argument, NULL, 'l'},
 		{"start-daemon", no_argument,       NULL, 's'},
+		{"timeout",	 no_argument,	    NULL, 't'},
 		{"verbose",      no_argument,       NULL, 'v'},
 		{"version",      no_argument,       NULL, 'V'},
 		{ NULL,          0,                 NULL, 0},
 	};
-	static const char short_options[] = "dhl:svV";
+	static const char short_options[] = "dhl:stvV";
 	static const struct opts default_values = { 0 };
 
 	*opts = default_values;
@@ -110,6 +110,9 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 		case 's':
 			opts->start_daemon = opt_yes;
 			break;
+		case 't':
+			opts->timeout = opt_yes;
+			break;
 		case 'v':
 			opts->verbose = opt_yes;
 			break;
@@ -150,113 +153,23 @@ static char *default_log_filename(void)
 
 	return name;
 }
-/**
+
+static struct cui *cui;
+
+/*
  * struct pb_cui - Main cui program instance.
  * @mm: Main menu.
  * @svm: Set video mode menu.
  */
 
-struct pb_cui {
-	struct pmenu *mm;
-	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.
- */
-
-static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
-{
-	int result;
-	struct pmenu *m;
-	struct pmenu_item *i;
-
-	m = pmenu_init(pb_cui->cui, 5, cui_on_exit);
-
-	if (!m) {
-		pb_log("%s: failed\n", __func__);
-		return NULL;
-	}
-
-	m->on_new = cui_item_new;
-
-	m->scr.frame.ltitle = talloc_asprintf(m,
-		"Petitboot (" PACKAGE_VERSION ")");
-	m->scr.frame.rtitle = NULL;
-	m->scr.frame.help = talloc_strdup(m,
-		_("Enter=accept, e=edit, n=new, x=exit, h=help"));
-	m->scr.frame.status = talloc_strdup(m, _("Welcome to Petitboot"));
-
-	i = pmenu_item_create(m, " ");
-	item_opts_off(i->nci, O_SELECTABLE);
-	pmenu_item_insert(m, i, 0);
-
-	i = pmenu_item_create(m, _("System information"));
-	i->on_execute = pmenu_sysinfo;
-	pmenu_item_insert(m, i, 1);
-
-	i = pmenu_item_create(m, _("System configuration"));
-	i->on_execute = pmenu_config;
-	pmenu_item_insert(m, i, 2);
-
-	i = pmenu_item_create(m, _("Rescan devices"));
-	i->on_execute = pmenu_reinit;
-	pmenu_item_insert(m, i, 3);
-
-	i = pmenu_item_create(m, _("Exit to shell"));
-	i->on_execute = pmenu_exit_cb;
-	pmenu_item_insert(m, i, 4);
-
-	result = pmenu_setup(m);
-
-	if (result) {
-		pb_log("%s:%d: pmenu_setup failed: %s\n", __func__, __LINE__,
-			strerror(errno));
-		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);
-
-	return m;
-
-fail_setup:
-	talloc_free(m);
-	return NULL;
-}
-
-static struct pb_cui pb;
-
 static void sig_handler(int signum)
 {
 	DBGS("%d\n", signum);
 
 	switch (signum) {
 	case SIGWINCH:
-		if (pb.cui)
-			cui_resize(pb.cui);
+		if (cui)
+			cui_resize(cui);
 		break;
 	default:
 		assert(0 && "unknown sig");
@@ -264,8 +177,8 @@ static void sig_handler(int signum)
 	case SIGINT:
 	case SIGHUP:
 	case SIGTERM:
-		if (pb.cui)
-			cui_abort(pb.cui);
+		if (cui)
+			cui_abort(cui);
 		break;
 	}
 }
@@ -336,18 +249,13 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	pb.cui = cui_init(&pb, NULL, opts.start_daemon);
-
-	if (!pb.cui)
+	cui = cui_init(NULL, NULL, opts.start_daemon, opts.timeout);
+	if (!cui)
 		return EXIT_FAILURE;
 
-	pb.mm = pb_mm_init(&pb);
-
-	cui_result = cui_run(pb.cui, pb.mm, 0);
-
-	pmenu_delete(pb.mm);
+	cui_result = cui_run(cui);
 
-	talloc_free(pb.cui);
+	talloc_free(cui);
 
 	pb_log("--- end ---\n");