* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
#include <assert.h>
#include <string.h>
#include "log/log.h"
#include "talloc/talloc.h"
#include "nc-boot-editor.h"
+#include "nc-widgets.h"
+
+struct boot_editor {
+ struct nc_scr scr;
+ struct cui *cui;
+ void *data;
+ struct pmenu_item *item;
+ enum {
+ STATE_EDIT,
+ STATE_CANCEL,
+ STATE_SAVE,
+ STATE_HELP,
+ } state;
+ void (*on_exit)(struct cui *cui,
+ struct pmenu_item *item,
+ struct pb_boot_data *bd);
+
+ int label_x;
+ int field_x;
+ int scroll_y;
+
+ WINDOW *pad;
+ struct nc_widgetset *widgetset;
+ struct {
+ struct nc_widget_label *device_l;
+ struct nc_widget_select *device_f;
+ struct nc_widget_label *image_l;
+ struct nc_widget_textbox *image_f;
+ struct nc_widget_label *initrd_l;
+ struct nc_widget_textbox *initrd_f;
+ struct nc_widget_label *dtb_l;
+ struct nc_widget_textbox *dtb_f;
+ 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;
+
+ const char *selected_device;
+ char *image;
+ char *initrd;
+ char *dtb;
+ char *args;
+};
+
+extern const char *boot_editor_help_text;
static struct boot_editor *boot_editor_from_scr(struct nc_scr *scr)
{
return boot_editor;
}
-static struct boot_editor *boot_editor_from_arg(void *arg)
+static void pad_refresh(struct boot_editor *boot_editor)
{
- struct boot_editor *boot_editor = arg;
+ int y, x, rows, cols;
- assert(boot_editor->scr.sig == pb_boot_editor_sig);
- return boot_editor;
-}
+ getmaxyx(boot_editor->scr.sub_ncw, rows, cols);
+ getbegyx(boot_editor->scr.sub_ncw, y, x);
-/**
- * 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;
+ prefresh(boot_editor->pad, boot_editor->scroll_y, 0,
+ y, x, rows, cols);
}
-/**
- * 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)
+static struct boot_editor *boot_editor_from_arg(void *arg)
{
- 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);
+ struct boot_editor *boot_editor = arg;
- boot_editor_move_cursor(boot_editor, REQ_END_FIELD);
- return result;
+ assert(boot_editor->scr.sig == pb_boot_editor_sig);
+ return boot_editor;
}
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);
+ redrawwin(scr->main_ncw);
wrefresh(boot_editor->scr.main_ncw);
-
+ pad_refresh(boot_editor);
return 0;
}
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;
+}
+
+struct nc_scr *boot_editor_scr(struct boot_editor *boot_editor)
+{
+ return &boot_editor->scr;
}
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)
+static char *conditional_prefix(struct pb_boot_data *ctx,
+ const char *prefix, const char *value)
{
- char *start;
- char *end;
- char *const s_end = s + strlen(s);
+ const char *sep;
- for (; s < s_end; s++)
- if (*s != ' ' && *s != '\t')
- break;
+ if (!value || !*value)
+ return NULL;
- start = end = s;
+ sep = "";
+ if (!prefix)
+ prefix = "";
+ else if (prefix[strlen(prefix)] != '/')
+ sep = "/";
- for (; s < s_end; s++)
- if (*s != ' ' && *s != '\t')
- end = s;
- *(end + 1) = 0;
- return start;
+ return talloc_asprintf(ctx, "%s%s%s", prefix, sep, value);
}
static struct pb_boot_data *boot_editor_prepare_data(
struct boot_editor *boot_editor)
{
struct pb_boot_data *bd;
- char *s;
+ char *s, *prefix;
+ int idx;
bd = talloc(boot_editor, struct pb_boot_data);
if (!bd)
return NULL;
- s = boot_editor_chomp(field_buffer(boot_editor->fields[0], 0));
- bd->image = *s ? talloc_strdup(bd, s) : NULL;
+ idx = widget_select_get_value(boot_editor->widgets.device_f);
+ if (idx == -1 || (unsigned int)idx >
+ boot_editor->cui->sysinfo->n_blockdevs)
+ prefix = NULL;
+ else
+ prefix = boot_editor->cui->sysinfo->blockdevs[idx]->mountpoint;
+
+ s = widget_textbox_get_value(boot_editor->widgets.image_f);
+ bd->image = conditional_prefix(bd, prefix, s);
+
+ s = widget_textbox_get_value(boot_editor->widgets.initrd_f);
+ bd->initrd = conditional_prefix(bd, prefix, s);
- s = boot_editor_chomp(field_buffer(boot_editor->fields[1], 0));
- bd->initrd = *s ? talloc_strdup(bd, s) : NULL;
+ s = widget_textbox_get_value(boot_editor->widgets.dtb_f);
+ bd->dtb = conditional_prefix(bd, prefix, s);
- s = boot_editor_chomp(field_buffer(boot_editor->fields[2], 0));
+ s = widget_textbox_get_value(boot_editor->widgets.args_f);
bd->args = *s ? talloc_strdup(bd, s) : NULL;
return bd;
static void boot_editor_process_key(struct nc_scr *scr, int key)
{
struct boot_editor *boot_editor = boot_editor_from_scr(scr);
+ struct pmenu_item *item;
struct pb_boot_data *bd;
+ bool handled;
- switch (key) {
- default:
- boot_editor_move_cursor(boot_editor, key);
- break;
+ handled = widgetset_process_key(boot_editor->widgetset, key);
+ if (handled)
+ pad_refresh(boot_editor);
- /* 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);
- bd = boot_editor_prepare_data(boot_editor);
- boot_editor->on_exit(boot_editor,
- boot_editor_update, bd);
- nc_flush_keys();
- return;
+ else if (key == 'x' || key == 27)
+ boot_editor->state = STATE_CANCEL;
- /* insert mode */
- case KEY_IC:
- boot_editor_insert_mode_tog(boot_editor);
- break;
+ else if (key == 'h')
+ boot_editor->state = STATE_HELP;
- /* 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;
+ item = NULL;
+ bd = NULL;
- /* 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);
+ switch (boot_editor->state) {
+ case STATE_SAVE:
+ item = boot_editor->item;
+ bd = boot_editor_prepare_data(boot_editor);
+ /* fall through */
+ case STATE_CANCEL:
+ boot_editor->on_exit(boot_editor->cui, item, bd);
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);
+ case STATE_HELP:
+ boot_editor->state = STATE_EDIT;
+ cui_show_help(boot_editor->cui, "Boot Option Editor",
+ boot_editor_help_text);
break;
- case KEY_DC:
- boot_editor_move_cursor(boot_editor, REQ_DEL_CHAR);
+ default:
break;
}
}
static int boot_editor_destructor(void *arg)
{
struct boot_editor *boot_editor = boot_editor_from_arg(arg);
- FIELD **f;
+ boot_editor->scr.sig = pb_removed_sig;
+ if (boot_editor->pad)
+ delwin(boot_editor->pad);
+ return 0;
+}
- for (f = boot_editor->fields; *f; f++)
- free_field(*f);
+static void ok_click(void *arg)
+{
+ struct boot_editor *boot_editor = arg;
+ boot_editor->state = STATE_SAVE;
+}
- free_form(boot_editor->ncf);
- boot_editor->scr.sig = pb_removed_sig;
+static void help_click(void *arg)
+{
+ struct boot_editor *boot_editor = arg;
+ boot_editor->state = STATE_HELP;
+}
- return 0;
+static void cancel_click(void *arg)
+{
+ struct boot_editor *boot_editor = arg;
+ boot_editor->state = STATE_CANCEL;
}
-static FIELD *boot_editor_setup_field(unsigned int y, unsigned int x, char *str)
+static int layout_pair(struct boot_editor *boot_editor, int y,
+ struct nc_widget_label *label,
+ struct nc_widget_textbox *field)
{
- 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 nc_widget *label_w = widget_label_base(label);
+ struct nc_widget *field_w = widget_textbox_base(field);
+ widget_move(label_w, y, boot_editor->label_x);
+ widget_move(field_w, y, boot_editor->field_x);
+ return max(widget_height(label_w), widget_height(field_w));
}
-static FIELD *boot_editor_setup_label(unsigned int y, unsigned int x, char *str)
+static int pad_height(int blockdevs_height)
{
- FIELD *f;
+ return 10 + blockdevs_height;
+}
+
+static void boot_editor_layout_widgets(struct boot_editor *boot_editor)
+{
+ struct nc_widget *wf, *wl;
+ int y = 1;
+
+ wl = widget_label_base(boot_editor->widgets.device_l);
+ wf = widget_select_base(boot_editor->widgets.device_f);
+ widget_move(wl, y, boot_editor->label_x);
+ widget_move(wf, y, boot_editor->field_x);
+
+ y += widget_height(wf) + 1;
+
+
+ y += layout_pair(boot_editor, y, boot_editor->widgets.image_l,
+ boot_editor->widgets.image_f);
+
+ y += layout_pair(boot_editor, y, boot_editor->widgets.initrd_l,
+ boot_editor->widgets.initrd_f);
+
+ y += layout_pair(boot_editor, y, boot_editor->widgets.dtb_l,
+ boot_editor->widgets.dtb_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;
+ y += layout_pair(boot_editor, y, boot_editor->widgets.args_l,
+ boot_editor->widgets.args_f);
+
+
+ y++;
+ widget_move(widget_button_base(boot_editor->widgets.ok_b), y, 9);
+ widget_move(widget_button_base(boot_editor->widgets.help_b), y, 19);
+ widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 29);
}
-struct boot_editor *boot_editor_init(void *ui_ctx,
- const struct pb_boot_data *bd,
- void (*on_exit)(struct boot_editor *,
- enum boot_editor_result,
- struct pb_boot_data *))
+static void boot_editor_widget_focus(struct nc_widget *widget, void *arg)
{
- struct boot_editor *boot_editor;
+ struct boot_editor *boot_editor = arg;
+ int w_y, s_max;
+
+ w_y = widget_y(widget) + widget_focus_y(widget);
+ s_max = getmaxy(boot_editor->scr.sub_ncw) - 1;
+
+ if (w_y < boot_editor->scroll_y)
+ boot_editor->scroll_y = w_y;
+
+ else if (w_y + boot_editor->scroll_y + 1 > s_max)
+ boot_editor->scroll_y = 1 + w_y - s_max;
+
+ else
+ return;
+
+ pad_refresh(boot_editor);
+}
+
+static void boot_editor_device_select_change(void *arg, int idx)
+{
+ struct boot_editor *boot_editor = arg;
+ if (idx == -1)
+ boot_editor->selected_device = NULL;
+ else
+ boot_editor->selected_device =
+ boot_editor->cui->sysinfo->blockdevs[idx]->name;
+}
+
+static void boot_editor_populate_device_select(struct boot_editor *boot_editor,
+ const struct system_info *sysinfo)
+{
+ struct nc_widget_select *select = boot_editor->widgets.device_f;
+ unsigned int i;
+ bool selected;
+
+ widget_select_drop_options(select);
+
+ for (i = 0; sysinfo && i < sysinfo->n_blockdevs; i++) {
+ struct blockdev_info *bd_info = sysinfo->blockdevs[i];
+ const char *name;
+
+ name = talloc_asprintf(boot_editor, "%s [%s]",
+ bd_info->name, bd_info->uuid);
+ selected = boot_editor->selected_device &&
+ !strcmp(bd_info->name,
+ boot_editor->selected_device);
+
+ widget_select_add_option(select, i, name, selected);
+ }
+
+ /* If we're editing an existing option, the paths will be fully-
+ * resolved. In this case, we want the manual device pre-selected.
+ * However, we only do this if the widget hasn't been manually
+ * changed. */
+ selected = !boot_editor->selected_device;
+
+ widget_select_add_option(select, -1, "Specify paths/URLs manually",
+ selected);
+}
+
+static bool path_on_device(struct blockdev_info *bd_info,
+ const char *path)
+{
+ int len;
+
+ if (!bd_info->mountpoint)
+ return false;
- pb_log("%s: image: '%s'\n", __func__, bd->image);
- pb_log("%s: initrd: '%s'\n", __func__, bd->initrd);
- pb_log("%s: args: '%s'\n", __func__, bd->args);
+ len = strlen(bd_info->mountpoint);
+ if (strncmp(bd_info->mountpoint, path, len))
+ return false;
- assert(on_exit);
+ /* if the mountpoint doesn't have a trailing slash, ensure that
+ * the path starts with one (so we don't match a "/mnt/sda1/foo" path
+ * on a "/mnt/sda" mountpoint) */
+ return bd_info->mountpoint[len-1] == '/' || path[len] == '/';
+}
+
+
+static void boot_editor_find_device(struct boot_editor *boot_editor,
+ struct pb_boot_data *bd, const struct system_info *sysinfo)
+{
+ struct blockdev_info *bd_info, *tmp;
+ unsigned int i, len;
+
+ if (!sysinfo || !sysinfo->n_blockdevs)
+ return;
+
+ /* find the device for our boot image, by finding the longest
+ * matching blockdev's mountpoint */
+ for (len = 0, i = 0, bd_info = NULL; i < sysinfo->n_blockdevs; i++) {
+ tmp = sysinfo->blockdevs[i];
+ if (!path_on_device(tmp, bd->image))
+ continue;
+ if (strlen(tmp->mountpoint) <= len)
+ continue;
+ bd_info = tmp;
+ len = strlen(tmp->mountpoint);
+ }
+
+ if (!bd_info)
+ return;
+
+ /* ensure that other paths are on this device */
+ if (bd->initrd && !path_on_device(bd_info, bd->initrd))
+ return;
+
+ if (bd->dtb && !path_on_device(bd_info, bd->dtb))
+ return;
+
+ /* ok, we match; preselect the device option, and remove the common
+ * prefix */
+ boot_editor->selected_device = bd_info->name;
+ boot_editor->image += len;
+
+ if (boot_editor->initrd)
+ boot_editor->initrd += len;
+ if (boot_editor->dtb)
+ boot_editor->dtb += len;
+}
+
+static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
+ const struct system_info *sysinfo)
+{
+ struct nc_widgetset *set;
+ int field_size;
+
+ field_size = COLS - 1 - boot_editor->field_x;
+
+ boot_editor->widgetset = set = widgetset_create(boot_editor,
+ boot_editor->scr.main_ncw,
+ boot_editor->pad);
+
+ widgetset_set_widget_focus(boot_editor->widgetset,
+ boot_editor_widget_focus, boot_editor);
+
+ boot_editor->widgets.device_l = widget_new_label(set, 0, 0, "Device:");
+ boot_editor->widgets.device_f = widget_new_select(set, 0, 0,
+ field_size);
+ widget_select_on_change(boot_editor->widgets.device_f,
+ boot_editor_device_select_change, boot_editor);
+
+ boot_editor_populate_device_select(boot_editor, sysinfo);
+
+ boot_editor->widgets.image_l = widget_new_label(set, 0, 0,
+ "Kernel:");
+ boot_editor->widgets.image_f = widget_new_textbox(set, 0, 0,
+ field_size, boot_editor->image);
+
+ boot_editor->widgets.initrd_l = widget_new_label(set, 0, 0,
+ "Initrd:");
+ boot_editor->widgets.initrd_f = widget_new_textbox(set, 0, 0,
+ field_size,
+ boot_editor->initrd);
+
+ boot_editor->widgets.dtb_l = widget_new_label(set, 0, 0,
+ "Device tree:");
+ boot_editor->widgets.dtb_f = widget_new_textbox(set, 0, 0,
+ field_size, boot_editor->dtb);
+
+ boot_editor->widgets.args_l = widget_new_label(set, 0, 0,
+ "Boot arguments:");
+ boot_editor->widgets.args_f = widget_new_textbox(set, 0, 0,
+ field_size, boot_editor->args);
+
+ 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);
+}
- boot_editor = talloc_zero(ui_ctx, struct boot_editor);
+void boot_editor_update(struct boot_editor *boot_editor,
+ const struct system_info *sysinfo)
+{
+ int height;
+
+ widgetset_unpost(boot_editor->widgetset);
+
+ height = pad_height(sysinfo ? sysinfo->n_blockdevs : 0);
+ if (getmaxy(boot_editor->pad) < height) {
+ delwin(boot_editor->pad);
+ boot_editor->pad = newpad(height, COLS);
+ widgetset_set_windows(boot_editor->widgetset,
+ boot_editor->scr.main_ncw,
+ boot_editor->pad);
+ }
+
+ boot_editor_populate_device_select(boot_editor, sysinfo);
+
+ boot_editor_layout_widgets(boot_editor);
+
+ widgetset_post(boot_editor->widgetset);
+
+ pad_refresh(boot_editor);
+}
+
+struct boot_editor *boot_editor_init(struct cui *cui,
+ struct pmenu_item *item,
+ const struct system_info *sysinfo,
+ void (*on_exit)(struct cui *cui,
+ struct pmenu_item *item,
+ struct pb_boot_data *bd))
+{
+ struct boot_editor *boot_editor;
+
+ boot_editor = talloc_zero(cui, struct boot_editor);
if (!boot_editor)
return NULL;
talloc_set_destructor(boot_editor, boot_editor_destructor);
+ boot_editor->cui = cui;
+ boot_editor->item = item;
+ boot_editor->on_exit = on_exit;
+ boot_editor->state = STATE_EDIT;
+
+ boot_editor->label_x = 1;
+ boot_editor->field_x = 17;
nc_scr_init(&boot_editor->scr, pb_boot_editor_sig, 0,
- ui_ctx, boot_editor_process_key,
+ cui, 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");
-
- boot_editor->on_exit = on_exit;
-
- boot_editor->fields = talloc_array(boot_editor, FIELD *, 7);
+ "tab=next, shift+tab=previous, x=exit, h=help");
+ nc_scr_frame_draw(&boot_editor->scr);
+
+ if (item) {
+ struct pb_boot_data *bd = cod_from_item(item)->bd;
+ boot_editor->image = bd->image;
+ boot_editor->initrd = bd->initrd;
+ boot_editor->dtb = bd->dtb;
+ boot_editor->args = bd->args;
+ boot_editor_find_device(boot_editor, bd, sysinfo);
+ } else {
+ boot_editor->image = boot_editor->initrd =
+ boot_editor->dtb = boot_editor->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->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->pad = newpad(
+ pad_height(sysinfo ? sysinfo->n_blockdevs : 0),
+ COLS);
- boot_editor->ncf = new_form(boot_editor->fields);
+ boot_editor_setup_widgets(boot_editor, sysinfo);
- set_form_win(boot_editor->ncf, boot_editor->scr.main_ncw);
- set_form_sub(boot_editor->ncf, boot_editor->scr.sub_ncw);
+ boot_editor_layout_widgets(boot_editor);
+ wrefresh(boot_editor->scr.main_ncw);
return boot_editor;
}