]> git.ozlabs.org Git - petitboot/blobdiff - ui/ncurses/nc-boot-editor.c
ui/ncurses: Use nc-widgets for boot editor
[petitboot] / ui / ncurses / nc-boot-editor.c
index a9256ff59c5f03f5e87610ba16955cbd0f30d4f5..c7c2ed8e3723594b4a2471b965e5128dd8eb1c26 100644 (file)
@@ -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>
@@ -24,6 +26,7 @@
 #include "log/log.h"
 #include "talloc/talloc.h"
 #include "nc-boot-editor.h"
+#include "nc-widgets.h"
 
 static struct boot_editor *boot_editor_from_scr(struct nc_scr *scr)
 {
@@ -44,88 +47,12 @@ static struct boot_editor *boot_editor_from_arg(void *arg)
        return boot_editor;
 }
 
-/**
- * boot_editor_move_cursor - Move the cursor, setting correct attributes.
- * @req: An ncurses request or char to send to form_driver().
- */
-
-static int boot_editor_move_cursor(struct boot_editor *boot_editor, int req)
-{
-       int result;
-
-       wchgat(boot_editor->scr.sub_ncw, 1,
-                       boot_editor_attr_field_selected, 0, 0);
-       result = form_driver(boot_editor->ncf, req);
-       wchgat(boot_editor->scr.sub_ncw, 1, boot_editor->attr_cursor, 0, 0);
-       wrefresh(boot_editor->scr.main_ncw);
-       return result;
-}
-
-/**
- * boot_editor_insert_mode_set - Set the insert mode.
- */
-
-static void boot_editor_insert_mode_set(struct boot_editor *boot_editor,
-               int req)
-{
-       switch (req) {
-       case REQ_INS_MODE:
-               boot_editor->attr_cursor = boot_editor_attr_cursor_ins;
-               break;
-       case REQ_OVL_MODE:
-               boot_editor->attr_cursor = boot_editor_attr_cursor_ovl;
-               break;
-       default:
-               assert(0 && "bad req");
-               break;
-       }
-       boot_editor_move_cursor(boot_editor, req);
-}
-
-/**
- * boot_editor_insert_mode_tog - Toggle the insert mode.
- */
-
-static void boot_editor_insert_mode_tog(struct boot_editor *boot_editor)
-{
-       if (boot_editor->attr_cursor == boot_editor_attr_cursor_ins)
-               boot_editor_insert_mode_set(boot_editor, REQ_OVL_MODE);
-       else
-               boot_editor_insert_mode_set(boot_editor, REQ_INS_MODE);
-}
-
-/**
- * boot_editor_move_field - Move selected field, setting correct attributes.
- * @req: An ncurses request to send to form_driver().
- */
-
-static int boot_editor_move_field(struct boot_editor *boot_editor, int req)
-{
-       int result;
-
-       set_field_back(current_field(boot_editor->ncf),
-                       boot_editor_attr_field_normal);
-
-       result = form_driver(boot_editor->ncf, req);
-
-       set_field_back(current_field(boot_editor->ncf),
-                       boot_editor_attr_field_selected);
-
-       boot_editor_move_cursor(boot_editor, REQ_END_FIELD);
-       return result;
-}
-
 static int boot_editor_post(struct nc_scr *scr)
 {
        struct boot_editor *boot_editor = boot_editor_from_scr(scr);
 
-       post_form(boot_editor->ncf);
-
+       widgetset_post(boot_editor->widgetset);
        nc_scr_frame_draw(scr);
-       boot_editor_move_field(boot_editor, REQ_FIRST_FIELD);
-       boot_editor_move_field(boot_editor, REQ_END_FIELD);
-       boot_editor_insert_mode_set(boot_editor, REQ_INS_MODE);
-
        redrawwin(boot_editor->scr.main_ncw);
        wrefresh(boot_editor->scr.main_ncw);
 
@@ -134,7 +61,8 @@ static int boot_editor_post(struct nc_scr *scr)
 
 static int boot_editor_unpost(struct nc_scr *scr)
 {
-       return unpost_form(boot_editor_from_scr(scr)->ncf);
+       widgetset_unpost(boot_editor_from_scr(scr)->widgetset);
+       return 0;
 }
 
 static void boot_editor_resize(struct nc_scr *scr)
@@ -144,50 +72,30 @@ static void boot_editor_resize(struct nc_scr *scr)
        boot_editor_post(scr);
 }
 
