X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=da97fd9b21ae9e2e1f0bfcf61d470935bd3f4afe;hp=f47e3243de0aa12a48e432ab68507639f2f23cd7;hb=bf8d7e61a8fbc19be5ea1a73b9eaa30e58453d1f;hpb=6b842bb2559116a949c6a569ac39f5c56ebc1be1

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index f47e324..da97fd9 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -16,17 +16,22 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #define _GNU_SOURCE
 
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <locale.h>
 #include <sys/ioctl.h>
 
 #include "log/log.h"
+#include "pb-protocol/pb-protocol.h"
 #include "talloc/talloc.h"
 #include "waiter/waiter.h"
+#include "process/process.h"
 #include "ui/common/discover-client.h"
 #include "nc-cui.h"
 
@@ -60,36 +65,7 @@ void cui_resize(struct cui *cui)
 }
 
 /**
- * cui_make_item_name - Format the menu item name srting.
- *
- * Returns a talloc string.
- */
-
-static char *cui_make_item_name(struct pmenu_item *i, struct cui_opt_data *cod)
-{
-	char *name;
-
-	assert(cod->name);
-	assert(cod->bd);
-
-	name = talloc_asprintf(i, "%s:", cod->name);
-
-	if (cod->bd->image)
-		name = talloc_asprintf_append(name, " %s", cod->bd->image);
-
-	if (cod->bd->initrd)
-		name = talloc_asprintf_append(name, " initrd=%s",
-			cod->bd->initrd);
-
-	if (cod->bd->args)
-		name = talloc_asprintf_append(name, " %s", cod->bd->args);
-
-	DBGS("@%s@\n", name);
-	return name;
-}
-
-/**
- * cui_on_exit - A generic main menu ESC callback.
+ * cui_on_exit - A generic main menu exit callback.
  */
 
 void cui_on_exit(struct pmenu *menu)
@@ -105,13 +81,13 @@ int cui_run_cmd(struct pmenu_item *item)
 {
 	int result;
 	struct cui *cui = cui_from_item(item);
-	const char *const *cmd_argv = item->data;
+	const char **cmd_argv = item->data;
 
 	nc_scr_status_printf(cui->current, "Running %s...", cmd_argv[0]);
 
 	def_prog_mode();
 
-	result = pb_run_cmd(cmd_argv, 1, 0);
+	result = process_run_simple_argv(item, cmd_argv);
 
 	reset_prog_mode();
 	redrawwin(cui->current->main_ncw);
@@ -125,38 +101,33 @@ int cui_run_cmd(struct pmenu_item *item)
 }
 
 /**
- * cui_run_kexec - A generic cb to run kexec.
+ * cui_boot - A generic cb to run kexec.
  */
 
