X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=09b63b053f25638176b1837332b88dab387be110;hp=09e7a57fafe9454eb11cb24fa90fee11234718d1;hb=86c9d34380b0074dab1ba89a569a94280d6999c4;hpb=604a1ccf072f9f33326fb6dc919c1b6233d40866

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 09e7a57..09b63b0 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -16,7 +16,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #include <assert.h>
 #include <errno.h>
@@ -25,14 +27,73 @@
 #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 "i18n/i18n.h"
 #include "ui/common/discover-client.h"
+#include "ui/common/ui-system.h"
 #include "nc-cui.h"
+#include "nc-boot-editor.h"
+#include "nc-config.h"
+#include "nc-add-url.h"
+#include "nc-sysinfo.h"
+#include "nc-lang.h"
+#include "nc-helpscreen.h"
+#include "nc-subset.h"
+
+extern const struct help_text main_menu_help_text;
+
+static struct pmenu *main_menu_init(struct cui *cui);
+
+static void cui_start(void)
+{
+	initscr();			/* Initialize ncurses. */
+	cbreak();			/* Disable line buffering. */
+	noecho();			/* Disable getch() echo. */
+	keypad(stdscr, TRUE);		/* Enable num keypad keys. */
+	nonl();				/* Disable new-line translation. */
+	intrflush(stdscr, FALSE);	/* Disable interrupt flush. */
+	curs_set(0);			/* Make cursor invisible */
+	nodelay(stdscr, TRUE);		/* Enable non-blocking getch() */
+
+	/* We may be operating with an incorrect $TERM type; in this case
+	 * the keymappings will be slightly broken. We want at least
+	 * backspace to work though, so we'll define both DEL and ^H to
+	 * map to backspace */
+	define_key("\x7f", KEY_BACKSPACE);
+	define_key("\x08", KEY_BACKSPACE);
+
+	/* we need backtab too, for form navigation. vt220 doesn't include
+	 * this (kcbt), but we don't want to require a full linux/xterm termcap
+	 */
+	define_key("\x1b[Z", KEY_BTAB);
+
+	/* We'll define a few other keys too since they're commonly
+	 * used for navigation but the escape character will cause
+	 * Petitboot to exit if they're left undefined */
+	define_key("\x1b\x5b\x35\x7e", KEY_PPAGE);
+	define_key("\x1b\x5b\x36\x7e", KEY_NPAGE);
+	define_key("\x1b\x5b\x31\x7e", KEY_HOME);
+	define_key("\x1b\x5b\x34\x7e", KEY_END);
+	define_key("\x1b\x4f\x48", KEY_HOME);
+	define_key("\x1b\x4f\x46", KEY_END);
+	define_key("OH", KEY_HOME);
+	define_key("OF", KEY_END);
+	define_key("\x1b\x5b\x41", KEY_UP);
+	define_key("\x1b\x5b\x42", KEY_DOWN);
+	define_key("\x1b\x5b\x33\x7e", KEY_DC);
+
+	while (getch() != ERR)		/* flush stdin */
+		(void)0;
+}
 
