On Sat, Jul 1, 2023 at 12:58 PM Jesse T <mr.bossman075@xxxxxxxxx> wrote:
>
> On Thu, Jun 29, 2023 at 12:03 PM Masahiro Yamada <masahiroy@xxxxxxxxxx> wrote:
> >
> > Commit 95ac9b3b585d ("menuconfig: Assign jump keys per-page instead
> > of globally") injects a lot of hacks to the bottom of the textbox
> > infrastructure.
> >
> > I reverted many of them without changing the behavior. (almost)
> > Now, the key markers are inserted when constructing the search result
> > instead of updating the text buffer on-the-fly.
> >
> > The buffer passed to the textbox got back to a constant string.
> > The ugly casts from (const char *) to (char *) went away.
> >
> > A disadvantage is that the same key numbers might be diplayed multiple
> > times in the dialog if you use a huge window (but I believe it is
> > unlikely to happen).
> >
> > Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> > ---
> >
> > scripts/kconfig/lkc.h | 1 +
> > scripts/kconfig/lxdialog/dialog.h | 10 ++--
> > scripts/kconfig/lxdialog/textbox.c | 68 +++++++++--------------
> > scripts/kconfig/mconf.c | 86 +++++++++++++++++-------------
> > scripts/kconfig/menu.c | 22 ++++++--
> > 5 files changed, 97 insertions(+), 90 deletions(-)
> >
> > diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
> > index e7118d62a45f..d5c27180ce91 100644
> > --- a/scripts/kconfig/lkc.h
> > +++ b/scripts/kconfig/lkc.h
> > @@ -101,6 +101,7 @@ const char *menu_get_prompt(struct menu *menu);
> > struct menu *menu_get_parent_menu(struct menu *menu);
> > bool menu_has_help(struct menu *menu);
> > const char *menu_get_help(struct menu *menu);
> > +int get_jump_key(void);
> > struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head);
> > void menu_get_ext_help(struct menu *menu, struct gstr *help);
> >
> > diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
> > index 347daf25fdc8..cd1b59c24b21 100644
> > --- a/scripts/kconfig/lxdialog/dialog.h
> > +++ b/scripts/kconfig/lxdialog/dialog.h
> > @@ -196,13 +196,9 @@ int first_alpha(const char *string, const char *exempt);
> > int dialog_yesno(const char *title, const char *prompt, int height, int width);
> > int dialog_msgbox(const char *title, const char *prompt, int height,
> > int width, int pause);
> > -
> > -
> > -typedef void (*update_text_fn)(char *buf, size_t start, size_t end, void
> > - *_data);
> > -int dialog_textbox(const char *title, char *tbuf, int initial_height,
> > - int initial_width, int *keys, int *_vscroll, int *_hscroll,
> > - update_text_fn update_text, void *data);
> > +int dialog_textbox(const char *title, const char *tbuf, int initial_height,
> > + int initial_width, int *_vscroll, int *_hscroll,
> > + int (*extra_key_cb)(int, int, int, void *), void *data);
> > int dialog_menu(const char *title, const char *prompt,
> > const void *selected, int *s_scroll);
> > int dialog_checklist(const char *title, const char *prompt, int height,
> > diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
> > index bc4d4fb1dc75..e6cd7bb83746 100644
> > --- a/scripts/kconfig/lxdialog/textbox.c
> > +++ b/scripts/kconfig/lxdialog/textbox.c
> > @@ -10,8 +10,8 @@
> >
> > static int hscroll;
> > static int begin_reached, end_reached, page_length;
> > -static char *buf;
> > -static char *page;
> > +static const char *buf, *page;
> > +static int start, end;
> >
> > /*
> > * Go back 'n' lines in text. Called by dialog_textbox().
> > @@ -98,21 +98,10 @@ static void print_line(WINDOW *win, int row, int width)
> > /*
> > * Print a new page of text.
> > */
> > -static void print_page(WINDOW *win, int height, int width, update_text_fn
> > - update_text, void *data)
> > +static void print_page(WINDOW *win, int height, int width)
> > {
> > int i, passed_end = 0;
> >
> > - if (update_text) {
> > - char *end;
> > -
> > - for (i = 0; i < height; i++)
> > - get_line();
> > - end = page;
> > - back_lines(height);
> > - update_text(buf, page - buf, end - buf, data);
> > - }
> > -
> > page_length = 0;
> > for (i = 0; i < height; i++) {
> > print_line(win, i, width);
> > @@ -142,24 +131,26 @@ static void print_position(WINDOW *win)
> > * refresh window content
> > */
> > static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw,
> > - int cur_y, int cur_x, update_text_fn update_text,
> > - void *data)
> > + int cur_y, int cur_x)
>
> The change for refresh_text_box is very large.
> Is there an easy way to split the change of `refresh_text_box` and
> everything else
> while still maintaining bisectability?
I do not think the change is large or complicated.
It just stopped passing down 'update_text' and 'data'.
The same pattern.
The point is this is revert of 95ac9b3b585d
The revert should not be split.
> > @@ -351,11 +333,9 @@ int dialog_textbox(const char *title, char *tbuf, int initial_height,
> > on_key_resize();
> > goto do_resize;
> > default:
> > - for (i = 0; keys[i]; i++) {
> > - if (key == keys[i]) {
> > - done = true;
> > - break;
> > - }
> > + if (extra_key_cb(key, start, end, data)) {
>
> `extra_key_cb` is null when not used, on the help page this will segfault.
Thanks.
I will fix it.
> > diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
> > index b90fff833588..5578b8bc8a23 100644
> > --- a/scripts/kconfig/menu.c
> > +++ b/scripts/kconfig/menu.c
> > @@ -701,6 +701,11 @@ static void get_dep_str(struct gstr *r, struct expr *expr, const char *prefix)
> > }
> > }
> >
> > +int __attribute__((weak)) get_jump_key(void)
>
> This seems like a non-optimal solution, otherwise fine.
Do you have a better idea?
--
Best Regards
Masahiro Yamada