-/**
- * boot_editor_chomp - Eat leading and trailing WS.
- */
-
-static char *boot_editor_chomp(char *s)
-{
-       char *start;
-       char *end;
-       char *const s_end = s + strlen(s);
-
-       for (; s < s_end; s++)
-               if (*s != ' ' && *s != '\t')
-                       break;
-
-       start = end = s;
-
-       for (; s < s_end; s++)
-               if (*s != ' ' && *s != '\t')
-                       end = s;
-       *(end + 1) = 0;
-       return start;
-}
-
-static struct pb_kexec_data *boot_editor_prepare_data(
+static struct pb_boot_data *boot_editor_prepare_data(
                struct boot_editor *boot_editor)
 {
-       struct pb_kexec_data *kd;
+       struct pb_boot_data *bd;
        char *s;
 
-       kd = talloc(boot_editor, struct pb_kexec_data);
+       bd = talloc(boot_editor, struct pb_boot_data);
 
-       if (!kd)
+       if (!bd)
                return NULL;
 
-       s = boot_editor_chomp(field_buffer(boot_editor->fields[0], 0));
-       kd->image = *s ? talloc_strdup(kd, s) : NULL;
+       s = widget_textbox_get_value(boot_editor->widgets.image_f);
+       bd->image = *s ? talloc_strdup(bd, s) : NULL;
+
+       s = widget_textbox_get_value(boot_editor->widgets.initrd_f);
+       bd->initrd = *s ? talloc_strdup(bd, s) : NULL;
 
-       s = boot_editor_chomp(field_buffer(boot_editor->fields[1], 0));
-       kd->initrd = *s ? talloc_strdup(kd, s) : NULL;
+       s = widget_textbox_get_value(boot_editor->widgets.dtb_f);
+       bd->dtb = *s ? talloc_strdup(bd, s) : NULL;
 
-       s = boot_editor_chomp(field_buffer(boot_editor->fields[2], 0));
-       kd->args = *s ? talloc_strdup(kd, s) : NULL;
+       s = widget_textbox_get_value(boot_editor->widgets.args_f);
+       bd->args = *s ? talloc_strdup(bd, s) : NULL;
 
-       return kd;
+       return bd;
 }
 
 /**
@@ -196,81 +104,22 @@ static struct pb_kexec_data *boot_editor_prepare_data(
  * Called from the cui via the scr:process_key method.
  */
 
-static void boot_editor_process_key(struct nc_scr *scr)
+static void boot_editor_process_key(struct nc_scr *scr, int key)
 {
        struct boot_editor *boot_editor = boot_editor_from_scr(scr);
-       struct pb_kexec_data *kd;
-
-       while (1) {
-               int c = getch();
-
-               if (c == ERR)
-                       return;
-
-               /* DBGS("%d (%o)\n", c, c); */
-
-               switch (c) {
-               default:
-                       boot_editor_move_cursor(boot_editor, c);
-                       break;
-
-               /* hot keys */
-               case 27: /* ESC */
-                       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);
-                       kd = boot_editor_prepare_data(boot_editor);
-                       boot_editor->on_exit(boot_editor,
-                                       boot_editor_update, kd);
-                       nc_flush_keys();
-                       return;
-
-               /* insert mode */
-               case KEY_IC:
-                       boot_editor_insert_mode_tog(boot_editor);
-                       break;
-
-               /* form nav */
-               case KEY_PPAGE:
-                       boot_editor_move_field(boot_editor, REQ_FIRST_FIELD);
-                       break;
-               case KEY_NPAGE:
-                       boot_editor_move_field(boot_editor, REQ_LAST_FIELD);
-                       break;
-               case KEY_DOWN:
-                       boot_editor_move_field(boot_editor, REQ_NEXT_FIELD);
-                       break;
-               case KEY_UP:
-                       boot_editor_move_field(boot_editor, REQ_PREV_FIELD);
-                       break;
-
-               /* field nav */
-               case KEY_HOME:
-                       boot_editor_move_cursor(boot_editor, REQ_BEG_FIELD);
-                       break;
-               case KEY_END:
-                       boot_editor_move_cursor(boot_editor, REQ_END_FIELD);
-                       break;
-               case KEY_LEFT:
-                       boot_editor_move_cursor(boot_editor, REQ_LEFT_CHAR);
-                       break;
-               case KEY_RIGHT:
-                       boot_editor_move_cursor(boot_editor, REQ_RIGHT_CHAR);
-                       break;
-               case KEY_BACKSPACE:
-                       if (boot_editor_move_cursor(boot_editor, REQ_LEFT_CHAR)
-                                       == E_OK)
-                               boot_editor_move_cursor(boot_editor,
-                                               REQ_DEL_CHAR);
-                       break;
-               case KEY_DC:
-                       boot_editor_move_cursor(boot_editor, REQ_DEL_CHAR);
-                       break;
-               }
+       bool handled;
+
+       handled = widgetset_process_key(boot_editor->widgetset, key);
+       if (handled) {
+               wrefresh(boot_editor->scr.main_ncw);
+               return;
+       }
+
+       switch (key) {
+       case 'x':
+       case 27: /* ESC */
+               boot_editor->on_exit(boot_editor, boot_editor_cancel, NULL);
+               nc_flush_keys();
        }
 }
 
@@ -281,85 +130,104 @@ static void boot_editor_process_key(struct nc_scr *scr)
 static int boot_editor_destructor(void *arg)
 {
        struct boot_editor *boot_editor = boot_editor_from_arg(arg);
-       FIELD **f;
-
-       for (f = boot_editor->fields; *f; f++)
-               free_field(*f);
-
-       free_form(boot_editor->ncf);
        boot_editor->scr.sig = pb_removed_sig;
-
        return 0;
 }
 
-static FIELD *boot_editor_setup_field(unsigned int y, unsigned int x, char *str)
+static void ok_click(void *arg)
 {
-       FIELD *f;
-
-       f = new_field(1, COLS - 1 - x, y, x, 0, 0);
-       field_opts_off(f, O_STATIC | O_WRAP);
-       set_max_field(f, 256);
-       set_field_buffer(f, 0, str);
-       set_field_status(f, 0);
-       return f;
+       struct boot_editor *boot_editor = arg;
+       struct pb_boot_data *bd;
+
+       bd = boot_editor_prepare_data(boot_editor);
+       boot_editor->on_exit(boot_editor, boot_editor_update, bd);
 }
 
-static FIELD *boot_editor_setup_label(unsigned int y, unsigned int x, char *str)
+static void cancel_click(void *arg)
 {
-       FIELD *f;
-
-       f = new_field(1, strlen(str), y, x, 0, 0);
-       field_opts_off(f, O_ACTIVE);
-       set_field_buffer(f, 0, str);
-       return f;
+       struct boot_editor *boot_editor = arg;
+       boot_editor->on_exit(boot_editor, boot_editor_cancel, NULL);
 }
 
-struct boot_editor *boot_editor_init(void *ui_ctx,
-               const struct pb_kexec_data *kd,
+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_kexec_data *))
+                               struct pb_boot_data *))
 {
+       int y, field_size, label_x = 1, field_x = 9;
+       char *image, *initrd, *dtb, *args;
        struct boot_editor *boot_editor;
-
-       pb_log("%s: image:  '%s'\n", __func__, kd->image);
-       pb_log("%s: initrd: '%s'\n", __func__, kd->initrd);
-       pb_log("%s: args:   '%s'\n", __func__, kd->args);
+       struct nc_widgetset *set;
 
        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 *, 7);
