menuconfig: Assign jump keys per-page instead of globally

At the moment, keys 1-9 are assigned to the first 9 search results. This patch
makes them assigned to the first 9 results per-page instead. We are much less
likely to run out of keys that way.

Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
Signed-off-by: Michal Marek <mmarek@suse.cz>

2 files changed, 49 insertions, 27 deletions

diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
index 2a01cdfae5a8..ee17a5264d5b 100644
--- a/scripts/kconfig/lxdialog/dialog.h
+++ b/scripts/kconfig/lxdialog/dialog.h
@@ -210,8 +210,13 @@ 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);
-int dialog_textbox(const char *title, const char *file, int height, int width,
-                   int *keys, int *_vscroll, int *_hscroll);
+
+
+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_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 3b3c5c470bf8..a48bb93e0907 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -22,23 +22,25 @@
 #include "dialog.h"
 
 static void back_lines(int n);
-static void print_page(WINDOW * win, int height, int width);
-static void print_line(WINDOW * win, int row, int width);
+static void print_page(WINDOW *win, int height, int width, update_text_fn
+                       update_text, void *data);
+static void print_line(WINDOW *win, int row, int width);
 static char *get_line(void);
 static void print_position(WINDOW * win);
 
 static int hscroll;
 static int begin_reached, end_reached, page_length;
-static const char *buf;
-static const char *page;
+static char *buf;
+static char *page;
 
 /*
  * refresh window content
  */
 static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw,
-                                                          int cur_y, int cur_x)
+                             int cur_y, int cur_x, update_text_fn update_text,
+                             void *data)
 {
-        print_page(box, boxh, boxw);
+        print_page(box, boxh, boxw, update_text, data);
         print_position(dialog);
         wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
         wrefresh(dialog);
@@ -49,9 +51,11 @@ static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw,
  * Display text from a file in a dialog box.
  *
  * keys is a null-terminated array
+ * update_text() may not add or remove any '\n' or '\0' in tbuf
  */
-int dialog_textbox(const char *title, const char *tbuf, int initial_height,
-                   int initial_width, int *keys, int *_vscroll, int *_hscroll)
+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 i, x, y, cur_x, cur_y, key = 0;
         int height, width, boxh, boxw;
@@ -131,7 +135,8 @@ do_resize:
 
         /* Print first page of text */
         attr_clear(box, boxh, boxw, dlg.dialog.atr);
-        refresh_text_box(dialog, box, boxh, boxw, cur_y, cur_x);
+        refresh_text_box(dialog, box, boxh, boxw, cur_y, cur_x, update_text,
+                         data);
 
         while (!done) {
                 key = wgetch(dialog);
@@ -150,7 +155,8 @@ do_resize:
                                 begin_reached = 1;
                                 page = buf;
                                 refresh_text_box(dialog, box, boxh, boxw,
-                                                 cur_y, cur_x);
+                                                 cur_y, cur_x, update_text,
+                                                 data);
                         }
                         break;
                 case 'G':       /* Last page */
@@ -160,8 +166,8 @@ do_resize:
                         /* point to last char in buf */
                         page = buf + strlen(buf);
                         back_lines(boxh);
-                        refresh_text_box(dialog, box, boxh, boxw,
-                                         cur_y, cur_x);
+                        refresh_text_box(dialog, box, boxh, boxw, cur_y,
+                                         cur_x, update_text, data);
                         break;
                 case 'K':       /* Previous line */
                 case 'k':
@@ -171,7 +177,7 @@ do_resize:
 
                         back_lines(page_length + 1);
                         refresh_text_box(dialog, box, boxh, boxw, cur_y,
-                                         cur_x);
+                                         cur_x, update_text, data);
                         break;
                 case 'B':       /* Previous page */
                 case 'b':
@@ -180,8 +186,8 @@ do_resize:
                         if (begin_reached)
                                 break;
                         back_lines(page_length + boxh);
-                        refresh_text_box(dialog, box, boxh, boxw,
-                                         cur_y, cur_x);
+                        refresh_text_box(dialog, box, boxh, boxw, cur_y,
+                                         cur_x, update_text, data);
                         break;
                 case 'J':       /* Next line */
                 case 'j':
@@ -191,7 +197,7 @@ do_resize:
 
                         back_lines(page_length - 1);
                         refresh_text_box(dialog, box, boxh, boxw, cur_y,
-                                         cur_x);
+                                         cur_x, update_text, data);
                         break;
                 case KEY_NPAGE: /* Next page */
                 case ' ':
@@ -200,8 +206,8 @@ do_resize:
                                 break;
 
                         begin_reached = 0;
-                        refresh_text_box(dialog, box, boxh, boxw,
-                                         cur_y, cur_x);
+                        refresh_text_box(dialog, box, boxh, boxw, cur_y,
+                                         cur_x, update_text, data);
                         break;
                 case '0':       /* Beginning of line */
                 case 'H':       /* Scroll left */
@@ -216,8 +222,8 @@ do_resize:
                                 hscroll--;
                         /* Reprint current page to scroll horizontally */
                         back_lines(page_length);
-                        refresh_text_box(dialog, box, boxh, boxw,
-                                         cur_y, cur_x);
+                        refresh_text_box(dialog, box, boxh, boxw, cur_y,
+                                         cur_x, update_text, data);
                         break;
                 case 'L':       /* Scroll right */
                 case 'l':
@@ -227,8 +233,8 @@ do_resize:
                         hscroll++;
                         /* Reprint current page to scroll horizontally */
                         back_lines(page_length);
-                        refresh_text_box(dialog, box, boxh, boxw,
-                                         cur_y, cur_x);
+                        refresh_text_box(dialog, box, boxh, boxw, cur_y,
+                                         cur_x, update_text, data);
                         break;
                 case KEY_ESC:
                         if (on_key_esc(dialog) == KEY_ESC)
@@ -301,12 +307,23 @@ static void back_lines(int n)
 }
 
 /*
- * Print a new page of text. Called by dialog_textbox().
+ * Print a new page of text.
  */
-static void print_page(WINDOW * win, int height, int width)
+static void print_page(WINDOW *win, int height, int width, update_text_fn
+                       update_text, void *data)
 {
         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);
@@ -319,7 +336,7 @@ static void print_page(WINDOW * win, int height, int width)
 }
 
 /*
- * Print a new line of text. Called by dialog_textbox() and print_page().
+ * Print a new line of text.
  */
 static void print_line(WINDOW * win, int row, int width)
 {