-static int cui_run_kexec(struct pmenu_item *item)
+static int cui_boot(struct pmenu_item *item)
 {
 	int result;
 	struct cui *cui = cui_from_item(item);
 	struct cui_opt_data *cod = cod_from_item(item);
 
 	assert(cui->current == &cui->main->scr);
-	assert(cui->on_kexec);
 
 	pb_log("%s: %s\n", __func__, cod->name);
+
 	nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
 
 	def_prog_mode();
 
-	result = cui->on_kexec(cui, cod);
+	result = discover_client_boot(cui->client, NULL, cod->opt, cod->bd);
 
 	reset_prog_mode();
 	redrawwin(cui->current->main_ncw);
 
-	if (!result) {
-		clear();
-		mvaddstr(1, 0, "system is going down now...");
-		refresh();
-		sleep(cui->dry_run ? 1 : 60);
+	if (result) {
+		nc_scr_status_printf(cui->current,
+				"Failed: boot %s", cod->bd->image);
 	}
 
-	pb_log("%s: failed: %s\n", __func__, cod->bd->image);
-	nc_scr_status_printf(cui->current, "Failed: kexec %s", cod->bd->image);
-
 	return 0;
 }
 
@@ -164,49 +135,76 @@ static int cui_run_kexec(struct pmenu_item *item)
  * cui_boot_editor_on_exit - The boot_editor on_exit callback.
  */
 
-static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_editor_result boot_editor_result,
-	struct pb_boot_data *bd)
+static void cui_boot_editor_on_exit(struct boot_editor *boot_editor,
+		enum boot_editor_result boot_editor_result,
+		struct pb_boot_data *bd)
 {
-	struct cui *cui = cui_from_arg(boot_editor->scr.ui_ctx);
+	struct cui *cui = cui_from_pmenu(boot_editor->original_pmenu);
+	struct pmenu_item *item = boot_editor->data;
+	struct cui_opt_data *cod;
+
+	if (boot_editor_result != boot_editor_update) {
+		cui_set_current(cui, &cui->main->scr);
+		talloc_free(boot_editor);
+		return;
+	}
 
-	if (boot_editor_result == boot_editor_update) {
-		struct pmenu_item *i = pmenu_find_selected(cui->main);
-		struct cui_opt_data *cod = cod_from_item(i);
-		char *name;
+	assert(bd);
 
-		assert(bd);
+	/* Is this was a new item, we'll need to update the menu */
+	if (!item) {
+		struct pmenu *menu = boot_editor->original_pmenu;
+		int insert_pt;
 
-		talloc_steal(i, bd);
-		talloc_free(cod->bd);
-		cod->bd = bd;
+		/* Detach the items array. */
+		set_menu_items(menu->ncm, NULL);
 
-		name = cui_make_item_name(i, cod);
-		pmenu_item_replace(i, name);
+		/* Insert new item at insert_pt. */
+		insert_pt = pmenu_grow(menu, 1);
+		item = pmenu_item_alloc(menu);
+		item->on_edit = cui_item_edit;
+		item->on_execute = cui_boot;
+		item->data = cod = talloc_zero(item, struct cui_opt_data);
 
-		/* FIXME: need to make item visible somehow */
-		set_current_item(cui->main->ncm, i->nci);
+		cod->name = talloc_asprintf(cod, "User item %u:", insert_pt);
+		pmenu_item_setup(menu, item, insert_pt,
+				talloc_strdup(item, cod->name));
 
-		pb_log("%s: updating opt '%s'\n", __func__, cod->name);
-		pb_log(" image  '%s'\n", cod->bd->image);
-		pb_log(" initrd '%s'\n", cod->bd->initrd);
-		pb_log(" args   '%s'\n", cod->bd->args);
+		/* Re-attach the items array. */
+		set_menu_items(menu->ncm, menu->items);
+		menu->scr.post(&menu->scr);
+	} else {
+		cod = item->data;
 	}
 
-	cui_set_current(cui, &cui->main->scr);
+	cod->bd = talloc_steal(cod, bd);
 
+	/* FIXME: need to make item visible somehow */
+	set_current_item(item->pmenu->ncm, item->nci);
+	cui_set_current(cui, &cui->main->scr);
 	talloc_free(boot_editor);
 }
 
-int cui_boot_editor_run(struct pmenu_item *item)
+void cui_item_edit(struct pmenu_item *item)
 {
 	struct cui *cui = cui_from_item(item);
 	struct cui_opt_data *cod = cod_from_item(item);
 	struct boot_editor *boot_editor;
 
-	boot_editor = boot_editor_init(cui, cod->bd, cui_boot_editor_on_exit);
+	boot_editor = boot_editor_init(item->pmenu, cod->bd,
+			cui_boot_editor_on_exit);
+	boot_editor->data = item;
 	cui_set_current(cui, &boot_editor->scr);
+}
 
-	return 0;
+void cui_item_new(struct pmenu *menu)
+{
+	struct cui *cui = cui_from_pmenu(menu);
+	struct boot_editor *boot_editor;
+
+	boot_editor = boot_editor_init(menu, NULL,
+			cui_boot_editor_on_exit);
+	cui_set_current(cui, &boot_editor->scr);
 }
 
 /**
@@ -230,6 +228,19 @@ struct nc_scr *cui_set_current(struct cui *cui, struct nc_scr *scr)
 	return old;
 }
 
+static bool process_global_keys(struct cui *cui, int key)
+{
+	switch (key) {
+	case 0xc:
+		if (cui->current && cui->current->main_ncw) {
+			redrawwin(cui->current->main_ncw);
+			wrefresh(cui->current->main_ncw);
+		}
+		return true;
+	}
+	return false;
+}
+
 /**
  * cui_process_key - Process input on stdin.
  */
@@ -240,8 +251,21 @@ static int cui_process_key(void *arg)
 
 	assert(cui->current);
 
-	ui_timer_disable(&cui->timer);
-	cui->current->process_key(cui->current);
+	if (!cui->has_input)
+		discover_client_cancel_default(cui->client);
+	cui->has_input = true;
+
+	for (;;) {
+		int c = getch();
+
+		if (c == ERR)
+			break;
+
+		if (process_global_keys(cui, c))
+			continue;
+
+		cui->current->process_key(cui->current, c);
+	}
 
 	return 0;
 }
