X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-boot-editor.c;h=4012ec5a7658dfdc8f429e00130307ed7692ec44;hp=ac07156d72805ed51df295ac5fdb1b7d81561a07;hb=203ad2cb596a4b8df13df4afdc8d7e0d999a5fd5;hpb=5a271400e9b5396cb90258b7582fe7ac6bcc2230

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index ac07156..4012ec5 100644
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -25,6 +25,7 @@
 
 #include "log/log.h"
 #include "talloc/talloc.h"
+#include "i18n/i18n.h"
 #include "nc-boot-editor.h"
 #include "nc-widgets.h"
 
@@ -37,10 +38,13 @@ struct boot_editor {
 		STATE_EDIT,
 		STATE_CANCEL,
 		STATE_SAVE,
+		STATE_HELP,
 	}			state;
 	void			(*on_exit)(struct cui *cui,
 					struct pmenu_item *item,
 					struct pb_boot_data *bd);
+	bool			need_redraw;
+	bool			need_update;
 
 	int			label_x;
 	int			field_x;
@@ -60,6 +64,7 @@ struct boot_editor {
 		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;
 
@@ -70,6 +75,8 @@ struct boot_editor {
 	char			*args;
 };
 
+extern const struct help_text boot_editor_help_text;
+
 static struct boot_editor *boot_editor_from_scr(struct nc_scr *scr)
 {
 	struct boot_editor *boot_editor;
@@ -104,8 +111,19 @@ static int boot_editor_post(struct nc_scr *scr)
 {
 	struct boot_editor *boot_editor = boot_editor_from_scr(scr);
 
-	widgetset_post(boot_editor->widgetset);
+	if (boot_editor->need_update) {
+		boot_editor_update(boot_editor, boot_editor->cui->sysinfo);
+		boot_editor->need_update = false;
+	} else {
+		widgetset_post(boot_editor->widgetset);
+	}
+
 	nc_scr_frame_draw(scr);
+	if (boot_editor->need_redraw) {
+		redrawwin(scr->main_ncw);
+		boot_editor->need_redraw = false;
+	}
+	wrefresh(boot_editor->scr.main_ncw);
 	pad_refresh(boot_editor);
 	return 0;
 }
@@ -166,6 +184,10 @@ static struct pb_boot_data *boot_editor_prepare_data(
 
 	s = widget_textbox_get_value(boot_editor->widgets.image_f);
 	bd->image = conditional_prefix(bd, prefix, s);
+	if (!bd->image) {
+		talloc_free(bd);
+		return NULL;
+	}
 
 	s = widget_textbox_get_value(boot_editor->widgets.initrd_f);
 	bd->initrd = conditional_prefix(bd, prefix, s);
@@ -199,6 +221,9 @@ static void boot_editor_process_key(struct nc_scr *scr, int key)
 	else if (key == 'x' || key == 27)
 		boot_editor->state = STATE_CANCEL;
 
+	else if (key == 'h')
+		boot_editor->state = STATE_HELP;
+
 	item = NULL;
 	bd = NULL;
 
@@ -206,10 +231,21 @@ static void boot_editor_process_key(struct nc_scr *scr, int key)
 	case STATE_SAVE:
 		item = boot_editor->item;
 		bd = boot_editor_prepare_data(boot_editor);
+		if (!bd) {
+			/* Incomplete entry */
+			boot_editor->state = STATE_EDIT;
+			break;
+		}
 		/* fall through */
 	case STATE_CANCEL:
 		boot_editor->on_exit(boot_editor->cui, item, bd);
 		break;
+	case STATE_HELP:
+		boot_editor->state = STATE_EDIT;
+		boot_editor->need_redraw = true;
+		cui_show_help(boot_editor->cui, _("Boot Option Editor"),
+				&boot_editor_help_text);
+		break;
 	default:
 		break;
 	}
@@ -234,6 +270,12 @@ static void ok_click(void *arg)
 	boot_editor->state = STATE_SAVE;
 }
 
+static void help_click(void *arg)
+{
+	struct boot_editor *boot_editor = arg;
+	boot_editor->state = STATE_HELP;
+}
+
 static void cancel_click(void *arg)
 {
 	struct boot_editor *boot_editor = arg;
@@ -283,8 +325,12 @@ static void boot_editor_layout_widgets(struct boot_editor *boot_editor)
 
 
 	y++;
-	widget_move(widget_button_base(boot_editor->widgets.ok_b), y, 9);
-	widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 19);
+	widget_move(widget_button_base(boot_editor->widgets.ok_b), y,
+		    boot_editor->field_x);
+	widget_move(widget_button_base(boot_editor->widgets.help_b), y,
+		    boot_editor->field_x + 14);
+	widget_move(widget_button_base(boot_editor->widgets.cancel_b), y,
+		    boot_editor->field_x + 28);
 }
 
 static void boot_editor_widget_focus(struct nc_widget *widget, void *arg)