-static struct cui_opt_data *cod_from_item(struct pmenu_item *item)
+static void cui_atexit(void)
 {
-	return item->data;
+	clear();
+	refresh();
+	endwin();
 }
 
 /**
@@ -55,41 +116,12 @@ void cui_abort(struct cui *cui)
 
 void cui_resize(struct cui *cui)
 {
-	pb_log("%s: resizing\n", __func__);
+	pb_debug("%s: resizing\n", __func__);
 	cui->resize = 1;
 }
 
 /**
- * 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->kd);
-
-	name = talloc_asprintf(i, "%s:", cod->name);
-
-	if (cod->kd->image)
-		name = talloc_asprintf_append(name, " %s", cod->kd->image);
-
-	if (cod->kd->initrd)
-		name = talloc_asprintf_append(name, " initrd=%s",
-			cod->kd->initrd);
-
-	if (cod->kd->args)
-		name = talloc_asprintf_append(name, " %s", cod->kd->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,108 +137,240 @@ 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]);
+	nc_scr_status_printf(cui->current, _("Running %s..."), cmd_argv[0]);
 
 	def_prog_mode();
 
-	result = pb_run_cmd(cmd_argv, 1);
+	result = process_run_simple_argv(item, cmd_argv);
 
 	reset_prog_mode();
 	redrawwin(cui->current->main_ncw);
 
 	if (result) {
 		pb_log("%s: failed: '%s'\n", __func__, cmd_argv[0]);
-		nc_scr_status_printf(cui->current, "Failed: %s", cmd_argv[0]);
+		nc_scr_status_printf(cui->current, _("Failed: %s"),
+				cmd_argv[0]);
 	}
 
 	return result;
 }
 
 /**
- * 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);
+	pb_debug("%s: %s\n", __func__, cod->name);
 
-	def_prog_mode();
+	nc_scr_status_printf(cui->current, _("Booting %s..."), cod->name);
 
-	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) {
+		nc_scr_status_printf(cui->current,
+				_("Failed: boot %s"), cod->bd->image);
+	}
 
-	if (!result) {
-		clear();
-		mvaddstr(1, 0, "system is going down now...");
-		refresh();
-		sleep(60);
+	return 0;
+}
+
+static void cui_boot_editor_on_exit(struct cui *cui,
+		struct pmenu_item *item,
+		struct pb_boot_data *bd)
+{
+	struct pmenu *menu = cui->main;
+	struct cui_opt_data *cod;
+	int idx, top, rows, cols;
+	static int user_idx = 0;
+
+	/* Was the edit cancelled? */
+	if (!bd) {
+		cui_set_current(cui, &cui->main->scr);
+		talloc_free(cui->boot_editor);
+		cui->boot_editor = NULL;
+		return;
 	}
 
-	pb_log("%s: failed: %s\n", __func__, cod->kd->image);
-	nc_scr_status_printf(cui->current, "Failed: kexec %s", cod->kd->image);
+	/* Is this was a new item, we'll need to update the menu */
+	if (!item) {
+		int insert_pt;
 
-	return 0;
+		cod = talloc_zero(NULL, struct cui_opt_data);
+		cod->name = talloc_asprintf(cod, _("User item %u"), ++user_idx);
+
+		item = pmenu_item_create(menu, cod->name);
+		if (!item) {
+			talloc_free(cod);
+			goto out;
+		}
+
+		item->on_edit = cui_item_edit;
+		item->on_execute = cui_boot;
+		item->data = cod;
+
+		talloc_steal(item, cod);
+
+		/* Detach the items array. */
+		set_menu_items(menu->ncm, NULL);
+
+		/* Insert new item at insert_pt. */
+		insert_pt = pmenu_grow(menu, 1);
+		pmenu_item_insert(menu, item, insert_pt);
+
+		/* Re-attach the items array. */
+		set_menu_items(menu->ncm, menu->items);
+
+		/* If our index is above the current top row, align
+		 * us to the new top. Otherwise, align us to the new
+		 * bottom */
+		menu_format(cui->main->ncm, &rows, &cols);
+		top = top_row(cui->main->ncm);
+		idx = item_index(item->nci);
+
+		if (top >= idx)
+			top = idx;
+		else
+			top = idx < rows ? 0 : idx - rows + 1;
+
+		set_top_row(cui->main->ncm, top);
+		set_current_item(item->pmenu->ncm, item->nci);
+
+		nc_scr_post(&menu->scr);
+	} else {
+		cod = item->data;
+	}
+
+	cod->bd = talloc_steal(cod, bd);
+
+out:
+	cui_set_current(cui, &cui->main->scr);
+	talloc_free(cui->boot_editor);
+	cui->boot_editor = NULL;
 }
 
-/**
- * cui_ked_on_exit - The ked on_exit callback.
- */
+void cui_item_edit(struct pmenu_item *item)
+{
+	struct cui *cui = cui_from_item(item);
+	cui->boot_editor = boot_editor_init(cui, item, cui->sysinfo,
+					cui_boot_editor_on_exit);
+	cui_set_current(cui, boot_editor_scr(cui->boot_editor));
+}
 
-static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result,
-	struct pb_kexec_data *kd)
+void cui_item_new(struct pmenu *menu)
 {
-	struct cui *cui = cui_from_arg(ked->scr.ui_ctx);
+	struct cui *cui = cui_from_pmenu(menu);
+	cui->boot_editor = boot_editor_init(cui, NULL, cui->sysinfo,
+					cui_boot_editor_on_exit);
+	cui_set_current(cui, boot_editor_scr(cui->boot_editor));
+}
 
