Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af6c1598 authored by Peter Korsgaard's avatar Peter Korsgaard Committed by Sam Ravnborg
Browse files

kconfig: handle comment entries within choice/endchoice 



Implement support for comment entries within choice groups. Comment entries
are displayed visually distinct from normal configs, and selecting them is
a no-op.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 3af968e0

scripts/kconfig/lxdialog/checklist.c

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ static void print_item(WINDOW * win, int choice, int selected) 
	wmove(win, choice, check_x);

	wattrset(win, selected ? dlg.check_selected.atr

		 : dlg.check.atr);

	if (!item_is_tag(':'))

		wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');



	wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr);

scripts/kconfig/mconf.c

+9 −1
Original line number Diff line number Diff line
@@ -732,7 +732,12 @@ static void conf_choice(struct menu *menu) 
		for (child = menu->list; child; child = child->next) {

			if (!menu_is_visible(child))

				continue;

			if (child->sym)

				item_make("%s", _(menu_get_prompt(child)));

			else {

				item_make("*** %s ***", _(menu_get_prompt(child)));

				item_set_tag(':');

			}

			item_set_data(child);

			if (child->sym == active)

				item_set_selected(1);
@@ -748,6 +753,9 @@ static void conf_choice(struct menu *menu) 
		case 0:

			if (selected) {

				child = item_data();

				if (!child->sym)

					break;



				sym_set_tristate_value(child->sym, yes);

			}

			return;