X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-boot-editor.c;h=274bd9d2fa1b4df079eb050c10524bc46abad5b1;hp=6bc1d89169b166da53a2eb502ffe12f1545665d5;hb=f497317729e7b2823a953f00c8301d192cda8824;hpb=494988c501287e03da3becba5c03cbce7c3d9d20

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 6bc1d89..274bd9d 100644
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -22,6 +22,7 @@
 
 #include <assert.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "log/log.h"
 #include "talloc/talloc.h"
@@ -43,6 +44,7 @@ struct boot_editor {
 	void			(*on_exit)(struct cui *cui,
 					struct pmenu_item *item,
 					struct pb_boot_data *bd);
+	bool			need_redraw;
 
 	int			label_x;
 	int			field_x;
@@ -73,7 +75,7 @@ struct boot_editor {
 	char			*args;
 };
 
-extern const char *boot_editor_help_text;
+extern const struct help_text boot_editor_help_text;
 
 static struct boot_editor *boot_editor_from_scr(struct nc_scr *scr)
 {
@@ -110,7 +112,10 @@ static int boot_editor_post(struct nc_scr *scr)
 	struct boot_editor *boot_editor = boot_editor_from_scr(scr);
 	widgetset_post(boot_editor->widgetset);
 	nc_scr_frame_draw(scr);
-	redrawwin(scr->main_ncw);
+	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;
@@ -172,6 +177,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);
@@ -215,14 +224,20 @@ 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);
+				&boot_editor_help_text);
 		break;
 	default:
 		break;
@@ -305,7 +320,7 @@ 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.help_b), y, 19);
-	widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 29);
+	widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 33);
 }
 
 static void boot_editor_widget_focus(struct nc_widget *widget, void *arg)
@@ -478,9 +493,9 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
 
 	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,
+	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, 6,
+	boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 10,
 					_("Cancel"), cancel_click, boot_editor);
 }
 
@@ -509,6 +524,36 @@ void boot_editor_update(struct boot_editor *boot_editor,
 	pad_refresh(boot_editor);
 }
 
+/* Return the number of columns required to display a localised string */
+static int strncols(const char *str)
+{
+	int i, wlen, ncols = 0;
+	wchar_t *wstr;
+
+	wlen = mbstowcs(NULL, str, 0);
+	if (wlen <= 0)
+		return wlen;
+
+	wstr = malloc(sizeof(wchar_t) * wlen + 1);
+	if (!wstr)
+		return -1;
+
+	wlen = mbstowcs(wstr, str, wlen);
+	if (wlen <= 0) {
+		free(wstr);
+		return wlen;
+	}
+
+	/* Processing each character individually lets us use the same
+	 * check for all languages */
+	for (i = 0; i < wlen; i++) {
+		ncols += wcwidth(wstr[i]);
+	}
+
+	free(wstr);
+	return ncols;
+}
+
 struct boot_editor *boot_editor_init(struct cui *cui,
 		struct pmenu_item *item,
 		const struct system_info *sysinfo,
@@ -528,9 +573,13 @@ 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;
+
+	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,