X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=5f1a5e4433555b4cb742ed2e2e3341a86760dba8;hp=93377bb56f94584d88e732999fedaed908b86f5d;hb=40d57bee5cf77d836f2d68c440a875fe770cc250;hpb=663197d945b6e393c1237c6b2b25f11567a449d7

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 93377bb..5f1a5e4 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -33,15 +33,12 @@
 #include "waiter/waiter.h"
 #include "process/process.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-sysinfo.h"
 
-static struct cui_opt_data *cod_from_item(struct pmenu_item *item)
-{
-	return item->data;
-}
-
 static void cui_start(void)
 {
 	initscr();			/* Initialize ncurses. */
@@ -147,13 +144,8 @@ static int cui_boot(struct pmenu_item *item)
 
 	nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
 
-	def_prog_mode();
-
 	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);
@@ -162,29 +154,23 @@ static int cui_boot(struct pmenu_item *item)
 	return 0;
 }
 
-/**
- * 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,
+static void cui_boot_editor_on_exit(struct cui *cui,
+		struct pmenu_item *item,
 		struct pb_boot_data *bd)
 {
-	struct cui *cui = cui_from_pmenu(boot_editor->original_pmenu);
-	struct pmenu_item *item = boot_editor->data;
+	struct pmenu *menu = cui->main;
 	struct cui_opt_data *cod;
 
-	if (boot_editor_result != boot_editor_update) {
+	/* Was the edit cancelled? */
+	if (!bd) {
 		cui_set_current(cui, &cui->main->scr);
-		talloc_free(boot_editor);
+		talloc_free(cui->boot_editor);
+		cui->boot_editor = NULL;
 		return;
 	}
 
-	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;
 
 		/* Detach the items array. */
@@ -210,32 +196,26 @@ static void cui_boot_editor_on_exit(struct boot_editor *boot_editor,
 
 	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);
+	talloc_free(cui->boot_editor);
+	cui->boot_editor = NULL;
 }
 
 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(item->pmenu, cod->bd,
-			cui_boot_editor_on_exit);
-	boot_editor->data = item;
-	cui_set_current(cui, &boot_editor->scr);
+	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));
 }
 
 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);
+	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));
 }
 
 static void cui_sysinfo_exit(struct cui *cui)
@@ -542,6 +522,14 @@ static void cui_update_sysinfo(struct system_info *sysinfo, void *arg)
 	if (cui->sysinfo_screen)
 		sysinfo_screen_update(cui->sysinfo_screen, sysinfo);
 
+	/* ... 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);
 }
 
@@ -549,6 +537,9 @@ static void cui_update_config(struct config *config, void *arg)
 {
 	struct cui *cui = cui_from_arg(arg);
 	cui->config = talloc_steal(cui, config);
+
+	if (cui->config_screen)
+		config_screen_update(cui->config_screen, config, cui->sysinfo);
 }
 
 int cui_send_config(struct cui *cui, struct config *config)