@@ -345,7 +391,7 @@ static void boot_editor_populate_device_select(struct boot_editor *boot_editor,
 	 * changed. */
 	selected = !boot_editor->selected_device;
 
-	widget_select_add_option(select, -1, "Specify paths/URLs manually",
+	widget_select_add_option(select, -1, _("Specify paths/URLs manually"),
 			selected);
 }
 
@@ -425,7 +471,8 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
 	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_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,
@@ -434,30 +481,32 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
 	boot_editor_populate_device_select(boot_editor, sysinfo);
 
 	boot_editor->widgets.image_l = widget_new_label(set, 0, 0,
-			"Kernel:");
+			_("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:");
+			_("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:");
+			_("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 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.cancel_b = widget_new_button(set, 0, 0, 6,
-					"Cancel", cancel_click, boot_editor);
+	boot_editor->widgets.ok_b = widget_new_button(set, 0, 0, 10,
+					_("OK"), ok_click, boot_editor);
+	boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 10,
+					_("Help"), help_click, boot_editor);
+	boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 10,
+					_("Cancel"), cancel_click, boot_editor);
 }
 
 void boot_editor_update(struct boot_editor *boot_editor,
@@ -465,6 +514,11 @@ void boot_editor_update(struct boot_editor *boot_editor,
 {
 	int height;
 
+	if (boot_editor->cui->current != boot_editor_scr(boot_editor)) {
+		boot_editor->need_update = true;
+		return;
+	}
+
 	widgetset_unpost(boot_editor->widgetset);
 
 	height = pad_height(sysinfo ? sysinfo->n_blockdevs : 0);
@@ -504,19 +558,24 @@ struct boot_editor *boot_editor_init(struct cui *cui,
 	boot_editor->item = item;
 	boot_editor->on_exit = on_exit;
 	boot_editor->state = STATE_EDIT;
+	boot_editor->need_redraw = false;
+	boot_editor->need_update = false;
+
+	int ncols1 = strncols(_("Device tree:"));
+	int ncols2 = strncols(_("Boot arguments:"));
 
 	boot_editor->label_x = 1;
-	boot_editor->field_x = 17;
+	boot_editor->field_x = 2 + max(ncols1, ncols2);
 
 	nc_scr_init(&boot_editor->scr, pb_boot_editor_sig, 0,
 			cui, boot_editor_process_key,
 		boot_editor_post, boot_editor_unpost, boot_editor_resize);
 
 	boot_editor->scr.frame.ltitle = talloc_strdup(boot_editor,
-			"Petitboot Option Editor");
+			_("Petitboot Option Editor"));
 	boot_editor->scr.frame.rtitle = NULL;
 	boot_editor->scr.frame.help = talloc_strdup(boot_editor,
-			"Enter=accept");
+			_("tab=next, shift+tab=previous, x=exit, h=help"));
 	nc_scr_frame_draw(&boot_editor->scr);
 
 	if (item) {