X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=3f82f85fe1bbe1fbba70f362afcc698535514c5f;hp=d091331b9656ce1a5635f08b73d64fd5b0e5fcbc;hb=947cab5c30ae89d78dff998f87b57fec91b69023;hpb=9168031edb7affc437928a9123faf8fcbddf5d2a

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index d091331..3f82f85 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <locale.h>
 #include <sys/ioctl.h>
 
 #include "log/log.h"
@@ -158,6 +159,7 @@ static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_e
 		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(" dtb    '%s'\n", cod->bd->dtb);
 		pb_log(" args   '%s'\n", cod->bd->args);
 	}
 
@@ -222,7 +224,10 @@ static int cui_process_key(void *arg)
 
 	assert(cui->current);
 
-	ui_timer_disable(&cui->timer);
+	if (!cui->has_input)
+		discover_client_cancel_default(cui->client);
+	cui->has_input = true;
+
 	for (;;) {
 		int c = getch();
 
@@ -257,24 +262,6 @@ static int cui_process_js(void *arg)
 	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.
  */
@@ -390,6 +377,7 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
 
 	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);
 
 	pmenu_item_setup(cui->main, i, insert_pt, cod->name);
@@ -399,12 +387,6 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
 	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);
-	}
-
 	/* Re-attach the items array. */
 	result = set_menu_items(cui->main->ncm, cui->main->items);
 
@@ -455,15 +437,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. */
@@ -527,9 +503,10 @@ struct cui *cui_init(void* platform_info,
 
 	cui->c_sig = pb_cui_sig;
 	cui->platform_info = platform_info;
-	cui->timer.handle_timeout = cui_handle_timeout;
 	cui->waitset = waitset_create(cui);
 
+	setlocale(LC_ALL, "");
+
 	/* Loop here for scripts that just started the server. */
 
 retry_start:
@@ -572,7 +549,7 @@ retry_start:
 	atexit(nc_atexit);
 	nc_start();
 
-	waiter_register(cui->waitset, STDIN_FILENO, WAIT_IN,
+	waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,
 			cui_process_key, cui);
 
 	if (js_map) {
@@ -580,7 +557,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);
 	}
 
@@ -623,8 +600,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);