X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-boot-editor.c;h=c48bbf5d9c28f0b51f1ad8882d985f5e60c380dd;hp=38d29f826d5556b6ad03b6734f94b6751f1dac9c;hb=4a2dbb71fdcf234302760d20333420a6e6566d56;hpb=6b842bb2559116a949c6a569ac39f5c56ebc1be1

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 38d29f8..c48bbf5 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 <assert.h>
@@ -185,6 +187,9 @@ static struct pb_boot_data *boot_editor_prepare_data(
 	bd->initrd = *s ? talloc_strdup(bd, s) : NULL;
 
 	s = boot_editor_chomp(field_buffer(boot_editor->fields[2], 0));
+	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 bd;
@@ -196,81 +201,91 @@ static struct pb_boot_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);
+	enum boot_editor_result result;
 	struct pb_boot_data *bd;
+	FIELD *field;
 
-	while (1) {
-		int c = getch();
-
-		if (c == ERR)
-			return;
+	field = current_field(boot_editor->ncf);
 
-		/* DBGS("%d (%o)\n", c, c); */
+	switch (key) {
+	default:
+		boot_editor_move_cursor(boot_editor, key);
+		break;
 
-		switch (c) {
-		default:
-			boot_editor_move_cursor(boot_editor, c);
+	/* hot keys */
+	case 'x':
+		if (field != boot_editor->button_cancel &&
+				field != boot_editor->button_ok) {
+			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':
+		}
+		/* fall through */
+
+	case 27: /* ESC */
+		boot_editor->on_exit(boot_editor, boot_editor_cancel, NULL);
+		nc_flush_keys();
+		return;
+	case '\n':
+	case '\r':
+		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);
-			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:
+		} else {
 			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;
 		}
+		boot_editor->on_exit(boot_editor, result, 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;
+
+	/* 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;
 	}
 }
 
@@ -314,47 +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: 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 *, 7);
+	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->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[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] = 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);