X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-config.c;h=e7451bb5dc08fda57d54cd9a73e9bbcd32a60711;hp=2750bbb7719189de934b9716e5eb952d7d09e06c;hb=32d3249e252fe201eb81155cbf3b800ce5cf88e0;hpb=b6f99a457cb906277b172a0332a1e16ddba99228

diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index 2750bbb..e7451bb 100644
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -33,7 +33,7 @@
 #include "nc-config.h"
 #include "nc-widgets.h"
 
-#define N_FIELDS	34
+#define N_FIELDS	37
 
 extern struct help_text config_help_text;
 
@@ -96,6 +96,9 @@ struct config_screen {
 		struct nc_widget_label		*gateway_l;
 		struct nc_widget_textbox	*gateway_f;
 		struct nc_widget_label		*gateway_help_l;
+		struct nc_widget_label		*url_l;
+		struct nc_widget_textbox	*url_f;
+		struct nc_widget_label		*url_help_l;
 		struct nc_widget_label		*dns_l;
 		struct nc_widget_textbox	*dns_f;
 		struct nc_widget_label		*dns_dhcp_help_l;
@@ -274,11 +277,12 @@ static int screen_process_form(struct config_screen *screen)
 	}
 
 	if (net_conf_type == NET_CONF_TYPE_STATIC) {
-		char *ip, *mask, *gateway;
+		char *ip, *mask, *gateway, *url;
 
 		ip = widget_textbox_get_value(screen->widgets.ip_addr_f);
 		mask = widget_textbox_get_value(screen->widgets.ip_mask_f);
 		gateway = widget_textbox_get_value(screen->widgets.gateway_f);
+		url = widget_textbox_get_value(screen->widgets.url_f);
 
 		if (!ip || !*ip || !mask || !*mask) {
 			screen->scr.frame.status =
@@ -292,6 +296,7 @@ static int screen_process_form(struct config_screen *screen)
 		iface->static_config.address = talloc_asprintf(iface, "%s/%s",
 				ip, mask);
 		iface->static_config.gateway = talloc_strdup(iface, gateway);
+		iface->static_config.url = talloc_strdup(iface, url);
 	}
 
 	str = widget_textbox_get_value(screen->widgets.dns_f);
@@ -510,6 +515,19 @@ static void config_screen_layout_widgets(struct config_screen *screen)
 		y++;
 	}
 
+	wl = widget_label_base(screen->widgets.url_l);
+	wf = widget_textbox_base(screen->widgets.url_f);
+	wh = widget_label_base(screen->widgets.url_help_l);
+	widget_set_visible(wl, show);
+	widget_set_visible(wf, show);
+	widget_set_visible(wh, show);
+
+	if (show) {
+		layout_pair(screen, y, screen->widgets.url_l, wf);
+		widget_move(wh, y, help_x);
+		y++;
+	}
+
 	wh = widget_label_base(screen->widgets.dns_help_l);
 	layout_pair(screen, y, screen->widgets.dns_l,
 			widget_textbox_base(screen->widgets.dns_f));
@@ -693,7 +711,7 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 {
 	struct nc_widgetset *set = screen->widgetset;
 	struct interface_config *ifcfg;
-	char *str, *ip, *mask, *gw;
+	char *str, *ip, *mask, *gw, *url;
 	enum net_conf_type type;
 	unsigned int i;
 	int add_len, clear_len, any_len, min_len = 20;
@@ -849,7 +867,7 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 						i, str, is_default);
 	}
 
-	gw = ip = mask = NULL;
+	url = gw = ip = mask = NULL;
 	if (ifcfg && ifcfg->method == CONFIG_METHOD_STATIC) {
 		char *sep;
 
@@ -862,6 +880,7 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 			mask = sep + 1;
 		}
 		gw = ifcfg->static_config.gateway;
+		url = ifcfg->static_config.url;
 	}
 
 	screen->widgets.ip_addr_l = widget_new_label(set, 0, 0, _("IP/mask:"));
@@ -884,6 +903,11 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 	widget_textbox_set_fixed_size(screen->widgets.gateway_f);
 	widget_textbox_set_validator_ipv4(screen->widgets.gateway_f);
 
+	screen->widgets.url_l = widget_new_label(set, 0, 0, _("URL:"));
+	screen->widgets.url_f = widget_new_textbox(set, 0, 0, 32, url);
+	screen->widgets.url_help_l =
+		widget_new_label(set, 0, 0, _("(eg. tftp://)"));
+
 	str = talloc_strdup(screen, "");
 	for (i = 0; i < config->network.n_dns_servers; i++) {
 		str = talloc_asprintf_append(str, "%s%s",
@@ -930,18 +954,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);