1 files changed, 96 insertions, 27 deletions

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index f584a281bb4c..48f67448af7b 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -236,16 +236,19 @@ search_help[] = N_(
         "Result:\n"
         "-----------------------------------------------------------------\n"
         "Symbol: FOO [=m]\n"
+        "Type  : tristate\n"
         "Prompt: Foo bus is used to drive the bar HW\n"
-        "Defined at drivers/pci/Kconfig:47\n"
-        "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
-        "Location:\n"
-        "  -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
-        "    -> PCI support (PCI [=y])\n"
-        "      -> PCI access mode (<choice> [=y])\n"
-        "Selects: LIBCRC32\n"
-        "Selected by: BAR\n"
+        "  Defined at drivers/pci/Kconfig:47\n"
+        "  Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
+        "  Location:\n"
+        "    -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
+        "      -> PCI support (PCI [=y])\n"
+        "(1)     -> PCI access mode (<choice> [=y])\n"
+        "  Selects: LIBCRC32\n"
+        "  Selected by: BAR\n"
         "-----------------------------------------------------------------\n"
+        "o The line 'Type:' shows the type of the configuration option for\n"
+        "  this symbol (boolean, tristate, string, ...)\n"
         "o The line 'Prompt:' shows the text used in the menu structure for\n"
         "  this symbol\n"
         "o The 'Defined at' line tell at what file / line number the symbol\n"
@@ -254,8 +257,12 @@ search_help[] = N_(
         "  this symbol to be visible in the menu (selectable)\n"
         "o The 'Location:' lines tell where in the menu structure this symbol\n"
         "  is located\n"
-        "    A location followed by a [=y] indicate that this is a selectable\n"
-        "    menu item - and current value is displayed inside brackets.\n"
+        "    A location followed by a [=y] indicates that this is a\n"
+        "    selectable menu item - and the current value is displayed inside\n"
+        "    brackets.\n"
+        "    Press the key in the (#) prefix to jump directly to that\n"
+        "    location. You will be returned to the current search results\n"
+        "    after exiting this new menu.\n"
         "o The 'Selects:' line tell what symbol will be automatically\n"
         "  selected if this symbol is selected (y or m)\n"
         "o The 'Selected by' line tell what symbol has selected this symbol\n"
@@ -273,13 +280,15 @@ static struct menu *current_menu;
 static int child_count;
 static int single_menu_mode;
 static int show_all_options;
-static int saved_x, saved_y;
 
-static void conf(struct menu *menu);
+static void conf(struct menu *menu, struct menu *active_menu);
 static void conf_choice(struct menu *menu);
 static void conf_string(struct menu *menu);
 static void conf_load(void);
 static void conf_save(void);
+static int show_textbox_ext(const char *title, char *text, int r, int c,
+                            int *keys, int *vscroll, int *hscroll,
+                            update_text_fn update_text, void *data);
 static void show_textbox(const char *title, const char *text, int r, int c);
 static void show_helptext(const char *title, const char *text);
 static void show_help(struct menu *menu);
@@ -302,12 +311,47 @@ static void set_config_filename(const char *config_filename)
 }
 
 
+struct search_data {
+        struct jk_head *head;
+        struct menu **targets;
+        int *keys;
+};
+
+static void update_text(char *buf, size_t start, size_t end, void *_data)
+{
+        struct search_data *data = _data;
+        struct jump_key *pos;
+        int k = 0;
+
+        CIRCLEQ_FOREACH(pos, data->head, entries) {
+                if (pos->offset >= start && pos->offset < end) {
+                        char header[4];
+
+                        if (k < JUMP_NB) {
+                                int key = '0' + (pos->index % JUMP_NB) + 1;
+
+                                sprintf(header, "(%c)", key);
+                                data->keys[k] = key;
+                                data->targets[k] = pos->target;
+                                k++;
+                        } else {
+                                sprintf(header, "   ");
+                        }
+
+                        memcpy(buf + pos->offset, header, sizeof(header) - 1);
+                }
+        }
+        data->keys[k] = 0;
+}
+
 static void search_conf(void)
 {
         struct symbol **sym_arr;
         struct gstr res;
         char *dialog_input;
-        int dres;
+        int dres, vscroll = 0, hscroll = 0;
+        bool again;
+
 again:
         dialog_clear();
         dres = dialog_inputbox(_("Search Configuration Parameter"),
@@ -330,10 +374,30 @@ again:
                 dialog_input += strlen(CONFIG_);
 
         sym_arr = sym_re_search(dialog_input);
-        res = get_relations_str(sym_arr);
+        do {
+                struct jk_head head = CIRCLEQ_HEAD_INITIALIZER(head);
+                struct menu *targets[JUMP_NB];
+                int keys[JUMP_NB + 1], i;
+                struct search_data data = {
+                        .head = &head,
+                        .targets = targets,
+                        .keys = keys,
+                };
+
+                res = get_relations_str(sym_arr, &head);
+                dres = show_textbox_ext(_("Search Results"), (char *)
+                                        str_get(&res), 0, 0, keys, &vscroll,
+                                        &hscroll, &update_text, (void *)
+                                        &data);
+                again = false;
+                for (i = 0; i < JUMP_NB && keys[i]; i++)
+                        if (dres == keys[i]) {
+                                conf(targets[i]->parent, targets[i]);
+                                again = true;
+                        }
+                str_free(&res);
+        } while (again);
         free(sym_arr);
-        show_textbox(_("Search Results"), str_get(&res), 0, 0);
-        str_free(&res);
 }
 
 static void build_conf(struct menu *menu)
@@ -514,12 +578,11 @@ conf_childs:
         indent -= doint;
 }
 
-static void conf(struct menu *menu)
+static void conf(struct menu *menu, struct menu *active_menu)
 {
         struct menu *submenu;
         const char *prompt = menu_get_prompt(menu);
         struct symbol *sym;
-        struct menu *active_menu = NULL;
         int res;
         int s_scroll = 0;
 
@@ -562,13 +625,13 @@ static void conf(struct menu *menu)
                                 if (single_menu_mode)
                                         submenu->data = (void *) (long) !submenu->data;
                                 else
-                                        conf(submenu);
+                                        conf(submenu, NULL);
                                 break;
                         case 't':
                                 if (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)
                                         conf_choice(submenu);
                                 else if (submenu->prompt->type == P_MENU)
-                                        conf(submenu);
+                                        conf(submenu, NULL);
                                 break;
                         case 's':
                                 conf_string(submenu);
@@ -607,7 +670,7 @@ static void conf(struct menu *menu)
                         if (item_is_tag('t'))
                                 sym_toggle_tristate_value(sym);
                         else if (item_is_tag('m'))
-                                conf(submenu);
+                                conf(submenu, NULL);
                         break;
                 case 7:
                         search_conf();
@@ -619,10 +682,19 @@ static void conf(struct menu *menu)
         }
 }
 
-static void show_textbox(const char *title, const char *text, int r, int c)
+static int show_textbox_ext(const char *title, char *text, int r, int c, int
+                            *keys, int *vscroll, int *hscroll, update_text_fn
+                            update_text, void *data)
 {
         dialog_clear();
-        dialog_textbox(title, text, r, c);
+        return dialog_textbox(title, text, r, c, keys, vscroll, hscroll,
+                              update_text, data);
+}
+
+static void show_textbox(const char *title, const char *text, int r, int c)
+{
+        show_textbox_ext(title, (char *) text, r, c, (int []) {0}, NULL, NULL,
+                         NULL, NULL);
 }
 
 static void show_helptext(const char *title, const char *text)
@@ -862,9 +934,6 @@ int main(int ac, char **av)
                         single_menu_mode = 1;
         }
 
-        initscr();
-
-        getyx(stdscr, saved_y, saved_x);
         if (init_dialog(NULL)) {
                 fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
                 fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));
@@ -873,7 +942,7 @@ int main(int ac, char **av)
 
         set_config_filename(conf_get_configname());
         do {
-                conf(&rootmenu);
+                conf(&rootmenu, NULL);
                 res = handle_exit();
         } while (res == KEY_ESC);