@@ -264,35 +288,6 @@ static int cui_process_js(void *arg)
 
 	return 0;
 }
-/**
- * cui_client_process_socket - Process a socket event from the discover server.
- */
-
-static int cui_client_process_socket(void *arg)
-{
-	struct discover_client *client = arg;
-
-	discover_client_process(client);
-	return 0;
-}
-
-/**
- * cui_handle_timeout - Handle the timeout.
- */
-
-static void cui_handle_timeout(struct ui_timer *timer)
-{
-	struct cui *cui = cui_from_timer(timer);
-	struct pmenu_item *i = pmenu_find_selected(cui->main);
-
-#if defined(DEBUG)
-	{
-		struct cui_opt_data *cod = cod_from_item(i);
-		assert(cod && (cod->opt_hash == cui->default_item));
-	}
-#endif
-	i->on_execute(i);
-}
 
 /**
  * cui_handle_resize - Handle the term resize.
@@ -319,46 +314,6 @@ static void cui_handle_resize(struct cui *cui)
 	wrefresh(cui->current->main_ncw);
 }
 
-/**
- * cui_on_open - Open new item callback.
- */
-
-void cui_on_open(struct pmenu *menu)
-{
-	unsigned int insert_pt;
-	struct pmenu_item *i;
-	struct cui_opt_data *cod;
-
-	menu->scr.unpost(&menu->scr);
-
-	/* This disconnects items array from menu. */
-
-	set_menu_items(menu->ncm, NULL);
-
-	/* Insert new items at insert_pt. */
-
-	insert_pt = pmenu_grow(menu, 1);
-	i = pmenu_item_alloc(menu);
-
-	i->on_edit = cui_boot_editor_run;
-	i->on_execute = cui_run_kexec;
-	i->data = cod = talloc_zero(i, struct cui_opt_data);
-
-	cod->name = talloc_asprintf(i, "User item %u:", insert_pt);
-	cod->bd = talloc_zero(i, struct pb_boot_data);
-
-	pmenu_item_setup(menu, i, insert_pt, talloc_strdup(i, cod->name));
-
-	/* Re-attach the items array. */
-
-	set_menu_items(menu->ncm, menu->items);
-
-	menu->scr.post(&menu->scr);
-	set_current_item(menu->ncm, i->nci);
-
-	i->on_edit(i);
-}
-
 /**
  * cui_device_add - Client device_add callback.
  *
@@ -366,16 +321,17 @@ void cui_on_open(struct pmenu *menu)
  * menu_items into the main menu.  Redraws the main menu if it is active.
  */
 
