]> git.ozlabs.org Git - petitboot/blobdiff - ui/ncurses/nc-boot-editor.c
ui/ncurses: Reduce unnecessary calls to redrawwin
[petitboot] / ui / ncurses / nc-boot-editor.c
index 5765c955fe14b53747d3b63db126110aac464062..274bd9d2fa1b4df079eb050c10524bc46abad5b1 100644 (file)
  *  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 <assert.h>
 #include <string.h>
+#include <stdlib.h>
 
 #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,12 +64,19 @@ 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;
 
        const char              *selected_device;
+       char                    *image;
+       char                    *initrd;
+       char                    *dtb;
+       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;
@@ -94,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;
 }
@@ -127,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)] != '/')
@@ -157,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);
@@ -179,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;
        }
 }
 
@@ -211,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,
@@ -267,9 +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);
-
-       pad_refresh(boot_editor);
+       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)
@@ -311,7 +362,7 @@ static void boot_editor_populate_device_select(struct boot_editor *boot_editor,
 
        widget_select_drop_options(select);
 
-       for (i = 0; i < sysinfo->n_blockdevs; i++) {
+       for (i = 0; sysinfo && i < sysinfo->n_blockdevs; i++) {
                struct blockdev_info *bd_info = sysinfo->blockdevs[i];
                const char *name;
 
@@ -321,8 +372,7 @@ static void boot_editor_populate_device_select(struct boot_editor *boot_editor,
                                !strcmp(bd_info->name,
                                                boot_editor->selected_device);
 
-               widget_select_add_option(boot_editor->widgets.device_f,
-                               i, name, selected);
+               widget_select_add_option(select, i, name, selected);
        }
 
        /* If we're editing an existing option, the paths will be fully-
@@ -331,8 +381,8 @@ static void boot_editor_populate_device_select(struct boot_editor *boot_editor,
         * changed. */
        selected = !boot_editor->selected_device;
 
-       widget_select_add_option(boot_editor->widgets.device_f,
-                       -1, "Specify paths/URLs manually", selected);
+       widget_select_add_option(select, -1, _("Specify paths/URLs manually"),
+                       selected);
 }
 
 static bool path_on_device(struct blockdev_info *bd_info,
@@ -355,8 +405,7 @@ static bool path_on_device(struct blockdev_info *bd_info,
 
 
 static void boot_editor_find_device(struct boot_editor *boot_editor,
-               struct pb_boot_data *bd, const struct system_info *sysinfo,
-               char **image, char **initrd, char **dtb)
+               struct pb_boot_data *bd, const struct system_info *sysinfo)
 {
        struct blockdev_info *bd_info, *tmp;
        unsigned int i, len;
@@ -389,12 +438,120 @@ static void boot_editor_find_device(struct boot_editor *boot_editor,
        /* ok, we match; preselect the device option, and remove the common
         * prefix */
        boot_editor->selected_device = bd_info->name;
-       *image += len;
+       boot_editor->image += len;
+
+       if (boot_editor->initrd)
+               boot_editor->initrd += len;
+       if (boot_editor->dtb)
+               boot_editor->dtb += len;
+}
+
+static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
+               const struct system_info *sysinfo)
+{
+       struct nc_widgetset *set;
+       int field_size;
+
+       field_size = COLS - 1 - boot_editor->field_x;
+
+       boot_editor->widgetset = set = widgetset_create(boot_editor,
+                       boot_editor->scr.main_ncw,
+                       boot_editor->pad);
+
+       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_f = widget_new_select(set, 0, 0,
+                                               field_size);
+       widget_select_on_change(boot_editor->widgets.device_f,
+                       boot_editor_device_select_change, boot_editor);
+
+       boot_editor_populate_device_select(boot_editor, sysinfo);
+
+       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_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:"));
+       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_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.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,
+               const struct system_info *sysinfo)
+{
+       int height;
+
+       widgetset_unpost(boot_editor->widgetset);
+
+       height = pad_height(sysinfo ? sysinfo->n_blockdevs : 0);
+       if (getmaxy(boot_editor->pad) < height) {
+               delwin(boot_editor->pad);
+               boot_editor->pad = newpad(height, COLS);
+               widgetset_set_windows(boot_editor->widgetset,
+                               boot_editor->scr.main_ncw,
+                               boot_editor->pad);
+       }
+
+       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;
+       }
 
-       if (*initrd)
-               *initrd += len;
-       if (*dtb)
-               *dtb += len;
+       /* 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,
@@ -404,12 +561,7 @@ struct boot_editor *boot_editor_init(struct cui *cui,
                                struct pmenu_item *item,
                                struct pb_boot_data *bd))
 {
-       char *image, *initrd, *dtb, *args;
        struct boot_editor *boot_editor;
-       struct nc_widgetset *set;
-       int field_size;
-
-       (void)sysinfo;
 
        boot_editor = talloc_zero(cui, struct boot_editor);
 
@@ -420,73 +572,46 @@ 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;
-               image = bd->image;
-               initrd = bd->initrd;
-               dtb = bd->dtb;
-               args = bd->args;
-               boot_editor_find_device(boot_editor, bd, sysinfo,
-                               &image, &initrd, &dtb);
+               boot_editor->image = bd->image;
+               boot_editor->initrd = bd->initrd;
+               boot_editor->dtb = bd->dtb;
+               boot_editor->args = bd->args;
+               boot_editor_find_device(boot_editor, bd, sysinfo);
        } else {
-               image = initrd = dtb = args = "";
+               boot_editor->image = boot_editor->initrd =
+                       boot_editor->dtb = boot_editor->args = "";
        }
 
-       field_size = COLS - 1 - boot_editor->field_x;
-
-       boot_editor->pad = newpad(pad_height(sysinfo->n_blockdevs), COLS);
+       boot_editor->pad = newpad(
+                               pad_height(sysinfo ? sysinfo->n_blockdevs : 0),
+                               COLS);
 
-       boot_editor->widgetset = set = widgetset_create(boot_editor,
-                       boot_editor->scr.main_ncw,
-                       boot_editor->pad);
-
-       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_f = widget_new_select(set, 0, 0,
-                                               field_size);
-       widget_select_on_change(boot_editor->widgets.device_f,
-                       boot_editor_device_select_change, 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_f = widget_new_textbox(set, 0, 0,
-                                               field_size, image);
-
-       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, initrd);
-
-       boot_editor->widgets.dtb_l = widget_new_label(set, 0, 0, "dtb:");
-       boot_editor->widgets.dtb_f = widget_new_textbox(set, 0, 0,
-                                               field_size, dtb);
-
-       boot_editor->widgets.args_l = widget_new_label(set, 0, 0, "args:");
-       boot_editor->widgets.args_f = widget_new_textbox(set, 0, 0,
-                                       field_size, 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_setup_widgets(boot_editor, sysinfo);
 
        boot_editor_layout_widgets(boot_editor);
+       wrefresh(boot_editor->scr.main_ncw);
 
        return boot_editor;
 }