]> git.ozlabs.org Git - petitboot/blobdiff - ui/ncurses/nc-config.c
ui/ncurses: Fix pad size check
[petitboot] / ui / ncurses / nc-config.c
index 49f2e2f6093255c1ca2331634e4c9509d013c263..ca8c44c0e6bfb74a3208f251e83cdd135fb3eb01 100644 (file)
@@ -31,7 +31,7 @@
 #include "nc-config.h"
 #include "nc-widgets.h"
 
-#define N_FIELDS       19
+#define N_FIELDS       23
 
 enum net_conf_type {
        NET_CONF_TYPE_DHCP_ALL,
@@ -43,9 +43,13 @@ struct config_screen {
        struct nc_scr           scr;
        struct cui              *cui;
        struct nc_widgetset     *widgetset;
+       WINDOW                  *pad;
+
        bool                    exit;
        void                    (*on_exit)(struct cui *);
 
+       int                     scroll_y;
+
        int                     label_x;
        int                     field_x;
        int                     network_config_y;
@@ -57,6 +61,7 @@ struct config_screen {
                struct nc_widget_label          *autoboot_l;
                struct nc_widget_textbox        *timeout_f;
                struct nc_widget_label          *timeout_l;
+               struct nc_widget_label          *timeout_help_l;
 
                struct nc_widget_label          *network_l;
                struct nc_widget_select         *network_f;
@@ -67,10 +72,13 @@ struct config_screen {
                struct nc_widget_textbox        *ip_addr_f;
                struct nc_widget_label          *ip_mask_l;
                struct nc_widget_textbox        *ip_mask_f;
+               struct nc_widget_label          *ip_addr_mask_help_l;
                struct nc_widget_label          *gateway_l;
                struct nc_widget_textbox        *gateway_f;
+               struct nc_widget_label          *gateway_help_l;
                struct nc_widget_label          *dns_l;
                struct nc_widget_textbox        *dns_f;
+               struct nc_widget_label          *dns_dhcp_help_l;
                struct nc_widget_label          *dns_help_l;
 
                struct nc_widget_button         *ok_b;
@@ -89,6 +97,16 @@ static struct config_screen *config_screen_from_scr(struct nc_scr *scr)
        return config_screen;
 }
 
+static void pad_refresh(struct config_screen *screen)
+{
+       int y, x, rows, cols;
+
+       getmaxyx(screen->scr.sub_ncw, rows, cols);
+       getbegyx(screen->scr.sub_ncw, y, x);
+
+       prefresh(screen->pad, screen->scroll_y, 0, y, x, rows, cols);
+}
+
 static void config_screen_process_key(struct nc_scr *scr, int key)
 {
        struct config_screen *screen = config_screen_from_scr(scr);
@@ -98,7 +116,7 @@ static void config_screen_process_key(struct nc_scr *scr, int key)
        if (screen->exit)
                screen->on_exit(screen->cui);
        else if (handled)
-               wrefresh(screen->scr.main_ncw);
+               pad_refresh(screen);
 }
 
 static void config_screen_resize(struct nc_scr *scr)
@@ -112,7 +130,7 @@ 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);
-       wrefresh(scr->main_ncw);
+       pad_refresh(screen);
        return 0;
 }
 
@@ -254,19 +272,25 @@ static int layout_pair(struct config_screen *screen, int y,
 static void config_screen_layout_widgets(struct config_screen *screen,
                enum net_conf_type net_conf)
 {
-       struct nc_widget *wl, *wf;
+       struct nc_widget *wl, *wf, *wh;
+       int y, x, help_x;
        bool show;
-       int y, x;
 
        y = 1;
+       help_x = screen->field_x + 2 +
+               widget_width(widget_textbox_base(screen->widgets.dns_f));
 
        y += layout_pair(screen, y, screen->widgets.autoboot_l,
                        widget_checkbox_base(screen->widgets.autoboot_f));
 
-       y += layout_pair(screen, y, screen->widgets.timeout_l,
-                       widget_textbox_base(screen->widgets.timeout_f));
+       wf = widget_textbox_base(screen->widgets.timeout_f);
+       widget_move(widget_label_base(screen->widgets.timeout_l),
+                       y, screen->label_x);
+       widget_move(wf, y, screen->field_x);
+       widget_move(widget_label_base(screen->widgets.timeout_help_l),
+                       y, screen->field_x + widget_width(wf) + 1);
 
-       y += 1;
+       y += 2;
 
        y += layout_pair(screen, y, screen->widgets.network_l,
                        widget_select_base(screen->widgets.network_f));
@@ -306,23 +330,38 @@ static void config_screen_layout_widgets(struct config_screen *screen,
        if (show) {
                widget_move(wl, y, x);
                widget_move(wf, y, x + 2);
-               y += 1;
+       }
+
+       /* help for IP/mask */
+       wh = widget_label_base(screen->widgets.ip_addr_mask_help_l);
+       widget_set_visible(wh, show);
+       if (show) {
+               widget_move(wh, y, help_x);
+               y++;
        }
 
        wl = widget_label_base(screen->widgets.gateway_l);
        wf = widget_textbox_base(screen->widgets.gateway_f);
+       wh = widget_label_base(screen->widgets.gateway_help_l);
        widget_set_visible(wl, show);
        widget_set_visible(wf, show);
+       widget_set_visible(wh, show);
 
-       if (show)
-               y += layout_pair(screen, y, screen->widgets.gateway_l, wf) + 1;
+       if (show) {
+               layout_pair(screen, y, screen->widgets.gateway_l, wf);
+               widget_move(wh, y, help_x);
+               y++;
+       }
 
-       y += layout_pair(screen, y, screen->widgets.dns_l,
+       wh = widget_label_base(screen->widgets.dns_help_l);
+       layout_pair(screen, y, screen->widgets.dns_l,
                        widget_textbox_base(screen->widgets.dns_f));
+       widget_move(wh, y, help_x);
+       y++;
 
        /* 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);
+       wl = widget_label_base(screen->widgets.dns_dhcp_help_l);
        widget_set_visible(wl, show);
        if (show) {
                widget_move(wl, y, screen->field_x);
@@ -410,6 +449,7 @@ static void config_screen_setup_widgets(struct config_screen *screen,
        str = talloc_asprintf(screen, "%d", config->autoboot_timeout_sec);
        screen->widgets.timeout_l = widget_new_label(set, 0, 0, "Timeout:");
        screen->widgets.timeout_f = widget_new_textbox(set, 0, 0, 5, str);
+       screen->widgets.timeout_help_l = widget_new_label(set, 0, 0, "seconds");
 
        screen->widgets.network_l = widget_new_label(set, 0, 0, "Network");
        screen->widgets.network_f = widget_new_select(set, 0, 0, 50);
@@ -463,9 +503,13 @@ static void config_screen_setup_widgets(struct config_screen *screen,
        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_addr_mask_help_l =
+               widget_new_label(set, 0, 0, "(eg. 192.168.0.10 / 24)");
 
        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)");
 
        str = talloc_strdup(screen, "");
        for (i = 0; i < config->network.n_dns_servers; i++) {
@@ -476,8 +520,10 @@ 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, "(eg. 192.168.0.2)");
 
-       screen->widgets.dns_help_l = widget_new_label(set, 0, 0,
+       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",
@@ -486,11 +532,50 @@ static void config_screen_setup_widgets(struct config_screen *screen,
                        cancel_click, screen);
 }
 
+static void config_screen_widget_focus(struct nc_widget *widget, void *arg)
+{
+       struct config_screen *screen = arg;
+       int w_y, w_height, s_max;
+
+       w_y = widget_y(widget);
+       w_height = widget_height(widget);
+       s_max = getmaxy(screen->scr.sub_ncw);
+
+       if (w_y < screen->scroll_y)
+               screen->scroll_y = w_y;
+
+       else if (w_y + w_height + screen->scroll_y > s_max - 1)
+               screen->scroll_y = 1 + w_y + w_height - s_max;
+
+       else
+               return;
+
+       pad_refresh(screen);
+}
+
+
 void config_screen_update(struct config_screen *screen,
                const struct config *config,
                const struct system_info *sysinfo)
 {
        bool repost = false;
+       int height;
+
+       /* The size of the pad we'll need depends on the number of interfaces.
+        *
+        * We use N_FIELDS (which is quite conservative, as some fields share
+        * a line) as a base, then add 3 (as the network select field is
+        * takes 3 lines), and n_interfaces (as the network interface field
+        * has n_interfaces lines).
+        */
+       height = N_FIELDS + 3;
+       if (sysinfo)
+               height += sysinfo->n_interfaces;
+       if (!screen->pad || getmaxy(screen->pad) < height) {
+               if (screen->pad)
+                       delwin(screen->pad);
+               screen->pad = newpad(height, COLS);
+       }
 
        if (screen->widgetset) {
                widgetset_unpost(screen->widgetset);
@@ -499,7 +584,9 @@ void config_screen_update(struct config_screen *screen,
        }
 
        screen->widgetset = widgetset_create(screen, screen->scr.main_ncw,
-                       screen->scr.sub_ncw);
+                       screen->pad);
+       widgetset_set_widget_focus(screen->widgetset,
+                       config_screen_widget_focus, screen);
 
        if (!config || !sysinfo) {
                config_screen_setup_empty(screen);
@@ -513,7 +600,15 @@ void config_screen_update(struct config_screen *screen,
        if (repost)
                widgetset_post(screen->widgetset);
 
-       wrefresh(screen->scr.main_ncw);
+       pad_refresh(screen);
+}
+
+static int config_screen_destroy(void *arg)
+{
+       struct config_screen *screen = arg;
+       if (screen->pad)
+               delwin(screen->pad);
+       return 0;
 }
 
 struct config_screen *config_screen_init(struct cui *cui,
@@ -524,6 +619,7 @@ struct config_screen *config_screen_init(struct cui *cui,
        struct config_screen *screen;
 
        screen = talloc_zero(cui, struct config_screen);
+       talloc_set_destructor(screen, config_screen_destroy);
        nc_scr_init(&screen->scr, pb_config_screen_sig, 0,
                        cui, config_screen_process_key,
                        config_screen_post, config_screen_unpost,
@@ -545,5 +641,7 @@ struct config_screen *config_screen_init(struct cui *cui,
 
        config_screen_update(screen, config, sysinfo);
 
+       wrefresh(screen->scr.main_ncw);
+
        return screen;
 }