-	if (ked_result == ked_update) {
-		struct pmenu_item *i = pmenu_find_selected(cui->main);
-		struct cui_opt_data *cod = cod_from_item(i);
-		char *name;
+static void cui_sysinfo_exit(struct cui *cui)
+{
+	cui_set_current(cui, &cui->main->scr);
+	talloc_free(cui->sysinfo_screen);
+	cui->sysinfo_screen = NULL;
+}
 
-		assert(kd);
+void cui_show_sysinfo(struct cui *cui)
+{
+	cui->sysinfo_screen = sysinfo_screen_init(cui, cui->sysinfo,
+			cui_sysinfo_exit);
+	cui_set_current(cui, sysinfo_screen_scr(cui->sysinfo_screen));
+}
 
-		talloc_steal(i, kd);
-		talloc_free(cod->kd);
-		cod->kd = kd;
+static void cui_config_exit(struct cui *cui)
+{
+	cui_set_current(cui, &cui->main->scr);
+	talloc_free(cui->config_screen);
+	cui->config_screen = NULL;
+}
 
-		name = cui_make_item_name(i, cod);
-		pmenu_item_replace(i, name);
+void cui_show_config(struct cui *cui)
+{
+	cui->config_screen = config_screen_init(cui, cui->config,
+			cui->sysinfo, cui_config_exit);
+	cui_set_current(cui, config_screen_scr(cui->config_screen));
+}
 
-		/* FIXME: need to make item visible somehow */
-		set_current_item(cui->main->ncm, i->nci);
+static void cui_lang_exit(struct cui *cui)
+{
+	cui_set_current(cui, &cui->main->scr);
+	talloc_free(cui->lang_screen);
+	cui->lang_screen = NULL;
+}
 
-		pb_log("%s: updating opt '%s'\n", __func__, cod->name);
-		pb_log(" image  '%s'\n", cod->kd->image);
-		pb_log(" initrd '%s'\n", cod->kd->initrd);
-		pb_log(" args   '%s'\n", cod->kd->args);
-	}
+void cui_show_lang(struct cui *cui)
+{
+	cui->lang_screen = lang_screen_init(cui, cui->config, cui_lang_exit);
+	cui_set_current(cui, lang_screen_scr(cui->lang_screen));
+}
 
+static void cui_add_url_exit(struct cui *cui)
+{
 	cui_set_current(cui, &cui->main->scr);
+	talloc_free(cui->add_url_screen);
+	cui->add_url_screen = NULL;
+}
 
-	talloc_free(ked);
+void cui_show_add_url(struct cui *cui)
+{
+	cui->add_url_screen = add_url_screen_init(cui, cui_add_url_exit);
+	cui_set_current(cui, add_url_screen_scr(cui->add_url_screen));
 }
 
-int cui_ked_run(struct pmenu_item *item)
+static void cui_help_exit(struct cui *cui)
 {
-	struct cui *cui = cui_from_item(item);
-	struct cui_opt_data *cod = cod_from_item(item);
-	struct ked *ked;
+	cui_set_current(cui, help_screen_return_scr(cui->help_screen));
+	talloc_free(cui->help_screen);
+	cui->help_screen = NULL;
+}
 
