From: Sam Ravnborg <sam@neptun.ravnborg.org>
Date: Mon, 25 Sep 2006 15:35:43 +0000 (+0200)
Subject: kconfig/menuconfig: do not let ncurses clutter screen on exit
X-Git-Tag: v2.6.19-rc1~220^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e94c5bde703f2f9f86d098b6bf8275c64fab10eb;p=linux-2.6

kconfig/menuconfig: do not let ncurses clutter screen on exit

Do not initialize ncurses twice - it causes unpredicable
results. My display was sometimes weird after running
make menuconfig and I had to execute 'reset' to properly
restore my display.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index f7abca4348..08a4c7af93 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -401,7 +401,7 @@ static void search_conf(void)
 	struct gstr res;
 	int dres;
 again:
-	reset_dialog();
+	dialog_clear();
 	dres = dialog_inputbox(_("Search Configuration Parameter"),
 			      _("Enter CONFIG_ (sub)string to search for (omit CONFIG_)"),
 			      10, 75, "");
@@ -603,7 +603,7 @@ static void conf(struct menu *menu)
 			item_make(_("    Save an Alternate Configuration File"));
 			item_set_tag('S');
 		}
-		reset_dialog();
+		dialog_clear();
 		res = dialog_menu(prompt ? prompt : _("Main Menu"),
 				  _(menu_instructions),
 				  active_menu, &s_scroll);
@@ -684,7 +684,7 @@ static void conf(struct menu *menu)
 
 static void show_textbox(const char *title, const char *text, int r, int c)
 {
-	reset_dialog();
+	dialog_clear();
 	dialog_textbox(title, text, r, c);
 }
 
@@ -736,7 +736,7 @@ static void conf_choice(struct menu *menu)
 			if (child->sym == sym_get_choice_value(menu->sym))
 				item_set_tag('X');
 		}
-		reset_dialog();
+		dialog_clear();
 		res = dialog_checklist(prompt ? prompt : _("Main Menu"),
 					_(radiolist_instructions),
 					 15, 70, 6);
@@ -785,7 +785,7 @@ static void conf_string(struct menu *menu)
 		default:
 			heading = "Internal mconf error!";
 		}
-		reset_dialog();
+		dialog_clear();
 		res = dialog_inputbox(prompt ? prompt : _("Main Menu"),
 				      heading, 10, 75,
 				      sym_get_string_value(menu->sym));
@@ -809,7 +809,7 @@ static void conf_load(void)
 
 	while (1) {
 		int res;
-		reset_dialog();
+		dialog_clear();
 		res = dialog_inputbox(NULL, load_config_text,
 				      11, 55, filename);
 		switch(res) {
@@ -833,7 +833,7 @@ static void conf_save(void)
 {
 	while (1) {
 		int res;
-		reset_dialog();
+		dialog_clear();
 		res = dialog_inputbox(NULL, save_config_text,
 				      11, 55, filename);
 		switch(res) {
@@ -889,7 +889,7 @@ int main(int ac, char **av)
 	init_dialog(menu_backtitle);
 	do {
 		conf(&rootmenu);
-		reset_dialog();
+		dialog_clear();
 		res = dialog_yesno(NULL,
 				   _("Do you wish to save your "
 				     "new kernel configuration?\n"