X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-boot-editor.c;h=0b658f240fabe89dfbf3592c651d152fe9fc6b62;hp=a9256ff59c5f03f5e87610ba16955cbd0f30d4f5;hb=f1599796efed1eb67759cf42f47fe4bf6a9bf93c;hpb=6eb39a03bf66d91c37ca5d14dd61a90850a921d3 diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c index a9256ff..0b658f2 100644 --- 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 @@ -167,27 +169,30 @@ static char *boot_editor_chomp(char *s) 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; + bd->image = *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; + bd->initrd = *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; + bd->dtb = *s ? talloc_strdup(bd, s) : NULL; + + s = boot_editor_chomp(field_buffer(boot_editor->fields[3], 0)); + bd->args = *s ? talloc_strdup(bd, s) : NULL; - return kd; + return bd; } /** @@ -196,81 +201,72 @@ 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; + struct pb_boot_data *bd; - /* DBGS("%d (%o)\n", c, c); */ - - switch (c) { - default: - boot_editor_move_cursor(boot_editor, c); - break; + switch (key) { + default: + boot_editor_move_cursor(boot_editor, key); + 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; + /* 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; + + /* 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; + /* 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; - } + /* 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; } } @@ -315,16 +311,17 @@ static FIELD *boot_editor_setup_label(unsigned int y, unsigned int x, char *str) } struct boot_editor *boot_editor_init(void *ui_ctx, - const struct pb_kexec_data *kd, + const struct pb_boot_data *bd, void (*on_exit)(struct boot_editor *, enum boot_editor_result, - struct pb_kexec_data *)) + struct pb_boot_data *)) { 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); + 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); @@ -346,15 +343,17 @@ struct boot_editor *boot_editor_init(void *ui_ctx, 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->fields = talloc_array(boot_editor, FIELD *, 9); + + 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[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->ncf = new_form(boot_editor->fields);