X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-config.c;h=64d0619b66c66703dc64c9d08c9b50e07dfc3903;hp=4eeeff830aed783a67874bebab16f32a8ba047ed;hb=8c60755607cbade935b1f763dffbf9ee1c38f97a;hpb=b7a7eb9a248f8afb1667b3e6675b49853e567ce1 diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c index 4eeeff8..64d0619 100644 --- a/ui/ncurses/nc-config.c +++ b/ui/ncurses/nc-config.c @@ -15,7 +15,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE +#if defined(HAVE_CONFIG_H) +#include "config.h" +#endif #include #include @@ -26,12 +28,13 @@ #include #include -#include "config.h" #include "nc-cui.h" #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, @@ -46,6 +49,7 @@ struct config_screen { WINDOW *pad; bool exit; + bool show_help; void (*on_exit)(struct cui *); int scroll_y; @@ -82,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; }; @@ -113,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) @@ -130,6 +155,8 @@ static int config_screen_post(struct nc_scr *scr) struct config_screen *screen = config_screen_from_scr(scr); widgetset_post(screen->widgetset); nc_scr_frame_draw(scr); + redrawwin(scr->main_ncw); + wrefresh(screen->scr.main_ncw); pad_refresh(screen); return 0; } @@ -149,13 +176,13 @@ struct nc_scr *config_screen_scr(struct config_screen *screen) static int screen_process_form(struct config_screen *screen) { const struct system_info *sysinfo = screen->cui->sysinfo; - struct config *config = talloc_zero(screen, struct config); enum net_conf_type net_conf_type; struct interface_config *iface; + struct config *config; char *str, *end; int rc; - config_set_defaults(config); + config = config_copy(screen, screen->cui->config); config->autoboot_enabled = widget_checkbox_get_value(screen->widgets.autoboot_f); @@ -201,15 +228,24 @@ static int screen_process_form(struct config_screen *screen) } if (net_conf_type == NET_CONF_TYPE_STATIC) { + char *ip, *mask, *gateway; + + 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); + + if (!ip || !*ip || !mask || !*mask) { + screen->scr.frame.status = + "No IP / mask values are set"; + nc_scr_frame_draw(&screen->scr); + talloc_free(config); + return -1; + } + iface->method = CONFIG_METHOD_STATIC; iface->static_config.address = talloc_asprintf(iface, "%s/%s", - widget_textbox_get_value( - screen->widgets.ip_addr_f), - widget_textbox_get_value( - screen->widgets.ip_mask_f)); - iface->static_config.gateway = talloc_strdup(iface, - widget_textbox_get_value( - screen->widgets.gateway_f)); + ip, mask); + iface->static_config.gateway = talloc_strdup(iface, gateway); } str = widget_textbox_get_value(screen->widgets.dns_f); @@ -249,8 +285,18 @@ static int screen_process_form(struct config_screen *screen) static void ok_click(void *arg) { struct config_screen *screen = arg; - screen_process_form(screen); - screen->exit = true; + if (screen_process_form(screen)) + /* errors are written to the status line, so we'll need + * to refresh */ + wrefresh(screen->scr.main_ncw); + else + screen->exit = true; +} + +static void help_click(void *arg) +{ + struct config_screen *screen = arg; + screen->show_help = true; } static void cancel_click(void *arg) @@ -372,8 +418,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) @@ -451,6 +499,8 @@ 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_validator_integer(screen->widgets.timeout_f, 0, 999); + screen->widgets.network_l = widget_new_label(set, 0, 0, "Network"); screen->widgets.network_f = widget_new_select(set, 0, 0, 50); @@ -471,17 +521,22 @@ static void config_screen_setup_widgets(struct config_screen *screen, config_screen_network_change, screen); screen->widgets.iface_l = widget_new_label(set, 0, 0, "Device:"); - screen->widgets.iface_f = widget_new_select(set, 0, 0, 20); + screen->widgets.iface_f = widget_new_select(set, 0, 0, 50); for (i = 0; i < sysinfo->n_interfaces; i++) { struct interface_info *info = sysinfo->interfaces[i]; + char str[50], mac[20]; bool is_default; is_default = ifcfg && !memcmp(ifcfg->hwaddr, info->hwaddr, sizeof(ifcfg->hwaddr)); + mac_str(info->hwaddr, info->hwaddr_size, mac, sizeof(mac)); + snprintf(str, sizeof(str), "%s [%s, %s]", info->name, mac, + info->link ? "link up" : "link down"); + widget_select_add_option(screen->widgets.iface_f, - i, info->name, is_default); + i, str, is_default); } gw = ip = mask = NULL; @@ -502,15 +557,20 @@ 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, 3, mask); + screen->widgets.ip_mask_f = widget_new_textbox(set, 0, 0, 4, mask); screen->widgets.ip_addr_mask_help_l = widget_new_label(set, 0, 0, "(eg. 192.168.0.10 / 24)"); + widget_textbox_set_validator_ipv4(screen->widgets.ip_addr_f); + widget_textbox_set_validator_integer(screen->widgets.ip_mask_f, 1, 31); + screen->widgets.gateway_l = widget_new_label(set, 0, 0, "Gateway:"); screen->widgets.gateway_f = widget_new_textbox(set, 0, 0, 16, gw); screen->widgets.gateway_help_l = widget_new_label(set, 0, 0, "(eg. 192.168.0.1)"); + widget_textbox_set_validator_ipv4(screen->widgets.gateway_f); + str = talloc_strdup(screen, ""); for (i = 0; i < config->network.n_dns_servers; i++) { str = talloc_asprintf_append(str, "%s%s", @@ -523,11 +583,15 @@ static void config_screen_setup_widgets(struct config_screen *screen, screen->widgets.dns_help_l = widget_new_label(set, 0, 0, "(eg. 192.168.0.2)"); + widget_textbox_set_validator_ipv4_multi(screen->widgets.dns_f); + screen->widgets.dns_dhcp_help_l = widget_new_label(set, 0, 0, "(if not provided by DHCP server)"); 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); } @@ -552,8 +616,7 @@ static void config_screen_widget_focus(struct nc_widget *widget, void *arg) pad_refresh(screen); } - -void config_screen_update(struct config_screen *screen, +static void config_screen_draw(struct config_screen *screen, const struct config *config, const struct system_info *sysinfo) { @@ -598,7 +661,13 @@ void config_screen_update(struct config_screen *screen, if (repost) widgetset_post(screen->widgetset); +} +void config_screen_update(struct config_screen *screen, + const struct config *config, + const struct system_info *sysinfo) +{ + config_screen_draw(screen, config, sysinfo); pad_refresh(screen); } @@ -633,14 +702,12 @@ 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); - config_screen_update(screen, config, sysinfo); - - wrefresh(screen->scr.main_ncw); + config_screen_draw(screen, config, sysinfo); return screen; }