lib/pb-config: Implement config_set

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

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 4579b1a3852c7e4552d205b7c1ecdf666f9c8547..c48bbf5d9c28f0b51f1ad8882d985f5e60c380dd 100644 (file)
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -16,6 +16,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #define _GNU_SOURCE
 
 #include <assert.h>
@@ -202,7 +204,11 @@ static struct pb_boot_data *boot_editor_prepare_data(
 static void boot_editor_process_key(struct nc_scr *scr, int key)
 {
        struct boot_editor *boot_editor = boot_editor_from_scr(scr);
+       enum boot_editor_result result;
        struct pb_boot_data *bd;
+       FIELD *field;
+
+       field = current_field(boot_editor->ncf);
 
        switch (key) {
        default:
@@ -210,17 +216,32 @@ static void boot_editor_process_key(struct nc_scr *scr, int key)
                break;
 
        /* hot keys */
+       case 'x':
+               if (field != boot_editor->button_cancel &&
+                               field != boot_editor->button_ok) {
+                       boot_editor_move_cursor(boot_editor, key);
+                       break;
+               }
+               /* fall through */
+
        case 27: /* ESC */
-               boot_editor->on_exit(boot_editor,
-                               boot_editor_cancel, NULL);
+               boot_editor->on_exit(boot_editor, boot_editor_cancel, NULL);
                nc_flush_keys();
                return;
        case '\n':
        case '\r':
-               form_driver(boot_editor->ncf, REQ_VALIDATION);
-               bd = boot_editor_prepare_data(boot_editor);
-               boot_editor->on_exit(boot_editor,
-                               boot_editor_update, bd);
+               if (field == boot_editor->button_cancel) {
+                       result = boot_editor_cancel;
+                       bd = NULL;
+               } else if (field == boot_editor->button_ok) {
+                       result = boot_editor_update;
+                       form_driver(boot_editor->ncf, REQ_VALIDATION);
+                       bd = boot_editor_prepare_data(boot_editor);
+               } else {
+                       boot_editor_move_field(boot_editor, REQ_NEXT_FIELD);
+                       break;
+               }
+               boot_editor->on_exit(boot_editor, result, bd);
                nc_flush_keys();
                return;
 
@@ -308,50 +329,76 @@ static FIELD *boot_editor_setup_label(unsigned int y, unsigned int x, char *str)
        return f;
 }
 
-struct boot_editor *boot_editor_init(void *ui_ctx,
+static FIELD *boot_editor_setup_button(unsigned int y, unsigned int x,
+               char *str)
+{
+       FIELD *f;
+
+       f = new_field(1, strlen(str), y, x, 0, 0);
+       field_opts_off(f, O_EDIT);
+       set_field_buffer(f, 0, str);
+       set_field_back(f, A_NORMAL);
+       set_field_fore(f, A_NORMAL);
+       return f;
+}
+
+struct boot_editor *boot_editor_init(struct pmenu *menu,
                const struct pb_boot_data *bd,
                void (*on_exit)(struct boot_editor *,
                                enum boot_editor_result,
                                struct pb_boot_data *))
 {
+       char *image, *initrd, *dtb, *args;
        struct boot_editor *boot_editor;
 
-       pb_log("%s: image:  '%s'\n", __func__, bd->image);
-       pb_log("%s: initrd: '%s'\n", __func__, bd->initrd);
-       pb_log("%s: dtb:    '%s'\n", __func__, bd->dtb);
-       pb_log("%s: args:   '%s'\n", __func__, bd->args);
-
        assert(on_exit);
 
-       boot_editor = talloc_zero(ui_ctx, struct boot_editor);
+       boot_editor = talloc_zero(menu, struct boot_editor);
 
        if (!boot_editor)
                return NULL;
 
        talloc_set_destructor(boot_editor, boot_editor_destructor);
+       boot_editor->original_pmenu = menu;
 
        nc_scr_init(&boot_editor->scr, pb_boot_editor_sig, 0,
-                       ui_ctx, boot_editor_process_key,
+                       menu, boot_editor_process_key,
                boot_editor_post, boot_editor_unpost, boot_editor_resize);
 
-       boot_editor->scr.frame.title = talloc_strdup(boot_editor,
+       boot_editor->scr.frame.ltitle = talloc_strdup(boot_editor,
                        "Petitboot Option Editor");
+       boot_editor->scr.frame.rtitle = NULL;
        boot_editor->scr.frame.help = talloc_strdup(boot_editor,
-                       "ESC=cancel, Enter=accept");
+                       "Enter=accept");
 
        boot_editor->on_exit = on_exit;
 
-       boot_editor->fields = talloc_array(boot_editor, FIELD *, 9);
+       boot_editor->fields = talloc_array(boot_editor, FIELD *, 11);
+
+       if (bd) {
+               image = bd->image;
+               initrd = bd->initrd;
+               dtb = bd->dtb;
+               args = bd->args;
+       } else {
+               image = initrd = dtb = args = "";
+       }
 
-       boot_editor->fields[0] = boot_editor_setup_field(0, 9, bd->image);
-       boot_editor->fields[1] = boot_editor_setup_field(1, 9, bd->initrd);
-       boot_editor->fields[2] = boot_editor_setup_field(2, 9, bd->dtb);
-       boot_editor->fields[3] = boot_editor_setup_field(3, 9, bd->args);
+       boot_editor->fields[0] = boot_editor_setup_field(0, 9, image);
+       boot_editor->fields[1] = boot_editor_setup_field(1, 9, initrd);
+       boot_editor->fields[2] = boot_editor_setup_field(2, 9, dtb);
+       boot_editor->fields[3] = boot_editor_setup_field(3, 9, args);
        boot_editor->fields[4] = boot_editor_setup_label(0, 1, "image:");
        boot_editor->fields[5] = boot_editor_setup_label(1, 1, "initrd:");
        boot_editor->fields[6] = boot_editor_setup_label(2, 1, "dtb:");
        boot_editor->fields[7] = boot_editor_setup_label(3, 1, "args:");
-       boot_editor->fields[8] = NULL;
+       boot_editor->fields[8] = boot_editor_setup_button(5, 9, "[  OK  ] ");
+       boot_editor->fields[9] = boot_editor_setup_button(5, 9 + 10,
+                                                       "[Cancel] ");
+       boot_editor->fields[10] = NULL;
+
+       boot_editor->button_ok = boot_editor->fields[8];
+       boot_editor->button_cancel = boot_editor->fields[9];
 
        boot_editor->ncf = new_form(boot_editor->fields);