X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-config.c;h=3107c72bddfa966caaeefe4044f8ec31bf9e9a2e;hb=71f338ca02092cb75608a511d6885affaf7adb66;hp=9cc6a29085ff3e4b21b14d3bb11ed4ec689e6763;hpb=7f7e3688f3285ea803a5579b240cff54958e16e2;p=petitboot

diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index 9cc6a29..3107c72 100644
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -32,7 +32,9 @@
 #include "nc-config.h"
 #include "nc-widgets.h"
 
-#define N_FIELDS	23
+#define N_FIELDS	24
+
+extern const char *config_help_text;
 
 enum net_conf_type {
 	NET_CONF_TYPE_DHCP_ALL,
@@ -47,6 +49,7 @@ struct config_screen {
 	WINDOW			*pad;
 
 	bool			exit;
+	bool			show_help;
 	void			(*on_exit)(struct cui *);
 
 	int			scroll_y;
@@ -83,6 +86,7 @@ struct config_screen {
 		struct nc_widget_label		*dns_help_l;
 
 		struct nc_widget_button		*ok_b;
+		struct nc_widget_button		*help_b;
 		struct nc_widget_button		*cancel_b;
 	} widgets;
 };
@@ -114,10 +118,30 @@ static void config_screen_process_key(struct nc_scr *scr, int key)
 	bool handled;
 
 	handled = widgetset_process_key(screen->widgetset, key);
-	if (screen->exit)
+
+	if (!handled) {
+		switch (key) {
+		case 'x':
+		case 27: /* esc */
+			screen->exit = true;
+			break;
+		case 'h':
+			screen->show_help = true;
+			break;
+		}
+	}
+
+	if (screen->exit) {
 		screen->on_exit(screen->cui);
-	else if (handled)
+
+	} else if (screen->show_help) {
+		screen->show_help = false;
+		cui_show_help(screen->cui, "System Configuration",
+				config_help_text);
+
+	} else if (handled) {
 		pad_refresh(screen);
+	}
 }
 
 static void config_screen_resize(struct nc_scr *scr)
@@ -225,6 +249,10 @@ static int screen_process_form(struct config_screen *screen)
 	}
 
 	str = widget_textbox_get_value(screen->widgets.dns_f);
+	talloc_free(config->network.dns_servers);
+	config->network.dns_servers = NULL;
+	config->network.n_dns_servers = 0;
+
 	if (str && strlen(str)) {
 		char *dns, *tmp;
 		int i;
@@ -269,6 +297,12 @@ static void ok_click(void *arg)
 		screen->exit = true;
 }
 
+static void help_click(void *arg)
+{
+	struct config_screen *screen = arg;
+	screen->show_help = true;
+}
+
 static void cancel_click(void *arg)
 {
 	struct config_screen *screen = arg;
@@ -388,8 +422,10 @@ static void config_screen_layout_widgets(struct config_screen *screen,
 
 	widget_move(widget_button_base(screen->widgets.ok_b),
 			y, screen->field_x);
-	widget_move(widget_button_base(screen->widgets.cancel_b),
+	widget_move(widget_button_base(screen->widgets.help_b),
 			y, screen->field_x + 10);
+	widget_move(widget_button_base(screen->widgets.cancel_b),
+			y, screen->field_x + 20);
 }
 
 static void config_screen_network_change(void *arg, int value)
@@ -467,6 +503,7 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 	screen->widgets.timeout_f = widget_new_textbox(set, 0, 0, 5, str);
 	screen->widgets.timeout_help_l = widget_new_label(set, 0, 0, "seconds");
 
+	widget_textbox_set_fixed_size(screen->widgets.timeout_f);
 	widget_textbox_set_validator_integer(screen->widgets.timeout_f, 0, 999);
 
 	screen->widgets.network_l = widget_new_label(set, 0, 0, "Network");
@@ -525,10 +562,12 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 	screen->widgets.ip_addr_l = widget_new_label(set, 0, 0, "IP/mask:");
 	screen->widgets.ip_addr_f = widget_new_textbox(set, 0, 0, 16, ip);
 	screen->widgets.ip_mask_l = widget_new_label(set, 0, 0, "/");
-	screen->widgets.ip_mask_f = widget_new_textbox(set, 0, 0, 4, mask);
+	screen->widgets.ip_mask_f = widget_new_textbox(set, 0, 0, 3, mask);
 	screen->widgets.ip_addr_mask_help_l =
 		widget_new_label(set, 0, 0, "(eg. 192.168.0.10 / 24)");
 
+	widget_textbox_set_fixed_size(screen->widgets.ip_addr_f);
+	widget_textbox_set_fixed_size(screen->widgets.ip_mask_f);
 	widget_textbox_set_validator_ipv4(screen->widgets.ip_addr_f);
 	widget_textbox_set_validator_integer(screen->widgets.ip_mask_f, 1, 31);
 
@@ -537,6 +576,7 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 	screen->widgets.gateway_help_l =
 		widget_new_label(set, 0, 0, "(eg. 192.168.0.1)");
 
+	widget_textbox_set_fixed_size(screen->widgets.gateway_f);
 	widget_textbox_set_validator_ipv4(screen->widgets.gateway_f);
 
 	str = talloc_strdup(screen, "");
@@ -558,6 +598,8 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 
 	screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, "OK",
 			ok_click, screen);
+	screen->widgets.help_b = widget_new_button(set, 0, 0, 6, "Help",
+			help_click, screen);
 	screen->widgets.cancel_b = widget_new_button(set, 0, 0, 6, "Cancel",
 			cancel_click, screen);
 }
@@ -668,7 +710,7 @@ struct config_screen *config_screen_init(struct cui *cui,
 			"Petitboot System Configuration");
 	screen->scr.frame.rtitle = NULL;
 	screen->scr.frame.help = talloc_strdup(screen,
-			"tab=next, shift+tab=previous");
+			"tab=next, shift+tab=previous, x=exit, h=help");
 	nc_scr_frame_draw(&screen->scr);
 
 	scrollok(screen->scr.sub_ncw, true);