X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=fd90419bcbc99eabd417cc78bd93c2b6d5d081c1;hb=f7ace4cc96390a26b0f6c5ee4ff8fe6d7d62ecd0;hp=e3422734ebd06d83ec30415b8012c89beb54435a;hpb=66bf929fa97fabb70198455f9eec2e9ccf0661fa;p=petitboot

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index e342273..fd90419 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -38,6 +38,7 @@
 #include "nc-boot-editor.h"
 #include "nc-config.h"
 #include "nc-sysinfo.h"
+#include "nc-helpscreen.h"
 
 static void cui_start(void)
 {
@@ -246,6 +247,28 @@ void cui_show_config(struct cui *cui)
 	cui_set_current(cui, config_screen_scr(cui->config_screen));
 }
 
+static void cui_help_exit(struct cui *cui)
+{
+	cui_set_current(cui, help_screen_return_scr(cui->help_screen));
+	talloc_free(cui->help_screen);
+	cui->help_screen = NULL;
+}
+
+void cui_show_help(struct cui *cui, const char *title, const char *text)
+{
+	if (!cui->current)
+		return;
+
+	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));
+}
+
 /**
  * cui_set_current - Set the currently active screen and redraw it.
  */
@@ -367,13 +390,14 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
 	struct cui *cui = cui_from_arg(arg);
 	struct cui_opt_data *cod;
 	unsigned int insert_pt;
+	int result, rows, cols;
 	struct pmenu_item *i;
 	ITEM *selected;
-	int result;
 
 	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)
 		nc_scr_unpost(cui->current);
@@ -426,10 +450,20 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
 			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 : idx;
+
+		set_top_row(cui->main->ncm, top);
+		set_current_item(cui->main->ncm, selected);
+	}
 
 	if (cui->current == &cui->main->scr)
 		nc_scr_post(cui->current);