X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-boot-editor.c;h=409e638e21eafd39e55aa183b5213d7eeff7373f;hb=bcb8d5ce5b43c1866b4520a1e8c4bd75ea141c58;hp=6da36302f49641ba52c666c7fb75071b0088d3d5;hpb=4e30f260106ac5f7007e213db1d1e54298393290;p=petitboot

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 6da3630..409e638 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"
@@ -305,7 +306,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 +479,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 +510,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,
@@ -529,8 +560,11 @@ struct boot_editor *boot_editor_init(struct cui *cui,
 	boot_editor->on_exit = on_exit;
 	boot_editor->state = STATE_EDIT;
 
+	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,