nui/ncurses: Allow config screen updates

[petitboot] / ui / ncurses / nc-config.c

diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index 47e6b72df4379964a7752108ca46e0ff373ce12d..49f2e2f6093255c1ca2331634e4c9509d013c263 100644 (file)
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -31,7 +31,7 @@
 #include "nc-config.h"
 #include "nc-widgets.h"
 
-#define N_FIELDS       18
+#define N_FIELDS       19
 
 enum net_conf_type {
        NET_CONF_TYPE_DHCP_ALL,
@@ -71,6 +71,7 @@ struct config_screen {
                struct nc_widget_textbox        *gateway_f;
                struct nc_widget_label          *dns_l;
                struct nc_widget_textbox        *dns_f;
+               struct nc_widget_label          *dns_help_l;
 
                struct nc_widget_button         *ok_b;
                struct nc_widget_button         *cancel_b;
@@ -319,6 +320,15 @@ static void config_screen_layout_widgets(struct config_screen *screen,
        y += layout_pair(screen, y, screen->widgets.dns_l,
                        widget_textbox_base(screen->widgets.dns_f));
 
+       /* we show the DNS/DHCP help if we're configuring DHCP */
+       show = net_conf != NET_CONF_TYPE_STATIC;
+       wl = widget_label_base(screen->widgets.dns_help_l);
+       widget_set_visible(wl, show);
+       if (show) {
+               widget_move(wl, y, screen->field_x);
+               y += 1;
+       }
+
        y += 1;
 
        widget_move(widget_button_base(screen->widgets.ok_b),
@@ -368,6 +378,15 @@ static enum net_conf_type find_net_conf_type(const struct config *config)
        return NET_CONF_TYPE_DHCP_ALL;
 }
 
+static void config_screen_setup_empty(struct config_screen *screen)
+{
+       widget_new_label(screen->widgetset, 2, screen->field_x,
+                       "Waiting for configuration data...");
+       screen->widgets.cancel_b = widget_new_button(screen->widgetset,
+                       4, screen->field_x, 6, "Cancel", cancel_click, screen);
+}
+
+
 static void config_screen_setup_widgets(struct config_screen *screen,
                const struct config *config,
                const struct system_info *sysinfo)
@@ -458,12 +477,45 @@ static void config_screen_setup_widgets(struct config_screen *screen,
        screen->widgets.dns_l = widget_new_label(set, 0, 0, "DNS Server(s):");
        screen->widgets.dns_f = widget_new_textbox(set, 0, 0, 32, str);
 
+       screen->widgets.dns_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.cancel_b = widget_new_button(set, 0, 0, 6, "Cancel",
                        cancel_click, screen);
 }
 
+void config_screen_update(struct config_screen *screen,
+               const struct config *config,
+               const struct system_info *sysinfo)
+{
+       bool repost = false;
+
+       if (screen->widgetset) {
+               widgetset_unpost(screen->widgetset);
+               talloc_free(screen->widgetset);
+               repost = true;
+       }
+
+       screen->widgetset = widgetset_create(screen, screen->scr.main_ncw,
+                       screen->scr.sub_ncw);
+
+       if (!config || !sysinfo) {
+               config_screen_setup_empty(screen);
+       } else {
+               screen->net_conf_type = find_net_conf_type(config);
+
+               config_screen_setup_widgets(screen, config, sysinfo);
+               config_screen_layout_widgets(screen, screen->net_conf_type);
+       }
+
+       if (repost)
+               widgetset_post(screen->widgetset);
+
+       wrefresh(screen->scr.main_ncw);
+}
+
 struct config_screen *config_screen_init(struct cui *cui,
                const struct config *config,
                const struct system_info *sysinfo,
@@ -489,15 +541,9 @@ struct config_screen *config_screen_init(struct cui *cui,
                        "tab=next, shift+tab=previous");
        nc_scr_frame_draw(&screen->scr);
 
-       screen->widgetset = widgetset_create(screen, screen->scr.main_ncw,
-                       screen->scr.sub_ncw);
-       screen->net_conf_type = find_net_conf_type(config);
-
-       config_screen_setup_widgets(screen, config, sysinfo);
-       config_screen_layout_widgets(screen, screen->net_conf_type);
-
-       wrefresh(screen->scr.main_ncw);
        scrollok(screen->scr.sub_ncw, true);
 
+       config_screen_update(screen, config, sysinfo);
+
        return screen;
 }