X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-config.c;h=64fb4c792139d71dc0891dda330752b2427dc272;hp=b257076d03b2f50be229b2a51a718abe8a8822e7;hb=5acb43464206348b7cced9508852fdd2989aea58;hpb=72148c718113a17d80fd1da3c8dd82b471bed07a;ds=sidebyside

diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index b257076..64fb4c7 100644
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -53,6 +53,7 @@ struct config_screen {
 	bool			show_help;
 	bool			show_subset;
 	bool			need_redraw;
+	bool			need_update;
 
 	void			(*on_exit)(struct cui *);
 
@@ -170,21 +171,6 @@ static void config_screen_resize(struct nc_scr *scr)
 	(void)screen;
 }
 
-static int config_screen_post(struct nc_scr *scr)
-{
-	struct config_screen *screen = config_screen_from_scr(scr);
-	screen->show_subset = false;
-	widgetset_post(screen->widgetset);
-	nc_scr_frame_draw(scr);
-	if (screen->need_redraw) {
-		redrawwin(scr->main_ncw);
-		screen->need_redraw = false;
-	}
-	wrefresh(screen->scr.main_ncw);
-	pad_refresh(screen);
-	return 0;
-}
-
 static int config_screen_unpost(struct nc_scr *scr)
 {
 	struct config_screen *screen = config_screen_from_scr(scr);
@@ -825,7 +811,8 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 	}
 
 	screen->widgets.network_l = widget_new_label(set, 0, 0, _("Network:"));
-	screen->widgets.network_f = widget_new_select(set, 0, 0, 50);
+	screen->widgets.network_f = widget_new_select(set, 0, 0,
+						COLS - screen->field_x - 1);
 
 	widget_select_add_option(screen->widgets.network_f,
 					NET_CONF_TYPE_DHCP_ALL,
@@ -922,11 +909,12 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 	screen->widgets.allow_write_l = widget_new_label(set, 0, 0,
 			_("Disk R/W:"));
 	screen->widgets.allow_write_f = widget_new_select(set, 0, 0,
-						COLS - screen->field_x);
+						COLS - screen->field_x - 1);
 
 	widget_select_add_option(screen->widgets.allow_write_f, 0,
 				_("Prevent all writes to disk"),
 				!config->allow_writes);
+
 	widget_select_add_option(screen->widgets.allow_write_f, 1,
 				_("Allow bootloader scripts to modify disks"),
 				config->allow_writes);
@@ -942,18 +930,22 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 static void config_screen_widget_focus(struct nc_widget *widget, void *arg)
 {
 	struct config_screen *screen = arg;
-	int w_y, s_max;
+	int w_y, w_height, w_focus, s_max, adjust;
 
-	w_y = widget_y(widget) + widget_focus_y(widget);
+	w_height = widget_height(widget);
+	w_focus = widget_focus_y(widget);
+	w_y = widget_y(widget) + w_focus;
 	s_max = getmaxy(screen->scr.sub_ncw) - 1;
 
 	if (w_y < screen->scroll_y)
 		screen->scroll_y = w_y;
 
-	else if (w_y + screen->scroll_y + 1 > s_max)
-		screen->scroll_y = 1 + w_y - s_max;
-
-	else
+	else if (w_y + screen->scroll_y + 1 > s_max) {
+		/* Fit as much of the widget into the screen as possible */
+		adjust = min(s_max - 1, w_height - w_focus);
+		if (w_y + adjust >= screen->scroll_y + s_max)
+			screen->scroll_y = max(0, 1 + w_y + adjust - s_max);
+	} else
 		return;
 
 	pad_refresh(screen);
@@ -1014,10 +1006,38 @@ void config_screen_update(struct config_screen *screen,
 		const struct config *config,
 		const struct system_info *sysinfo)
 {
+	if (screen->cui->current != config_screen_scr(screen)) {
+		screen->need_update = true;
+		return;
+	}
+
 	config_screen_draw(screen, config, sysinfo);
 	pad_refresh(screen);
 }
 
+static int config_screen_post(struct nc_scr *scr)
+{
+	struct config_screen *screen = config_screen_from_scr(scr);
+	screen->show_subset = false;
+
+	if (screen->need_update) {
+		config_screen_draw(screen, screen->cui->config,
+				   screen->cui->sysinfo);
+		screen->need_update = false;
+	} else {
+		widgetset_post(screen->widgetset);
+	}
+
+	nc_scr_frame_draw(scr);
+	if (screen->need_redraw) {
+		redrawwin(scr->main_ncw);
+		screen->need_redraw = false;
+	}
+	wrefresh(screen->scr.main_ncw);
+	pad_refresh(screen);
+	return 0;
+}
+
 static int config_screen_destroy(void *arg)
 {
 	struct config_screen *screen = arg;
@@ -1043,6 +1063,7 @@ struct config_screen *config_screen_init(struct cui *cui,
 	screen->cui = cui;
 	screen->on_exit = on_exit;
 	screen->need_redraw = false;
+	screen->need_update = false;
 	screen->label_x = 2;
 	screen->field_x = 17;