-static int cui_device_add(struct device *dev, void *arg)
+static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
+		void *arg)
 {
 	struct cui *cui = cui_from_arg(arg);
-	int result;
-	struct boot_option *opt;
-	unsigned int o_count; /* device opts */
+	struct cui_opt_data *cod;
 	unsigned int insert_pt;
+	struct pmenu_item *i;
 	ITEM *selected;
+	int result;
 
-	pb_log("%s: %p %s\n", __func__, dev, dev->id);
+	pb_log("%s: %p %s\n", __func__, opt, opt->id);
 
 	selected = current_item(cui->main->ncm);
 
@@ -389,57 +345,36 @@ static int cui_device_add(struct device *dev, void *arg)
 	if (result)
 		pb_log("%s: set_menu_items failed: %d\n", __func__, result);
 
-	o_count = 0;
-	list_for_each_entry(&dev->boot_options, opt, list)
-		o_count++;
-
 	/* Insert new items at insert_pt. */
+	insert_pt = pmenu_grow(cui->main, 1);
 
-	insert_pt = pmenu_grow(cui->main, o_count);
-
-	list_for_each_entry(&dev->boot_options, opt, list) {
-		struct pmenu_item *i;
-		struct cui_opt_data *cod;
-		char *name;
-
-		/* Save the item in opt->ui_info for cui_device_remove() */
+	/* Save the item in opt->ui_info for cui_device_remove() */
 
-		opt->ui_info = i = pmenu_item_alloc(cui->main);
+	opt->ui_info = i = pmenu_item_alloc(cui->main);
 
-		i->on_edit = cui_boot_editor_run;
-		i->on_execute = cui_run_kexec;
-		i->data = cod = talloc(i, struct cui_opt_data);
+	i->on_edit = cui_item_edit;
+	i->on_execute = cui_boot;
+	i->data = cod = talloc(i, struct cui_opt_data);
 
-		cod->dev = dev;
-		cod->opt = opt;
-		cod->opt_hash = pb_opt_hash(dev, opt);
-		cod->name = opt->name;
-		cod->bd = talloc(i, struct pb_boot_data);
+	cod->opt = opt;
+	cod->dev = dev;
+	cod->opt_hash = pb_opt_hash(dev, opt);
+	cod->name = opt->name;
+	cod->bd = talloc(i, struct pb_boot_data);
 
-		cod->bd->image = talloc_strdup(cod->bd, opt->boot_image_file);
-		cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file);
-		cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
+	cod->bd->image = talloc_strdup(cod->bd, opt->boot_image_file);
+	cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file);
+	cod->bd->dtb = talloc_strdup(cod->bd, opt->dtb_file);
+	cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
 
-		name = cui_make_item_name(i, cod);
-		pmenu_item_setup(cui->main, i, insert_pt, name);
+	pmenu_item_setup(cui->main, i, insert_pt, cod->name);
 
-		insert_pt++;
-
-		pb_log("%s: adding opt '%s'\n", __func__, cod->name);
-		pb_log("   image  '%s'\n", cod->bd->image);
-		pb_log("   initrd '%s'\n", cod->bd->initrd);
-		pb_log("   args   '%s'\n", cod->bd->args);
-
-		/* If this is the default_item select it and start timer. */
-
-		if (cod->opt_hash == cui->default_item) {
-			selected = i->nci;
-			ui_timer_kick(&cui->timer);
-		}
-	}
+	pb_log("%s: adding opt '%s'\n", __func__, cod->name);
+	pb_log("   image  '%s'\n", cod->bd->image);
+	pb_log("   initrd '%s'\n", cod->bd->initrd);
+	pb_log("   args   '%s'\n", cod->bd->args);
 
 	/* Re-attach the items array. */
-
 	result = set_menu_items(cui->main->ncm, cui->main->items);
 
 	if (result)
@@ -489,15 +424,9 @@ static void cui_device_remove(struct device *dev, void *arg)
 
 	list_for_each_entry(&dev->boot_options, opt, list) {
 		struct pmenu_item *i = pmenu_item_from_arg(opt->ui_info);
-		struct cui_opt_data *cod = cod_from_item(i);
 
-		assert(pb_protocol_device_cmp(dev, cod->dev));
+		assert(pb_protocol_device_cmp(dev, cod_from_item(i)->dev));
 		pmenu_remove(cui->main, i);
-
-		/* If this is the default_item disable timer. */
-
-		if (cod->opt_hash == cui->default_item)
-			ui_timer_disable(&cui->timer);
 	}
 
 	/* Re-attach the items array. */
@@ -517,9 +446,45 @@ static void cui_device_remove(struct device *dev, void *arg)
 		cui->current->post(cui->current);
 }
 
