ui/ncurses: Clear remaining space when drawing help line

[petitboot] / ui / ncurses / nc-add-url.c

diff --git a/ui/ncurses/nc-add-url.c b/ui/ncurses/nc-add-url.c
index cf55b03a104df725fcb9c2207c816cda87df1b5a..4abca38a4a1db33c63428cdad6df905004eb66fb 100644 (file)
--- a/ui/ncurses/nc-add-url.c
+++ b/ui/ncurses/nc-add-url.c
@@ -40,12 +40,15 @@ struct add_url_screen {
        struct nc_scr           scr;
        struct cui              *cui;
        struct nc_widgetset     *widgetset;
+       WINDOW                  *pad;
 
        bool                    exit;
        bool                    show_help;
        bool                    need_redraw;
        void                    (*on_exit)(struct cui *);
 
+       int                     scroll_y;
+
        int                     label_x;
        int                     field_x;
 
@@ -70,6 +73,16 @@ static struct add_url_screen *add_url_screen_from_scr(struct nc_scr *scr)
        return add_url_screen;
 }
 
+static void pad_refresh(struct add_url_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 add_url_screen_process_key(struct nc_scr *scr, int key)
 {
        struct add_url_screen *screen = add_url_screen_from_scr(scr);
@@ -99,7 +112,7 @@ static void add_url_screen_process_key(struct nc_scr *scr, int key)
                        &add_url_help_text);
 
        } else if (handled) {
-               wrefresh(screen->scr.main_ncw);
+               pad_refresh(screen);
        }
 }
 
@@ -113,6 +126,7 @@ static int add_url_screen_post(struct nc_scr *scr)
                screen->need_redraw = false;
        }
        wrefresh(screen->scr.main_ncw);
+       pad_refresh(screen);
        return 0;
 }
 
@@ -194,9 +208,33 @@ static void add_url_screen_layout_widgets(struct add_url_screen *screen)
        widget_move(widget_button_base(screen->widgets.ok_b),
                y, screen->field_x);
        widget_move(widget_button_base(screen->widgets.help_b),
-               y, screen->field_x + 10);
+               y, screen->field_x + 14);
        widget_move(widget_button_base(screen->widgets.cancel_b),
-               y, screen->field_x + 24);
+               y, screen->field_x + 28);
+}
+
+static void add_url_screen_widget_focus(struct nc_widget *widget, void *arg)
+{
+       struct add_url_screen *screen = arg;
+       int w_y, w_height, w_focus, s_max, adjust;
+
+       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) {
+               /* 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);
 }
 
 static void add_url_screen_setup_widgets(struct add_url_screen *screen)
@@ -210,7 +248,7 @@ static void add_url_screen_setup_widgets(struct add_url_screen *screen)
                        _("Configuration URL:"));
        screen->widgets.url_f = widget_new_textbox(set, 0, 0, 50, NULL);
 
-       screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
+       screen->widgets.ok_b = widget_new_button(set, 0, 0, 10, _("OK"),
                        ok_click, screen);
        screen->widgets.help_b = widget_new_button(set, 0, 0, 10, _("Help"),
                        help_click, screen);
@@ -218,12 +256,21 @@ static void add_url_screen_setup_widgets(struct add_url_screen *screen)
                        cancel_click, screen);
 }
 
+static int add_url_screen_destroy(void *arg)
+{
+       struct add_url_screen *screen = arg;
+       if (screen->pad)
+               delwin(screen->pad);
+       return 0;
+}
+
 struct add_url_screen *add_url_screen_init(struct cui *cui,
                void (*on_exit)(struct cui *))
 {
        struct add_url_screen *screen;
 
        screen = talloc_zero(cui, struct add_url_screen);
+       talloc_set_destructor(screen, add_url_screen_destroy);
 
        screen->cui = cui;
        screen->on_exit = on_exit;
@@ -243,8 +290,11 @@ struct add_url_screen *add_url_screen_init(struct cui *cui,
                        _("tab=next, shift+tab=previous, x=exit, h=help"));
        nc_scr_frame_draw(&screen->scr);
 
+       screen->pad = newpad(LINES, COLS);
        screen->widgetset = widgetset_create(screen, screen->scr.main_ncw,
-                       NULL);
+                       screen->pad);
+       widgetset_set_widget_focus(screen->widgetset,
+                       add_url_screen_widget_focus, screen);
 
        add_url_screen_setup_widgets(screen);
        add_url_screen_layout_widgets(screen);