-	ked = ked_init(cui, cod->kd, cui_ked_on_exit);
-	cui_set_current(cui, &ked->scr);
+void cui_show_help(struct cui *cui, const char *title,
+		const struct help_text *text)
+{
+	if (!cui->current)
+		return;
 
-	return 0;
+	if (cui->help_screen)
+		return;
+
+	cui->help_screen = help_screen_init(cui, cui->current,
+			title, text, cui_help_exit);
+
+	if (cui->help_screen)
+		cui_set_current(cui, help_screen_scr(cui->help_screen));
+}
+
+static void cui_subset_exit(struct cui *cui)
+{
+	cui_set_current(cui, subset_screen_return_scr(cui->subset_screen));
+	talloc_free(cui->subset_screen);
+	cui->subset_screen = NULL;
+}
+
+void cui_show_subset(struct cui *cui, const char *title,
+		     void *arg)
+{
+	if (!cui->current)
+		return;
+
+	if (cui->subset_screen)
+		return;
+
+	cui->subset_screen = subset_screen_init(cui, cui->current,
+			title, arg, cui_subset_exit);
+
+	if (cui->subset_screen)
+		cui_set_current(cui, subset_screen_scr(cui->subset_screen));
 }
 
 /**
@@ -222,14 +386,26 @@ struct nc_scr *cui_set_current(struct cui *cui, struct nc_scr *scr)
 	assert(cui->current != scr);
 
 	old = cui->current;
-	old->unpost(old);
+	nc_scr_unpost(old);
 
 	cui->current = scr;
-	cui->current->post(cui->current);
+
+	nc_scr_post(cui->current);
 
 	return old;
 }
 
+static bool process_global_keys(struct cui *cui, int key)
+{
+	switch (key) {
+	case 0xc:
+		if (cui->current && cui->current->main_ncw)
+			wrefresh(curscr);
+		return true;
+	}
+	return false;
+}
+
 /**
  * cui_process_key - Process input on stdin.
  */
@@ -240,8 +416,31 @@ static int cui_process_key(void *arg)
 
 	assert(cui->current);
 
-	ui_timer_disable(&cui->timer);
-	cui->current->process_key(cui->current);
+	for (;;) {
+		int c = getch();
+
+		pb_debug("%s: got key %d\n", __func__, c);
+
+		if (c == ERR)
+			break;
+
+		if (!cui->has_input) {
+			cui->has_input = true;
+			if (cui->client) {
+				pb_log("UI input received (key = %d), aborting "
+					"default boot\n", c);
+				discover_client_cancel_default(cui->client);
+			} else {
+				pb_log("UI input received (key = %d), aborting "
+					"once server connects\n", c);
+			}
+		}
+
+		if (process_global_keys(cui, c))
+			continue;
+
+		cui->current->process_key(cui->current, c);
+	}
 
 	return 0;
 }
@@ -264,35 +463,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.
@@ -307,7 +477,7 @@ static void cui_handle_resize(struct cui *cui)
 		return;
 	}
 
-	pb_log("%s: {%u,%u}\n", __func__, ws.ws_row, ws.ws_col);
+	pb_debug("%s: {%u,%u}\n", __func__, ws.ws_row, ws.ws_col);
 
 	wclear(cui->current->main_ncw);
 	resize_term(ws.ws_row, ws.ws_col);
@@ -319,46 +489,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_ked_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->kd = talloc_zero(i, struct pb_kexec_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,80 +496,80 @@ 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 pmenu_item *i, *dev_hdr = NULL;
 	struct cui *cui = cui_from_arg(arg);
-	int result;
-	struct boot_option *opt;
-	unsigned int o_count; /* device opts */
+	struct cui_opt_data *cod;
+	const char *tab = "  ";
 	unsigned int insert_pt;
+	int result, rows, cols;
 	ITEM *selected;
+	char *name;
 
-	pb_log("%s: %p %s\n", __func__, dev, dev->id);
+	pb_debug("%s: %p %s\n", __func__, opt, opt->id);
 
 	selected = current_item(cui->main->ncm);
+	menu_format(cui->main->ncm, &rows, &cols);
 
 	if (cui->current == &cui->main->scr)
-		cui->current->unpost(cui->current);
-
-	/* This disconnects items array from menu. */
-
-	result = set_menu_items(cui->main->ncm, NULL);
+		nc_scr_unpost(cui->current);
 
-	if (result)
-		pb_log("%s: set_menu_items failed: %d\n", __func__, result);
+	/* Check if the boot device is new */
+	dev_hdr = pmenu_find_device(cui->main, dev, opt);
 
-	o_count = 0;
-	list_for_each_entry(&dev->boot_options, opt, list)
-		o_count++;
+	/* All actual boot entries are 'tabbed' across */
+	name = talloc_asprintf(cui->main, "%s%s",
+			tab, opt->name ? : "Unknown Name");
 
-	/* Insert new items at insert_pt. */
+	/* Save the item in opt->ui_info for cui_device_remove() */
+	opt->ui_info = i = pmenu_item_create(cui->main, name);
+	talloc_free(name);
+	if (!i)
+		return -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;
+	i->on_edit = cui_item_edit;
+	i->on_execute = cui_boot;
+	i->data = cod = talloc(i, struct cui_opt_data);
 
-		/* Save the item in opt->ui_info for cui_device_remove() */
+	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);
 