-
-       boot_editor->fields[0] = boot_editor_setup_field(0, 9, kd->image);
-       boot_editor->fields[1] = boot_editor_setup_field(1, 9, kd->initrd);
-       boot_editor->fields[2] = boot_editor_setup_field(2, 9, kd->args);
-       boot_editor->fields[3] = boot_editor_setup_label(0, 1, "image:");
-       boot_editor->fields[4] = boot_editor_setup_label(1, 1, "initrd:");
-       boot_editor->fields[5] = boot_editor_setup_label(2, 1, "args:");
-       boot_editor->fields[6] = NULL;
-
-       boot_editor->ncf = new_form(boot_editor->fields);
+       if (bd) {
+               image = bd->image;
+               initrd = bd->initrd;
+               dtb = bd->dtb;
+               args = bd->args;
+       } else {
+               image = initrd = dtb = args = "";
+       }
 
-       set_form_win(boot_editor->ncf, boot_editor->scr.main_ncw);
-       set_form_sub(boot_editor->ncf, boot_editor->scr.sub_ncw);
+       y = 0;
+       field_size = COLS - 1 - field_x;
+
+       boot_editor->widgetset = set = widgetset_create(boot_editor,
+                       boot_editor->scr.main_ncw,
+                       boot_editor->scr.sub_ncw);
+
+       boot_editor->widgets.image_l = widget_new_label(set, y,
+                                       label_x, "image:");
+       boot_editor->widgets.image_f = widget_new_textbox(set, y,
+                                       field_x, field_size, image);
+
+       y++;
+       boot_editor->widgets.initrd_l = widget_new_label(set, y,
+                                       label_x, "initrd:");
+       boot_editor->widgets.initrd_f = widget_new_textbox(set, y,
+                                       field_x, field_size, initrd);
+
+       y++;
+       boot_editor->widgets.dtb_l = widget_new_label(set, y,
+                                       label_x, "dtb:");
+       boot_editor->widgets.dtb_f = widget_new_textbox(set, y,
+                                       field_x, field_size, dtb);
+
+       y++;
+       boot_editor->widgets.args_l = widget_new_label(set, y,
+                                       label_x, "args:");
+       boot_editor->widgets.args_f = widget_new_textbox(set, y,
+                                       field_x, field_size, args);
+
+       y++;
+       y++;
+       boot_editor->widgets.ok_b = widget_new_button(set, y,
+                                       9, 6, "OK", ok_click, boot_editor);
+       boot_editor->widgets.cancel_b = widget_new_button(set, y,
+                                       19, 6, "Cancel", cancel_click,
+                                       boot_editor);
 
        return boot_editor;
 }