X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=1acc2f0bd0a76e57d6d8e6deb6b066fffcd87594;hp=3f8995eba809c92b46417e2c70be529dbab2fdc5;hb=c11bcba9a99e858e618f4d872a5be7d52dcaaa5a;hpb=a610837ff38f5cc80bcbad465a80ab920e67927d

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 3f8995e..1acc2f0 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -158,6 +158,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);
 	}
 
@@ -199,6 +200,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.
  */
@@ -209,13 +223,19 @@ 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();
 
 		if (c == ERR)
 			break;
 
+		if (process_global_keys(cui, c))
+			continue;
+
 		cui->current->process_key(cui->current, c);
 	}
 
@@ -241,24 +261,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.
  */
@@ -374,6 +376,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);
@@ -383,12 +386,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);
 
@@ -443,11 +440,6 @@ static void cui_device_remove(struct device *dev, void *arg)
 
 		assert(pb_protocol_device_cmp(dev, cod->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. */
@@ -511,7 +503,6 @@ 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);
 
 	/* Loop here for scripts that just started the server. */
@@ -556,7 +547,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) {
@@ -564,7 +555,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);
 	}
 
@@ -607,8 +598,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);