-		opt->ui_info = i = pmenu_item_alloc(cui->main);
+	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);
+	cod->bd->args_sig_file = talloc_strdup(cod->bd, opt->args_sig_file);
 
-		i->on_edit = cui_ked_run;
-		i->on_execute = cui_run_kexec;
-		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->kd = talloc(i, struct pb_kexec_data);
-
-		cod->kd->image = talloc_strdup(cod->kd, opt->boot_image_file);
-		cod->kd->initrd = talloc_strdup(cod->kd, opt->initrd_file);
-		cod->kd->args = talloc_strdup(cod->kd, opt->boot_args);
-
-		name = cui_make_item_name(i, cod);
-		pmenu_item_setup(cui->main, i, insert_pt, name);
-
-		insert_pt++;
-
-		pb_log("%s: adding opt '%s'\n", __func__, cod->name);
-		pb_log("   image  '%s'\n", cod->kd->image);
-		pb_log("   initrd '%s'\n", cod->kd->initrd);
-		pb_log("   args   '%s'\n", cod->kd->args);
+	/* This disconnects items array from menu. */
+	result = set_menu_items(cui->main->ncm, NULL);
 
-		/* If this is the default_item select it and start timer. */
+	if (result)
+		pb_log("%s: set_menu_items failed: %d\n", __func__, result);
 
-		if (cod->opt_hash == cui->default_item) {
-			selected = i->nci;
-			ui_timer_kick(&cui->timer);
-		}
+	/* Insert new items at insert_pt. */
+	if (dev_hdr) {
+		insert_pt = pmenu_grow(cui->main, 2);
+		pmenu_item_insert(cui->main, dev_hdr, insert_pt);
+		pb_log("%s: adding new device hierarchy %s\n",
+			__func__,opt->device_id);
+		pmenu_item_insert(cui->main, i, insert_pt+1);
+	} else {
+		insert_pt = pmenu_grow(cui->main, 1);
+		pmenu_item_add(cui->main, i, insert_pt);
 	}
 
-	/* Re-attach the items array. */
+	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);
+	pb_log("   argsig '%s'\n", cod->bd->args_sig_file);
 
+	/* Re-attach the items array. */
 	result = set_menu_items(cui->main->ncm, cui->main->items);
 
 	if (result)
@@ -451,13 +581,23 @@ static int cui_device_add(struct device *dev, void *arg)
 			item_count(cui->main->ncm) + 1);
 	}
 
-	/* FIXME: need to make item visible somehow */
-	menu_driver(cui->main->ncm, REQ_SCR_UPAGE);
-	menu_driver(cui->main->ncm, REQ_SCR_DPAGE);
-	set_current_item(cui->main->ncm, selected);
+	if (!item_visible(selected)) {
+		int idx, top;
+
+		top = top_row(cui->main->ncm);
+		idx = item_index(selected);
+
+		/* If our index is above the current top row, align
+		 * us to the new top. Otherwise, align us to the new
+		 * bottom */
+		top = top < idx ? idx - rows + 1 : idx;
+
+		set_top_row(cui->main->ncm, top);
+		set_current_item(cui->main->ncm, selected);
+	}
 
 	if (cui->current == &cui->main->scr)
-		cui->current->post(cui->current);
+		nc_scr_post(cui->current);
 
 	return 0;
 }
@@ -472,13 +612,15 @@ static int cui_device_add(struct device *dev, void *arg)
 static void cui_device_remove(struct device *dev, void *arg)
 {
 	struct cui *cui = cui_from_arg(arg);
-	int result;
 	struct boot_option *opt;
+	unsigned int i;
+	int rows, cols, top, last;
+	int result;
 
 	pb_log("%s: %p %s\n", __func__, dev, dev->id);
 
 	if (cui->current == &cui->main->scr)
-		cui->current->unpost(cui->current);
+		nc_scr_unpost(cui->current);
 
 	/* This disconnects items array from menu. */
 
@@ -488,22 +630,36 @@ static void cui_device_remove(struct device *dev, void *arg)
 		pb_log("%s: set_menu_items failed: %d\n", __func__, result);
 
 	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);
