X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-boot-editor.c;h=274bd9d2fa1b4df079eb050c10524bc46abad5b1;hp=79ca3a74269e7311140cb56de183d0152ac487e7;hb=acc5ace6e58db2f3dceb1f7a27d0fc1fb29c4a27;hpb=c4b4ebc4c61b7f374582c621aec846aba3795954 diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c index 79ca3a7..274bd9d 100644 --- a/ui/ncurses/nc-boot-editor.c +++ b/ui/ncurses/nc-boot-editor.c @@ -16,15 +16,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#if defined(HAVE_CONFIG_H) #include "config.h" - -#define _GNU_SOURCE +#endif #include #include +#include #include "log/log.h" #include "talloc/talloc.h" +#include "i18n/i18n.h" #include "nc-boot-editor.h" #include "nc-widgets.h" @@ -33,9 +35,16 @@ struct boot_editor { struct cui *cui; void *data; struct pmenu_item *item; + enum { + 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; int label_x; int field_x; @@ -55,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; @@ -65,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; @@ -98,9 +110,13 @@ static struct boot_editor *boot_editor_from_arg(void *arg) 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); + 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; } @@ -131,7 +147,7 @@ static char *conditional_prefix(struct pb_boot_data *ctx, if (!value || !*value) return NULL; - sep = NULL; + sep = ""; if (!prefix) prefix = ""; else if (prefix[strlen(prefix)] != '/') @@ -161,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); @@ -183,19 +203,44 @@ static struct pb_boot_data *boot_editor_prepare_data( static void boot_editor_process_key(struct nc_scr *scr, int key) { struct boot_editor *boot_editor = boot_editor_from_scr(scr); + struct pmenu_item *item; + struct pb_boot_data *bd; bool handled; handled = widgetset_process_key(boot_editor->widgetset, key); - if (handled) { + if (handled) pad_refresh(boot_editor); - return; - } - switch (key) { - case 'x': - case 27: /* ESC */ - boot_editor->on_exit(boot_editor->cui, NULL, NULL); - nc_flush_keys(); + else if (key == 'x' || key == 27) + boot_editor->state = STATE_CANCEL; + + else if (key == 'h') + boot_editor->state = STATE_HELP; + + item = NULL; + bd = NULL; + + switch (boot_editor->state) { + 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; } } @@ -215,16 +260,19 @@ static int boot_editor_destructor(void *arg) static void ok_click(void *arg) { struct boot_editor *boot_editor = arg; - struct pb_boot_data *bd; + boot_editor->state = STATE_SAVE; +} - bd = boot_editor_prepare_data(boot_editor); - boot_editor->on_exit(boot_editor->cui, boot_editor->item, bd); +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; - boot_editor->on_exit(boot_editor->cui, NULL, NULL); + boot_editor->state = STATE_CANCEL; } static int layout_pair(struct boot_editor *boot_editor, int y, @@ -271,7 +319,8 @@ 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.help_b), y, 19); + widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 33); } static void boot_editor_widget_focus(struct nc_widget *widget, void *arg) @@ -332,7 +381,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); } @@ -412,7 +461,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, @@ -420,27 +470,33 @@ 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, "image:"); + boot_editor->widgets.image_l = widget_new_label(set, 0, 0, + _("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:"); + boot_editor->widgets.initrd_l = widget_new_label(set, 0, 0, + _("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, "dtb:"); + boot_editor->widgets.dtb_l = widget_new_label(set, 0, 0, + _("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, "args:"); + boot_editor->widgets.args_l = widget_new_label(set, 0, 0, + _("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); + _("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, @@ -461,11 +517,43 @@ void boot_editor_update(struct boot_editor *boot_editor, boot_editor_populate_device_select(boot_editor, sysinfo); + boot_editor_layout_widgets(boot_editor); + widgetset_post(boot_editor->widgetset); 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, @@ -484,19 +572,25 @@ struct boot_editor *boot_editor_init(struct cui *cui, boot_editor->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 = 9; + 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) { struct pb_boot_data *bd = cod_from_item(item)->bd; @@ -517,6 +611,7 @@ struct boot_editor *boot_editor_init(struct cui *cui, boot_editor_setup_widgets(boot_editor, sysinfo); boot_editor_layout_widgets(boot_editor); + wrefresh(boot_editor->scr.main_ncw); return boot_editor; }