ui/ncurses: Use pmenu_item destrutor to free ncurses ITEMs

[petitboot] / ui / ncurses / nc-boot-editor.c

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index ac07156d72805ed51df295ac5fdb1b7d81561a07..329699ab8ebdb6842369d9ad680cacf8e145907a 100644 (file)
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -37,6 +37,7 @@ struct boot_editor {
                STATE_EDIT,
                STATE_CANCEL,
                STATE_SAVE,
+               STATE_HELP,
        }                       state;
        void                    (*on_exit)(struct cui *cui,
                                        struct pmenu_item *item,
@@ -60,6 +61,7 @@ struct boot_editor {
                struct nc_widget_label          *args_l;
                struct nc_widget_textbox        *args_f;
                struct nc_widget_button         *ok_b;
+               struct nc_widget_button         *help_b;
                struct nc_widget_button         *cancel_b;
        } widgets;
 
@@ -70,6 +72,8 @@ struct boot_editor {
        char                    *args;
 };
 
+extern const char *boot_editor_help_text;
+
 static struct boot_editor *boot_editor_from_scr(struct nc_scr *scr)
 {
        struct boot_editor *boot_editor;
@@ -103,9 +107,10 @@ static struct boot_editor *boot_editor_from_arg(void *arg)
 static int boot_editor_post(struct nc_scr *scr)
 {
        struct boot_editor *boot_editor = boot_editor_from_scr(scr);
-
        widgetset_post(boot_editor->widgetset);
        nc_scr_frame_draw(scr);
+       redrawwin(scr->main_ncw);
+       wrefresh(boot_editor->scr.main_ncw);
        pad_refresh(boot_editor);
        return 0;
 }
@@ -199,6 +204,9 @@ static void boot_editor_process_key(struct nc_scr *scr, int key)
        else if (key == 'x' || key == 27)
                boot_editor->state = STATE_CANCEL;
 
+       else if (key == 'h')
+               boot_editor->state = STATE_HELP;
+
        item = NULL;
        bd = NULL;
 
@@ -210,6 +218,11 @@ static void boot_editor_process_key(struct nc_scr *scr, int key)
        case STATE_CANCEL:
                boot_editor->on_exit(boot_editor->cui, item, bd);
                break;
+       case STATE_HELP:
+               boot_editor->state = STATE_EDIT;
+               cui_show_help(boot_editor->cui, "Boot Option Editor",
+                               boot_editor_help_text);
+               break;
        default:
                break;
        }
@@ -234,6 +247,12 @@ static void ok_click(void *arg)
        boot_editor->state = STATE_SAVE;
 }
 
+static void help_click(void *arg)
+{
+       struct boot_editor *boot_editor = arg;
+       boot_editor->state = STATE_HELP;
+}
+
 static void cancel_click(void *arg)
 {
        struct boot_editor *boot_editor = arg;
@@ -284,7 +303,8 @@ static void boot_editor_layout_widgets(struct boot_editor *boot_editor)
 
        y++;
        widget_move(widget_button_base(boot_editor->widgets.ok_b), y, 9);
-       widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 19);
+       widget_move(widget_button_base(boot_editor->widgets.help_b), y, 19);
+       widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 29);
 }
 
 static void boot_editor_widget_focus(struct nc_widget *widget, void *arg)
@@ -456,6 +476,8 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
 
        boot_editor->widgets.ok_b = widget_new_button(set, 0, 0, 6,
                                        "OK", ok_click, boot_editor);
+       boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 6,
+                                       "Help", help_click, boot_editor);
        boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 6,
                                        "Cancel", cancel_click, boot_editor);
 }
@@ -516,7 +538,7 @@ struct boot_editor *boot_editor_init(struct cui *cui,
                        "Petitboot Option Editor");
        boot_editor->scr.frame.rtitle = NULL;
        boot_editor->scr.frame.help = talloc_strdup(boot_editor,
-                       "Enter=accept");
+                       "tab=next, shift+tab=previous, x=exit, h=help");
        nc_scr_frame_draw(&boot_editor->scr);
 
        if (item) {