+		struct pmenu_item *item = pmenu_item_from_arg(opt->ui_info);
 
-		assert(pb_protocol_device_cmp(dev, cod->dev));
-		pmenu_remove(cui->main, i);
+		assert(pb_protocol_device_cmp(dev, cod_from_item(item)->dev));
+		pmenu_remove(cui->main, item);
+	}
 
-		/* If this is the default_item disable timer. */
+	/* Manually remove remaining device hierarchy item */
+	for (i=0; i < cui->main->item_count; i++) {
+		struct pmenu_item *item = item_userptr(cui->main->items[i]);
+		if (!item || !item->data )
+			continue;
 
-		if (cod->opt_hash == cui->default_item)
-			ui_timer_disable(&cui->timer);
+		struct cui_opt_data *data = item->data;
+		if (data && data->dev && data->dev == dev)
+			pmenu_remove(cui->main,item);
 	}
 
 	/* Re-attach the items array. */
 
 	result = set_menu_items(cui->main->ncm, cui->main->items);
 
+	/* Move cursor to 'Exit' menu entry */
+	menu_format(cui->main->ncm, &rows, &cols);
+	last = cui->main->item_count - 1;
+	set_current_item(cui->main->ncm, cui->main->items[last]);
+	if (!item_visible(cui->main->items[last])) {
+		top = last < rows ? 0 : last - rows + 1;
+		set_top_row(cui->main->ncm, top);
+	}
+
 	if (result)
 		pb_log("%s: set_menu_items failed: %d\n", __func__, result);
 
@@ -514,14 +670,281 @@ static void cui_device_remove(struct device *dev, void *arg)
 	}
 
 	if (cui->current == &cui->main->scr)
