X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-subset.c;h=50e1b6521c6565135833799c9f5da7f110bf54ac;hp=f38e3949b5561ea3105c8df869af9fe78b03a901;hb=bab3856dae51d103d3859ec790fdc00b1f7fb0d1;hpb=f0ab23af1b0758b6ff984ba26a2cd7dbf25ea775

diff --git a/ui/ncurses/nc-subset.c b/ui/ncurses/nc-subset.c
index f38e394..50e1b65 100644
--- a/ui/ncurses/nc-subset.c
+++ b/ui/ncurses/nc-subset.c
@@ -62,6 +62,12 @@ struct nc_scr *subset_screen_return_scr(struct subset_screen *screen)
 	return screen->return_scr;
 }
 
+void subset_screen_update(struct subset_screen *screen)
+{
+	pb_debug("Exiting subset due to update\n");
+	return screen->on_exit(screen->cui);
+}
+
 static struct subset_screen *subset_screen_from_scr(struct nc_scr *scr)
 {
 	struct subset_screen *subset_screen;
@@ -216,8 +222,11 @@ static void subset_screen_draw(struct subset_screen *screen)
 	bool repost = false;
 	int height;
 
-	/* Size of pad = top space + number of available options */
-	height = 1 + N_FIELDS + widget_subset_n_inactive(screen->options);
+	/*
+	 * Size of pad = top space + 2 * number of available options in case
+	 * device names wrap
+	 */
+	height = 1 + N_FIELDS + widget_subset_n_inactive(screen->options) * 2;
 
 	if (!screen->pad || getmaxy(screen->pad) < height) {
 		if (screen->pad)
@@ -279,7 +288,7 @@ struct subset_screen *subset_screen_init(struct cui *cui,
 			title_suffix);
 	screen->scr.frame.rtitle = NULL;
 	screen->scr.frame.help = talloc_strdup(screen,
-			_("tab=next, shift+tab=previous, x=exit"));
+			_("tab=next, shift+tab=previous, x=exit, h=help"));
 
 	scrollok(screen->scr.sub_ncw, true);