ui/ncurses: Call widget process_key handlers first

[petitboot] / ui / ncurses / nc-boot-editor.c

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 274bd9d2fa1b4df079eb050c10524bc46abad5b1..4012ec5a7658dfdc8f429e00130307ed7692ec44 100644 (file)
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -22,7 +22,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <stdlib.h>
 
 #include "log/log.h"
 #include "talloc/talloc.h"
@@ -45,6 +44,7 @@ struct boot_editor {
                                        struct pmenu_item *item,
                                        struct pb_boot_data *bd);
        bool                    need_redraw;
+       bool                    need_update;
 
        int                     label_x;
        int                     field_x;
@@ -110,7 +110,14 @@ 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);
+
+       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);
@@ -318,9 +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.help_b), y, 19);
-       widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 33);
+       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)
@@ -491,7 +501,7 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
        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,
+       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);
@@ -504,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);
@@ -524,36 +539,6 @@ 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,
@@ -574,6 +559,7 @@ struct boot_editor *boot_editor_init(struct cui *cui,
        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:"));