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

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index da97fd9..5f41196 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -34,12 +34,42 @@
 #include "process/process.h"
 #include "ui/common/discover-client.h"
 #include "nc-cui.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. */
+	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);
+
+	while (getch() != ERR)		/* flush stdin */
+		(void)0;
+}
+
+static void cui_atexit(void)
+{
+	clear();
+	refresh();
+	endwin();
+}
+
 /**
  * cui_abort - Signal the main cui program loop to exit.
  *
@@ -60,7 +90,7 @@ 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;
 }
 
@@ -112,7 +142,7 @@ static int cui_boot(struct pmenu_item *item)
 
 	assert(cui->current == &cui->main->scr);
 
-	pb_log("%s: %s\n", __func__, cod->name);
+	pb_debug("%s: %s\n", __func__, cod->name);
 
 	nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
 
@@ -172,7 +202,7 @@ static void cui_boot_editor_on_exit(struct boot_editor *boot_editor,
 
 		/* Re-attach the items array. */
 		set_menu_items(menu->ncm, menu->items);
-		menu->scr.post(&menu->scr);
+		nc_scr_post(&menu->scr);
 	} else {
 		cod = item->data;
 	}
@@ -207,6 +237,20 @@ void cui_item_new(struct pmenu *menu)
 	cui_set_current(cui, &boot_editor->scr);
 }
 
+static void cui_sysinfo_exit(struct cui *cui)
+{
+	cui_set_current(cui, &cui->main->scr);
+	talloc_free(cui->sysinfo_screen);
+	cui->sysinfo_screen = NULL;
+}
+
+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));
+}
+
 /**
  * cui_set_current - Set the currently active screen and redraw it.
  */
@@ -220,10 +264,11 @@ 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;
 }
@@ -302,7 +347,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);
@@ -331,12 +376,12 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
 	ITEM *selected;
 	int result;
 
-	pb_log("%s: %p %s\n", __func__, opt, opt->id);
+	pb_debug("%s: %p %s\n", __func__, opt, opt->id);
 
 	selected = current_item(cui->main->ncm);
 
 	if (cui->current == &cui->main->scr)
-		cui->current->unpost(cui->current);
+		nc_scr_unpost(cui->current);
 
 	/* This disconnects items array from menu. */
 
@@ -392,7 +437,7 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
 	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;
 }
@@ -413,7 +458,7 @@ static void cui_device_remove(struct device *dev, void *arg)
 	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. */
 
@@ -443,7 +488,7 @@ 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)
@@ -469,13 +514,19 @@ static void cui_update_mm_title(struct cui *cui)
 				" %s", cui->sysinfo->identifier);
 
 	if (cui->current == &cui->main->scr)
-		cui->current->post(cui->current);
+		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);
+
 	cui_update_mm_title(cui);
 }
 
@@ -558,8 +609,8 @@ retry_start:
 		goto fail_client_init;
 	}
 
-	atexit(nc_atexit);
-	nc_start();
+	atexit(cui_atexit);
+	cui_start();
 
 	waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,
 			cui_process_key, cui);
@@ -599,7 +650,7 @@ int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item)
 	cui->current = &cui->main->scr;
 	cui->default_item = default_item;
 
-	cui->current->post(cui->current);
+	nc_scr_post(cui->current);
 
 	while (1) {
 		int result = waiter_poll(cui->waitset);
@@ -618,7 +669,7 @@ int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item)
 		}
 	}
 
-	nc_atexit();
+	cui_atexit();
 
 	return cui->abort ? 0 : -1;
 }