-		cui->current->post(cui->current);
+		nc_scr_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)
+		nc_scr_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);
+
+	/* if we're currently displaying the system info screen, inform it
+	 * of the updated information. */
+	if (cui->sysinfo_screen)
+		sysinfo_screen_update(cui->sysinfo_screen, sysinfo);
+
+	if (cui->subset_screen)
+		subset_screen_update(cui->subset_screen);
+
+	/* ... and do the same with the config screen... */
+	if (cui->config_screen)
+		config_screen_update(cui->config_screen, cui->config, sysinfo);
+
+	/* ... and the boot editor. */
+	if (cui->boot_editor)
+		boot_editor_update(cui->boot_editor, sysinfo);
+
+	cui_update_mm_title(cui);
+}
+
+static void cui_update_language(struct cui *cui, char *lang)
+{
+	bool repost_menu;
+	char *cur_lang;
+
+	cur_lang = setlocale(LC_ALL, NULL);
+	if (cur_lang && !strcmp(cur_lang, lang))
+		return;
+
+	setlocale(LC_ALL, lang);
+
+	/* we'll need to update the menu: drop all items and repopulate */
+	repost_menu = cui->current == &cui->main->scr;
+	if (repost_menu)
+		nc_scr_unpost(cui->current);
+
+	talloc_free(cui->main);
+	cui->main = main_menu_init(cui);
+
+	if (repost_menu) {
+		cui->current = &cui->main->scr;
+		nc_scr_post(cui->current);
+	}
+
+	discover_client_enumerate(cui->client);
+}
+
+static void cui_update_config(struct config *config, void *arg)
+{
+	struct cui *cui = cui_from_arg(arg);
+	cui->config = talloc_steal(cui, config);
+
+	if (config->lang)
+		cui_update_language(cui, config->lang);
+
+	if (cui->subset_screen)
+		subset_screen_update(cui->subset_screen);
+
+	if (cui->config_screen)
+		config_screen_update(cui->config_screen, config, cui->sysinfo);
+
+	if (config->safe_mode)
+		nc_scr_status_printf(cui->current,
+				_("SAFE MODE: select '%s' to continue"),
+				_("Rescan devices"));
+}
+
+int cui_send_config(struct cui *cui, struct config *config)
+{
+	return discover_client_send_config(cui->client, config);
+}
+
+int cui_send_url(struct cui *cui, char * url)
+{
+	return discover_client_send_url(cui->client, url);
+}
+
+void cui_send_reinit(struct cui *cui)
+{
+	discover_client_send_reinit(cui->client);
+}
+
+static int menu_sysinfo_execute(struct pmenu_item *item)
+{
+	cui_show_sysinfo(cui_from_item(item));
+	return 0;
+}
+
+static int menu_config_execute(struct pmenu_item *item)
+{
+	cui_show_config(cui_from_item(item));
+	return 0;
+}
+
+static int menu_lang_execute(struct pmenu_item *item)
+{
+	cui_show_lang(cui_from_item(item));
+	return 0;
+}
+
+static int menu_reinit_execute(struct pmenu_item *item)
+{
+	if (cui_from_item(item)->client)
+		cui_send_reinit(cui_from_item(item));
+	return 0;
+}
+
+static int menu_add_url_execute(struct pmenu_item *item)
+{
+	if (cui_from_item(item)->client)
+		cui_show_add_url(cui_from_item(item));
+	return 0;
+}
+
+/**
+ * pb_mm_init - Setup the main menu instance.
+ */
+static struct pmenu *main_menu_init(struct cui *cui)
+{
+	struct pmenu_item *i;
+	struct pmenu *m;
+	int result;
+
+	m = pmenu_init(cui, 7, 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, l=language, h=help"));
+	m->scr.frame.status = talloc_strdup(m, _("Welcome to Petitboot"));
+
+	/* add a separator */
+	i = pmenu_item_create(m, " ");
+	item_opts_off(i->nci, O_SELECTABLE);
+	pmenu_item_insert(m, i, 0);
+
+	/* add system items */
+	i = pmenu_item_create(m, _("System information"));
+	i->on_execute = menu_sysinfo_execute;
+	pmenu_item_insert(m, i, 1);
+
+	i = pmenu_item_create(m, _("System configuration"));
+	i->on_execute = menu_config_execute;
+	pmenu_item_insert(m, i, 2);
+
+	/* this label isn't translated, so we don't want a gettext() here */
+	i = pmenu_item_create(m, "Language");
+	i->on_execute = menu_lang_execute;
+	pmenu_item_insert(m, i, 3);
+
+	i = pmenu_item_create(m, _("Rescan devices"));
+	i->on_execute = menu_reinit_execute;
+	pmenu_item_insert(m, i, 4);
+
+	i = pmenu_item_create(m, _("Retrieve config from URL"));
+	i->on_execute = menu_add_url_execute;
+	pmenu_item_insert(m, i, 5);
+
+	i = pmenu_item_create(m, _("Exit to shell"));
+	i->on_execute = pmenu_exit_cb;
+	pmenu_item_insert(m, i, 6);
+
+	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 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,
+	.update_config = cui_update_config,
 };
 
+/* cui_server_wait - Connect to the discover server.
+ * @arg: Pointer to the cui instance.
+ *
+ * A timeout callback that attempts to connect to the discover server; on
+ * failure it registers itself with a one second timeout to try again.
+ * On success the cui->client struct will be set.
+ *
+ * Since this updates the status line when called it must not be called
+ * before the UI is ready.
+ */
+static int cui_server_wait(void *arg)
+{
+	struct cui *cui = cui_from_arg(arg);
+
+	if (cui->client) {
+		pb_debug("We already have a server!\n");
+		return 0;
+	}
+
+	/* We haven't yet connected to the server */
+	pb_log("Trying to connect...\n");
+	cui->client = discover_client_init(cui->waitset,
+			&cui_client_ops, cui);
+
+	if (!cui->client) {
+		waiter_register_timeout(cui->waitset, 1000, cui_server_wait,
+					cui);
+		nc_scr_status_printf(cui->current, "Info: Waiting for server");
+	} else {
+		nc_scr_status_printf(cui->current, "Info: Connected to server!");
+		talloc_steal(cui, cui->client);
+
+		if (cui->has_input) {
+			pb_log("Aborting default boot on server connect\n");
+			discover_client_cancel_default(cui->client);
+		}
+	}
+
+	return 0;
+}
+
 /**
  * cui_init - Setup the cui instance.
  * @platform_info: A value for the struct cui platform_info member.
@@ -533,79 +956,86 @@ 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 (*js_map)(const struct js_event *e), int start_daemon, int timeout)
 {
 	struct cui *cui;
-	struct discover_client *client;
 	unsigned int i;
 
 	cui = talloc_zero(NULL, struct cui);
-
 	if (!cui) {
 		pb_log("%s: alloc cui failed.\n", __func__);
-		fprintf(stderr, "%s: alloc cui failed.\n", __func__);
+		fprintf(stderr, _("%s: alloc cui failed.\n"), __func__);
 		goto fail_alloc;
 	}
 
 	cui->c_sig = pb_cui_sig;
 	cui->platform_info = platform_info;
-	cui->on_kexec = on_kexec;
-	cui->timer.handle_timeout = cui_handle_timeout;
+	cui->waitset = waitset_create(cui);
+
+	process_init(cui, cui->waitset, false);
 
 	/* Loop here for scripts that just started the server. */
 
-start_deamon:
-	for (i = 10; i; i--) {
-		client = discover_client_init(&cui_client_ops, cui);
-		if (client)
+retry_start:
+	for (i = start_daemon ? 2 : 15; i && timeout; 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_daemon) {
 		int result;
 
-		start_deamon = 0;
+		start_daemon = 0;
 
-		result = pb_start_daemon();
+		result = pb_start_daemon(cui);
 
 		if (!result)
-			goto start_deamon;
+			goto retry_start;
 
 		pb_log("%s: discover_client_init failed.\n", __func__);
-		fprintf(stderr, "%s: error: discover_client_init failed.\n",
+		fprintf(stderr, _("%s: error: discover_client_init failed.\n"),
 			__func__);
-		fprintf(stderr, "could not start pb-discover, the petitboot "
-			"daemon.\n");
+		fprintf(stderr, _("could not start pb-discover, the petitboot "
+			"daemon.\n"));
 		goto fail_client_init;
 	}
 
-	if (!client) {
+	if (!cui->client && !timeout) {
+		/* Have the first timeout fire immediately so we can check
+		 * for the server as soon as the UI is ready */
+		waiter_register_timeout(cui->waitset, 0,
+					cui_server_wait, cui);
+	} else if (!cui->client) {
 		pb_log("%s: discover_client_init failed.\n", __func__);
-		fprintf(stderr, "%s: error: discover_client_init failed.\n",
+		fprintf(stderr, _("%s: error: discover_client_init failed.\n"),
 			__func__);
-		fprintf(stderr, "check that pb-discover, "
-			"the petitboot daemon is running.\n");
+		fprintf(stderr, _("check that pb-discover, "
+			"the petitboot daemon is running.\n"));
 		goto fail_client_init;
 	}
 
-	atexit(nc_atexit);
-	nc_start();
+	atexit(cui_atexit);
+	talloc_steal(cui, cui->client);
+	cui_start();
 
-	waiter_register(discover_client_get_fd(client), WAIT_IN,
-		cui_client_process_socket, client);
+	cui->main = main_menu_init(cui);
+	if (!cui->main)
+		goto fail_client_init;
 
-	waiter_register(STDIN_FILENO, WAIT_IN, cui_process_key, cui);
+	waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,
+			cui_process_key, cui);
 
 	if (js_map) {
 
 		cui->pjs = pjs_init(cui, js_map);
 
 		if (cui->pjs)
-			waiter_register(pjs_get_fd(cui->pjs), WAIT_IN,
-				cui_process_js, cui);
+			waiter_register_io(cui->waitset, pjs_get_fd(cui->pjs),
+					WAIT_IN, cui_process_js, cui);
 	}
 
 	return cui;
@@ -626,20 +1056,19 @@ fail_alloc:
  * Returns 0 on success (return to shell), -1 on error (should restart).
  */
 
-int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item)
+int cui_run(struct cui *cui)
 {
 	assert(main);
 
-	cui->main = main;
 	cui->current = &cui->main->scr;
-	cui->default_item = default_item;
+	cui->default_item = 0;
 
-	cui->current->post(cui->current);
+	nc_scr_post(cui->current);
 
 	while (1) {
-		int result = waiter_poll();
+		int result = waiter_poll(cui->waitset);
 
-		if (result < 0 && errno != EINTR) {
+		if (result < 0) {
 			pb_log("%s: poll: %s\n", __func__, strerror(errno));
 			break;
 		}
@@ -647,15 +1076,13 @@ 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);
 		}
 	}
 
-	nc_atexit();
+	cui_atexit();
 
 	return cui->abort ? 0 : -1;
 }