+static void cui_update_status(struct boot_status *status, void *arg)
+{
+	struct cui *cui = cui_from_arg(arg);
+
+	nc_scr_status_printf(cui->current,
+			"%s: %s",
+			status->type == BOOT_STATUS_ERROR ? "Error" : "Info",
+			status->message);
+
+}
+
+static void cui_update_mm_title(struct cui *cui)
+{
+	struct nc_frame *frame = &cui->main->scr.frame;
+
+	talloc_free(frame->rtitle);
+
+	frame->rtitle = talloc_strdup(cui->main, cui->sysinfo->type);
+	if (cui->sysinfo->identifier)
+		frame->rtitle = talloc_asprintf_append(frame->rtitle,
+				" %s", cui->sysinfo->identifier);
+
+	if (cui->current == &cui->main->scr)
+		cui->current->post(cui->current);
+}
+
+static void cui_update_sysinfo(struct system_info *sysinfo, void *arg)
+{
+	struct cui *cui = cui_from_arg(arg);
+	cui->sysinfo = talloc_steal(cui, sysinfo);
+	cui_update_mm_title(cui);
+}
+
 static struct discover_client_ops cui_client_ops = {
-	.device_add = cui_device_add,
+	.device_add = NULL,
+	.boot_option_add = cui_boot_option_add,
 	.device_remove = cui_device_remove,
+	.update_status = cui_update_status,
+	.update_sysinfo = cui_update_sysinfo,
 };
 
 /**
@@ -533,11 +498,9 @@ static struct discover_client_ops cui_client_ops = {
  */
 
 struct cui *cui_init(void* platform_info,
-	int (*on_kexec)(struct cui *, struct cui_opt_data *),
-	int (*js_map)(const struct js_event *e), int start_deamon, int dry_run)
+	int (*js_map)(const struct js_event *e), int start_deamon)
 {
 	struct cui *cui;
-	struct discover_client *client;
 	unsigned int i;
 
 	cui = talloc_zero(NULL, struct cui);
@@ -550,28 +513,30 @@ struct cui *cui_init(void* platform_info,
 
 	cui->c_sig = pb_cui_sig;
 	cui->platform_info = platform_info;
-	cui->on_kexec = on_kexec;
-	cui->timer.handle_timeout = cui_handle_timeout;
-	cui->dry_run = dry_run;
 	cui->waitset = waitset_create(cui);
 
+	process_init(cui, cui->waitset, false);
+
+	setlocale(LC_ALL, "");
+
 	/* Loop here for scripts that just started the server. */
 
 retry_start:
 	for (i = start_deamon ? 2 : 10; i; i--) {
-		client = discover_client_init(&cui_client_ops, cui);
-		if (client || !i)
+		cui->client = discover_client_init(cui->waitset,
+				&cui_client_ops, cui);
+		if (cui->client || !i)
 			break;
 		pb_log("%s: waiting for server %d\n", __func__, i);
 		sleep(1);
 	}
 
-	if (!client && start_deamon) {
+	if (!cui->client && start_deamon) {
 		int result;
 
 		start_deamon = 0;
 
-		result = pb_start_daemon();
+		result = pb_start_daemon(cui);
 
 		if (!result)
 			goto retry_start;
@@ -584,7 +549,7 @@ retry_start:
 		goto fail_client_init;
 	}
 
-	if (!client) {
+	if (!cui->client) {
 		pb_log("%s: discover_client_init failed.\n", __func__);
 		fprintf(stderr, "%s: error: discover_client_init failed.\n",
 			__func__);
@@ -596,10 +561,7 @@ retry_start:
 	atexit(nc_atexit);
 	nc_start();
 
-	waiter_register(cui->waitset, discover_client_get_fd(client), WAIT_IN,
-			cui_client_process_socket, client);
-
-	waiter_register(cui->waitset, STDIN_FILENO, WAIT_IN,
+	waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,
 			cui_process_key, cui);
 
 	if (js_map) {
@@ -607,7 +569,7 @@ retry_start:
 		cui->pjs = pjs_init(cui, js_map);
 
 		if (cui->pjs)
-			waiter_register(cui->waitset, pjs_get_fd(cui->pjs),
+			waiter_register_io(cui->waitset, pjs_get_fd(cui->pjs),
 					WAIT_IN, cui_process_js, cui);
 	}
 
@@ -642,7 +604,7 @@ int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item)
 	while (1) {
 		int result = waiter_poll(cui->waitset);
 
-		if (result < 0 && errno != EINTR) {
+		if (result < 0) {
 			pb_log("%s: poll: %s\n", __func__, strerror(errno));
 			break;
 		}
@@ -650,8 +612,6 @@ int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item)
 		if (cui->abort)
 			break;
 
-		ui_timer_process_sig(&cui->timer);
-
 		while (cui->resize) {
 			cui->resize = 0;
 			cui_handle_resize(cui);