fix menuconfig choice item help display

PATCH New Bjorn Helgaas 1 participant 1 message Jan 27, 2004 Kconfig

lore

Share & tools

lore

Bjorn Helgaas

author

2004-01-27 16:55 UTC #0 lore raw

PATCH 1/1 fix menuconfig choice item help display

This patch against 2.6.2-rc2 fixes menuconfig so it can display help text for individual choice group config entries.

Previously it would only display the help text attached to the "choice" item. There was no way to display the help attached to individual config entries inside the choice group. Typically, the "choice" item has no help text, and all the useful help is attached to the individual entries, so this was a bit of a problem.

===== scripts/kconfig/mconf.c 1.10 vs edited =====

scripts/kconfig/mconf.c +3 -1

@@ -635,7 +635,9 @@
 			sym_set_tristate_value(menu->sym, yes);
 			return;
 		case 1:
-			show_help(menu);
+			if (sscanf(input_buf, "%p", &child) != 1)
+				break;
+			show_help(child);
 			break;
 		case 255:
 			return;

===== scripts/lxdialog/checklist.c 1.3 vs edited =====

scripts/lxdialog/checklist.c +8 -1

@@ -303,6 +303,9 @@
 	case 'h':
 	case '?':
 	    delwin (dialog);
+	    fprintf(stderr, "%s \"%s\"\n",
+		    items[(scroll + choice) * 3],
+		    items[(scroll + choice) * 3 + 1]);
 	    free (status);
 	    return 1;
 	case TAB:

@@ -318,7 +321,11 @@
 	case 's':
 	case ' ':
 	case '\n':
-	    if (!button) {
+	    if (button)
+		    fprintf(stderr, "%s \"%s\"\n",
+			    items[(scroll + choice) * 3],
+			    items[(scroll + choice) * 3 + 1]);
+	    else {
 		if (flag == FLAG_CHECK) {
 		    status[scroll + choice] = !status[scroll + choice];
 		    wmove (list, choice, check_x);