diff options
author | Sam Ravnborg <sam@neptun.ravnborg.org> | 2006-09-25 11:35:43 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@neptun.ravnborg.org> | 2006-09-30 05:19:20 -0400 |
commit | e94c5bde703f2f9f86d098b6bf8275c64fab10eb (patch) | |
tree | 76b7c32139e2ff4a4a7525c0453615ffdc2aeff5 | |
parent | 737ecae264bc759e2033d99e99138f690f3beabf (diff) |
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>
-rw-r--r-- | scripts/kconfig/mconf.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index f7abca434829..08a4c7af93ea 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -401,7 +401,7 @@ static void search_conf(void) | |||
401 | struct gstr res; | 401 | struct gstr res; |
402 | int dres; | 402 | int dres; |
403 | again: | 403 | again: |
404 | reset_dialog(); | 404 | dialog_clear(); |
405 | dres = dialog_inputbox(_("Search Configuration Parameter"), | 405 | dres = dialog_inputbox(_("Search Configuration Parameter"), |
406 | _("Enter CONFIG_ (sub)string to search for (omit CONFIG_)"), | 406 | _("Enter CONFIG_ (sub)string to search for (omit CONFIG_)"), |
407 | 10, 75, ""); | 407 | 10, 75, ""); |
@@ -603,7 +603,7 @@ static void conf(struct menu *menu) | |||
603 | item_make(_(" Save an Alternate Configuration File")); | 603 | item_make(_(" Save an Alternate Configuration File")); |
604 | item_set_tag('S'); | 604 | item_set_tag('S'); |
605 | } | 605 | } |
606 | reset_dialog(); | 606 | dialog_clear(); |
607 | res = dialog_menu(prompt ? prompt : _("Main Menu"), | 607 | res = dialog_menu(prompt ? prompt : _("Main Menu"), |
608 | _(menu_instructions), | 608 | _(menu_instructions), |
609 | active_menu, &s_scroll); | 609 | active_menu, &s_scroll); |
@@ -684,7 +684,7 @@ static void conf(struct menu *menu) | |||
684 | 684 | ||
685 | static void show_textbox(const char *title, const char *text, int r, int c) | 685 | static void show_textbox(const char *title, const char *text, int r, int c) |
686 | { | 686 | { |
687 | reset_dialog(); | 687 | dialog_clear(); |
688 | dialog_textbox(title, text, r, c); | 688 | dialog_textbox(title, text, r, c); |
689 | } | 689 | } |
690 | 690 | ||
@@ -736,7 +736,7 @@ static void conf_choice(struct menu *menu) | |||
736 | if (child->sym == sym_get_choice_value(menu->sym)) | 736 | if (child->sym == sym_get_choice_value(menu->sym)) |
737 | item_set_tag('X'); | 737 | item_set_tag('X'); |
738 | } | 738 | } |
739 | reset_dialog(); | 739 | dialog_clear(); |
740 | res = dialog_checklist(prompt ? prompt : _("Main Menu"), | 740 | res = dialog_checklist(prompt ? prompt : _("Main Menu"), |
741 | _(radiolist_instructions), | 741 | _(radiolist_instructions), |
742 | 15, 70, 6); | 742 | 15, 70, 6); |
@@ -785,7 +785,7 @@ static void conf_string(struct menu *menu) | |||
785 | default: | 785 | default: |
786 | heading = "Internal mconf error!"; | 786 | heading = "Internal mconf error!"; |
787 | } | 787 | } |
788 | reset_dialog(); | 788 | dialog_clear(); |
789 | res = dialog_inputbox(prompt ? prompt : _("Main Menu"), | 789 | res = dialog_inputbox(prompt ? prompt : _("Main Menu"), |
790 | heading, 10, 75, | 790 | heading, 10, 75, |
791 | sym_get_string_value(menu->sym)); | 791 | sym_get_string_value(menu->sym)); |
@@ -809,7 +809,7 @@ static void conf_load(void) | |||
809 | 809 | ||
810 | while (1) { | 810 | while (1) { |
811 | int res; | 811 | int res; |
812 | reset_dialog(); | 812 | dialog_clear(); |
813 | res = dialog_inputbox(NULL, load_config_text, | 813 | res = dialog_inputbox(NULL, load_config_text, |
814 | 11, 55, filename); | 814 | 11, 55, filename); |
815 | switch(res) { | 815 | switch(res) { |
@@ -833,7 +833,7 @@ static void conf_save(void) | |||
833 | { | 833 | { |
834 | while (1) { | 834 | while (1) { |
835 | int res; | 835 | int res; |
836 | reset_dialog(); | 836 | dialog_clear(); |
837 | res = dialog_inputbox(NULL, save_config_text, | 837 | res = dialog_inputbox(NULL, save_config_text, |
838 | 11, 55, filename); | 838 | 11, 55, filename); |
839 | switch(res) { | 839 | switch(res) { |
@@ -889,7 +889,7 @@ int main(int ac, char **av) | |||
889 | init_dialog(menu_backtitle); | 889 | init_dialog(menu_backtitle); |
890 | do { | 890 | do { |
891 | conf(&rootmenu); | 891 | conf(&rootmenu); |
892 | reset_dialog(); | 892 | dialog_clear(); |
893 | res = dialog_yesno(NULL, | 893 | res = dialog_yesno(NULL, |
894 | _("Do you wish to save your " | 894 | _("Do you wish to save your " |
895 | "new kernel configuration?\n" | 895 | "new kernel configuration?\n" |