Re: [PATCH] kconfig: show number of search results in search UI

[Randy Dunlap]

On 10/10/26 8:11 AM, Zuo An wrote:
> When searching for symbols in nconfig/menuconfig, the search
> results popup will now display a count of the results
> in the title bar, e.g. "Search Results (42)".
> 
> This helps the user to gauge the number of matches quickly and
> refine their search if needed, rather than having to scroll down
> by an indefinite amount (especially for nconfig's UI which lacks
> a display of the scrolling progress).
> 
> Signed-off-by: Zuo An <zuoan.penguin@xxxxxxxxx>

Tested-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>

Looks good. Thanks.

> ---
>  scripts/kconfig/lkc_proto.h |  2 +-
>  scripts/kconfig/mconf.c     | 10 ++++++++--
>  scripts/kconfig/nconf.c     | 10 ++++++++--
>  scripts/kconfig/qconf.cc    |  2 +-
>  scripts/kconfig/symbol.c    |  4 +++-
>  5 files changed, 21 insertions(+), 7 deletions(-)
> 
> diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
> index 8914b4e8f2a8..224acc142769 100644
> --- a/scripts/kconfig/lkc_proto.h
> +++ b/scripts/kconfig/lkc_proto.h
> @@ -21,7 +21,7 @@ bool conf_errors(void);
>  struct symbol * sym_lookup(const char *name, int flags);
>  struct symbol * sym_find(const char *name);
>  void print_symbol_for_listconfig(struct symbol *sym);
> -struct symbol ** sym_re_search(const char *pattern);
> +struct symbol ** sym_re_search(const char *pattern, int *sym_cnt);
>  const char * sym_type_name(enum symbol_type type);
>  void sym_calc_value(struct symbol *sym);
>  bool sym_dep_errors(void);
> diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
> index b8b7bba84a65..f37c3f8e1f4d 100644
> --- a/scripts/kconfig/mconf.c
> +++ b/scripts/kconfig/mconf.c
> @@ -384,8 +384,10 @@ static void show_help(struct menu *menu)
>  static void search_conf(void)
>  {
>  	struct symbol **sym_arr;
> +	int sym_cnt;
>  	struct gstr res;
>  	struct gstr title;
> +	struct gstr res_title;
>  	char *dialog_input;
>  	int dres, vscroll = 0, hscroll = 0;
>  	bool again;
> @@ -422,7 +424,7 @@ static void search_conf(void)
>  	stpart.text = str_get(&sttext);
>  	list_add_tail(&stpart.entries, &trail);
>  
> -	sym_arr = sym_re_search(dialog_input);
> +	sym_arr = sym_re_search(dialog_input, &sym_cnt);
>  	do {
>  		LIST_HEAD(head);
>  		struct search_data data = {
> @@ -433,9 +435,13 @@ static void search_conf(void)
>  		jump_key_char = 0;
>  		res = get_relations_str(sym_arr, &head);
>  		set_subtitle();
> -		dres = show_textbox_ext("Search Results", str_get(&res), 0, 0,
> +
> +		res_title = str_new();
> +		str_printf(&res_title, "Search Results (%d)", sym_cnt);
> +		dres = show_textbox_ext(str_get(&res_title), str_get(&res), 0, 0,
>  					&vscroll, &hscroll,
>  					handle_search_keys, &data);
> +
>  		again = false;
>  		if (dres >= '1' && dres <= '9') {
>  			assert(data.target != NULL);
> diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
> index 521700ed7152..e3b25940b931 100644
> --- a/scripts/kconfig/nconf.c
> +++ b/scripts/kconfig/nconf.c
> @@ -700,8 +700,10 @@ static int do_exit(void)
>  static void search_conf(void)
>  {
>  	struct symbol **sym_arr;
> +	int sym_cnt;
>  	struct gstr res;
>  	struct gstr title;
> +	struct gstr res_title;
>  	char *dialog_input;
>  	int dres, vscroll = 0, hscroll = 0;
>  	bool again;
> @@ -732,7 +734,7 @@ static void search_conf(void)
>  	if (strncasecmp(dialog_input_result, CONFIG_, strlen(CONFIG_)) == 0)
>  		dialog_input += strlen(CONFIG_);
>  
> -	sym_arr = sym_re_search(dialog_input);
> +	sym_arr = sym_re_search(dialog_input, &sym_cnt);
>  
>  	do {
>  		LIST_HEAD(head);
> @@ -742,10 +744,14 @@ static void search_conf(void)
>  		};
>  		jump_key_char = 0;
>  		res = get_relations_str(sym_arr, &head);
> +
> +		res_title = str_new();
> +		str_printf(&res_title, "Search Results (%d)", sym_cnt);
>  		dres = show_scroll_win_ext(main_window,
> -				"Search Results", str_get(&res),
> +				str_get(&res_title), str_get(&res),
>  				&vscroll, &hscroll,
>  				handle_search_keys, &data);
> +
>  		again = false;
>  		if (dres >= '1' && dres <= '9') {
>  			assert(data.target != NULL);
> diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
> index b02ead7a3f98..8f51dc55226d 100644
> --- a/scripts/kconfig/qconf.cc
> +++ b/scripts/kconfig/qconf.cc
> @@ -1245,7 +1245,7 @@ void ConfigSearchWindow::search(void)
>  	list->clear();
>  	info->clear();
>  
> -	result = sym_re_search(editField->text().toLatin1());
> +	result = sym_re_search(editField->text().toLatin1(), nullptr);
>  	if (!result)
>  		return;
>  	for (p = result; *p; p++) {
> diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
> index 7e81b3676ee9..31f927bd563a 100644
> --- a/scripts/kconfig/symbol.c
> +++ b/scripts/kconfig/symbol.c
> @@ -1020,7 +1020,7 @@ static int sym_rel_comp(const void *sym1, const void *sym2)
>  	return strcmp(s1->sym->name, s2->sym->name);
>  }
>  
> -struct symbol **sym_re_search(const char *pattern)
> +struct symbol **sym_re_search(const char *pattern, int *sym_cnt)
>  {
>  	struct symbol *sym, **sym_arr = NULL;
>  	struct sym_match *sym_match_arr = NULL;
> @@ -1065,6 +1065,8 @@ struct symbol **sym_re_search(const char *pattern)
>  			sym_arr[i] = sym_match_arr[i].sym;
>  		sym_arr[cnt] = NULL;
>  	}
> +	if (sym_cnt)
> +		*sym_cnt = cnt;
>  sym_re_search_free:
>  	/* sym_match_arr can be NULL if no match, but free(NULL) is OK */
>  	free(sym_match_arr);

-- 
~Randy