Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6.git] / scripts / kconfig / mconf.c
index 98039bf..6841e95 100644 (file)
@@ -8,24 +8,20 @@
  * i18n, 2005, Arnaldo Carvalho de Melo <acme@conectiva.com.br>
  */
 
-#include <sys/ioctl.h>
-#include <sys/wait.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <signal.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#include <termios.h>
 #include <unistd.h>
 #include <locale.h>
 
 #define LKC_DIRECT_LINK
 #include "lkc.h"
+#include "lxdialog/dialog.h"
 
-static char menu_backtitle[128];
 static const char mconf_readme[] = N_(
 "Overview\n"
 "--------\n"
@@ -35,9 +31,13 @@ static const char mconf_readme[] = N_(
 "kernel parameters which are not really features, but must be\n"
 "entered in as decimal or hexadecimal numbers or possibly text.\n"
 "\n"
-"Menu items beginning with [*], <M> or [ ] represent features\n"
-"configured to be built in, modularized or removed respectively.\n"
-"Pointed brackets <> represent module capable features.\n"
+"Menu items beginning with following braces represent features that\n"
+"  [ ] can be built in or removed\n"
+"  < > can be built in, modularized or removed\n"
+"  { } can be built in or modularized (selected by other feature)\n"
+"  - - are selected by other feature,\n"
+"while *, M or whitespace inside braces means to build in, build as\n"
+"a module or to exclude the feature respectively.\n"
 "\n"
 "To change any of these features, highlight it with the cursor\n"
 "keys and press <Y> to build it in, <M> to make it a module or\n"
@@ -159,7 +159,21 @@ static const char mconf_readme[] = N_(
 "\n"
 "Note that this mode can eventually be a little more CPU expensive\n"
 "(especially with a larger number of unrolled categories) than the\n"
-"default mode.\n"),
+"default mode.\n"
+"\n"
+"Different color themes available\n"
+"--------------------------------\n"
+"It is possible to select different color themes using the variable\n"
+"MENUCONFIG_COLOR. To select a theme use:\n"
+"\n"
+"make MENUCONFIG_COLOR=<theme> menuconfig\n"
+"\n"
+"Available themes are\n"
+" mono       => selects colors suitable for monochrome displays\n"
+" blackbg    => selects a color scheme with black background\n"
+" classic    => theme with blue background. The classic look\n"
+" bluetitle  => a LCD friendly version of classic. (default)\n"
+"\n"),
 menu_instructions[] = N_(
        "Arrow keys navigate the menu.  "
        "<Enter> selects submenus --->.  "
@@ -219,6 +233,7 @@ save_config_help[] = N_(
 search_help[] = N_(
        "\n"
        "Search for CONFIG_ symbols and display their relations.\n"
+       "Regular expressions are allowed.\n"
        "Example: search for \"^FOO\"\n"
        "Result:\n"
        "-----------------------------------------------------------------\n"
@@ -255,16 +270,9 @@ search_help[] = N_(
        "          USB$ => find all CONFIG_ symbols ending with USB\n"
        "\n");
 
-static signed char buf[4096], *bufptr = buf;
-static signed char input_buf[4096];
-static char filename[PATH_MAX+1] = ".config";
-static char *args[1024], **argptr = args;
 static int indent;
-static struct termios ios_org;
-static int rows = 0, cols = 0;
 static struct menu *current_menu;
 static int child_count;
-static int do_resize;
 static int single_menu_mode;
 
 static void conf(struct menu *menu);
@@ -275,106 +283,17 @@ static void conf_save(void);
 static void show_textbox(const char *title, const char *text, int r, int c);
 static void show_helptext(const char *title, const char *text);
 static void show_help(struct menu *menu);
-static void show_file(const char *filename, const char *title, int r, int c);
-
-static void cprint_init(void);
-static int cprint1(const char *fmt, ...);
-static void cprint_done(void);
-static int cprint(const char *fmt, ...);
-
-static void init_wsize(void)
-{
-       struct winsize ws;
-       char *env;
-
-       if (!ioctl(STDIN_FILENO, TIOCGWINSZ, &ws)) {
-               rows = ws.ws_row;
-               cols = ws.ws_col;
-       }
-
-       if (!rows) {
-               env = getenv("LINES");
-               if (env)
-                       rows = atoi(env);
-               if (!rows)
-                       rows = 24;
-       }
-       if (!cols) {
-               env = getenv("COLUMNS");
-               if (env)
-                       cols = atoi(env);
-               if (!cols)
-                       cols = 80;
-       }
-
-       if (rows < 19 || cols < 80) {
-               fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
-               fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));
-               exit(1);
-       }
-
-       rows -= 4;
-       cols -= 5;
-}
-
-static void cprint_init(void)
-{
-       bufptr = buf;
-       argptr = args;
-       memset(args, 0, sizeof(args));
-       indent = 0;
-       child_count = 0;
-       cprint("./scripts/lxdialog/lxdialog");
-       cprint("--backtitle");
-       cprint(menu_backtitle);
-}
-
-static int cprint1(const char *fmt, ...)
-{
-       va_list ap;
-       int res;
-
-       if (!*argptr)
-               *argptr = bufptr;
-       va_start(ap, fmt);
-       res = vsprintf(bufptr, fmt, ap);
-       va_end(ap);
-       bufptr += res;
-
-       return res;
-}
-
-static void cprint_done(void)
-{
-       *bufptr++ = 0;
-       argptr++;
-}
-
-static int cprint(const char *fmt, ...)
-{
-       va_list ap;
-       int res;
-
-       *argptr++ = bufptr;
-       va_start(ap, fmt);
-       res = vsprintf(bufptr, fmt, ap);
-       va_end(ap);
-       bufptr += res;
-       *bufptr++ = 0;
-
-       return res;
-}
 
 static void get_prompt_str(struct gstr *r, struct property *prop)
 {
        int i, j;
        struct menu *submenu[8], *menu;
 
-       str_printf(r, "Prompt: %s\n", prop->text);
-       str_printf(r, "  Defined at %s:%d\n", prop->menu->file->name,
+       str_printf(r, _("Prompt: %s\n"), _(prop->text));
+       str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
                prop->menu->lineno);
        if (!expr_is_yes(prop->visible.expr)) {
-               str_append(r, "  Depends on: ");
+               str_append(r, _("  Depends on: "));
                expr_gstr_print(prop->visible.expr, r);
                str_append(r, "\n");
        }
@@ -382,13 +301,13 @@ static void get_prompt_str(struct gstr *r, struct property *prop)
        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent)
                submenu[i++] = menu;
        if (i > 0) {
-               str_printf(r, "  Location:\n");
+               str_printf(r, _("  Location:\n"));
                for (j = 4; --i >= 0; j += 2) {
                        menu = submenu[i];
-                       str_printf(r, "%*c-> %s", j, ' ', menu_get_prompt(menu));
+                       str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu)));
                        if (menu->sym) {
                                str_printf(r, " (%s [=%s])", menu->sym->name ?
-                                       menu->sym->name : "<choice>",
+                                       menu->sym->name : _("<choice>"),
                                        sym_get_string_value(menu->sym));
                        }
                        str_append(r, "\n");
@@ -401,8 +320,9 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym)
        bool hit;
        struct property *prop;
 
-       str_printf(r, "Symbol: %s [=%s]\n", sym->name,
-                                      sym_get_string_value(sym));
+       if (sym && sym->name)
+               str_printf(r, "Symbol: %s [=%s]\n", sym->name,
+                                                   sym_get_string_value(sym));
        for_all_prompts(sym, prop)
                get_prompt_str(r, prop);
        hit = false;
@@ -417,7 +337,7 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym)
        if (hit)
                str_append(r, "\n");
        if (sym->rev_dep.expr) {
-               str_append(r, "  Selected by: ");
+               str_append(r, _("  Selected by: "));
                expr_gstr_print(sym->rev_dep.expr, r);
                str_append(r, "\n");
        }
@@ -433,112 +353,45 @@ static struct gstr get_relations_str(struct symbol **sym_arr)
        for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
                get_symbol_str(&res, sym);
        if (!i)
-               str_append(&res, "No matches found.\n");
+               str_append(&res, _("No matches found.\n"));
        return res;
 }
 
-pid_t pid;
-
-static void winch_handler(int sig)
+static char filename[PATH_MAX+1];
+static void set_config_filename(const char *config_filename)
 {
-       if (!do_resize) {
-               kill(pid, SIGINT);
-               do_resize = 1;
-       }
-}
-
-static int exec_conf(void)
-{
-       int pipefd[2], stat, size;
-       struct sigaction sa;
-       sigset_t sset, osset;
-
-       sigemptyset(&sset);
-       sigaddset(&sset, SIGINT);
-       sigprocmask(SIG_BLOCK, &sset, &osset);
-
-       signal(SIGINT, SIG_DFL);
-
-       sa.sa_handler = winch_handler;
-       sigemptyset(&sa.sa_mask);
-       sa.sa_flags = SA_RESTART;
-       sigaction(SIGWINCH, &sa, NULL);
-
-       *argptr++ = NULL;
-
-       pipe(pipefd);
-       pid = fork();
-       if (pid == 0) {
-               sigprocmask(SIG_SETMASK, &osset, NULL);
-               dup2(pipefd[1], 2);
-               close(pipefd[0]);
-               close(pipefd[1]);
-               execv(args[0], args);
-               _exit(EXIT_FAILURE);
-       }
-
-       close(pipefd[1]);
-       bufptr = input_buf;
-       while (1) {
-               size = input_buf + sizeof(input_buf) - bufptr;
-               size = read(pipefd[0], bufptr, size);
-               if (size <= 0) {
-                       if (size < 0) {
-                               if (errno == EINTR || errno == EAGAIN)
-                                       continue;
-                               perror("read");
-                       }
-                       break;
-               }
-               bufptr += size;
-       }
-       *bufptr++ = 0;
-       close(pipefd[0]);
-       waitpid(pid, &stat, 0);
-
-       if (do_resize) {
-               init_wsize();
-               do_resize = 0;
-               sigprocmask(SIG_SETMASK, &osset, NULL);
-               return -1;
-       }
-       if (WIFSIGNALED(stat)) {
-               printf("\finterrupted(%d)\n", WTERMSIG(stat));
-               exit(1);
-       }
-#if 0
-       printf("\fexit state: %d\nexit data: '%s'\n", WEXITSTATUS(stat), input_buf);
-       sleep(1);
-#endif
-       sigpending(&sset);
-       if (sigismember(&sset, SIGINT)) {
-               printf("\finterrupted\n");
-               exit(1);
-       }
-       sigprocmask(SIG_SETMASK, &osset, NULL);
+       static char menu_backtitle[PATH_MAX+128];
+       int size;
+       struct symbol *sym;
 
-       return WEXITSTATUS(stat);
+       sym = sym_lookup("KERNELVERSION", 0);
+       sym_calc_value(sym);
+       size = snprintf(menu_backtitle, sizeof(menu_backtitle),
+                       _("%s - Linux Kernel v%s Configuration"),
+                       config_filename, sym_get_string_value(sym));
+       if (size >= sizeof(menu_backtitle))
+               menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
+       set_dialog_backtitle(menu_backtitle);
+
+       size = snprintf(filename, sizeof(filename), "%s", config_filename);
+       if (size >= sizeof(filename))
+               filename[sizeof(filename)-1] = '\0';
 }
 
+
 static void search_conf(void)
 {
        struct symbol **sym_arr;
-       int stat;
        struct gstr res;
-
+       char *dialog_input;
+       int dres;
 again:
-       cprint_init();
-       cprint("--title");
-       cprint(_("Search Configuration Parameter"));
-       cprint("--inputbox");
-       cprint(_("Enter Keyword"));
-       cprint("10");
-       cprint("75");
-       cprint("");
-       stat = exec_conf();
-       if (stat < 0)
-               goto again;
-       switch (stat) {
+       dialog_clear();
+       dres = dialog_inputbox(_("Search Configuration Parameter"),
+                             _("Enter CONFIG_ (sub)string to search for "
+                               "(with or without \"CONFIG\")"),
+                             10, 75, "");
+       switch (dres) {
        case 0:
                break;
        case 1:
@@ -548,7 +401,12 @@ again:
                return;
        }
 
-       sym_arr = sym_re_search(input_buf);
+       /* strip CONFIG_ if necessary */
+       dialog_input = dialog_input_result;
+       if (strncasecmp(dialog_input_result, "CONFIG_", 7) == 0)
+               dialog_input += 7;
+
+       sym_arr = sym_re_search(dialog_input);
        res = get_relations_str(sym_arr);
        free(sym_arr);
        show_textbox(_("Search Results"), str_get(&res), 0, 0);
@@ -575,24 +433,33 @@ static void build_conf(struct menu *menu)
                        switch (prop->type) {
                        case P_MENU:
                                child_count++;
-                               cprint("m%p", menu);
-
+                               prompt = _(prompt);
                                if (single_menu_mode) {
-                                       cprint1("%s%*c%s",
-                                               menu->data ? "-->" : "++>",
-                                               indent + 1, ' ', prompt);
+                                       item_make("%s%*c%s",
+                                                 menu->data ? "-->" : "++>",
+                                                 indent + 1, ' ', prompt);
                                } else
-                                       cprint1("   %*c%s  --->", indent + 1, ' ', prompt);
+                                       item_make("   %*c%s  --->", indent + 1, ' ', prompt);
 
-                               cprint_done();
+                               item_set_tag('m');
+                               item_set_data(menu);
                                if (single_menu_mode && menu->data)
                                        goto conf_childs;
                                return;
+                       case P_COMMENT:
+                               if (prompt) {
+                                       child_count++;
+                                       item_make("   %*c*** %s ***", indent + 1, ' ', _(prompt));
+                                       item_set_tag(':');
+                                       item_set_data(menu);
+                               }
+                               break;
                        default:
                                if (prompt) {
                                        child_count++;
-                                       cprint(":%p", menu);
-                                       cprint("---%*c%s", indent + 1, ' ', prompt);
+                                       item_make("---%*c%s", indent + 1, ' ', _(prompt));
+                                       item_set_tag(':');
+                                       item_set_data(menu);
                                }
                        }
                } else
@@ -613,10 +480,9 @@ static void build_conf(struct menu *menu)
 
                val = sym_get_tristate_value(sym);
                if (sym_is_changable(sym)) {
-                       cprint("t%p", menu);
                        switch (type) {
                        case S_BOOLEAN:
-                               cprint1("[%c]", val == no ? ' ' : '*');
+                               item_make("[%c]", val == no ? ' ' : '*');
                                break;
                        case S_TRISTATE:
                                switch (val) {
@@ -624,84 +490,90 @@ static void build_conf(struct menu *menu)
                                case mod: ch = 'M'; break;
                                default:  ch = ' '; break;
                                }
-                               cprint1("<%c>", ch);
+                               item_make("<%c>", ch);
                                break;
                        }
+                       item_set_tag('t');
+                       item_set_data(menu);
                } else {
-                       cprint("%c%p", def_menu ? 't' : ':', menu);
-                       cprint1("   ");
+                       item_make("   ");
+                       item_set_tag(def_menu ? 't' : ':');
+                       item_set_data(menu);
                }
 
-               cprint1("%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+               item_add_str("%*c%s", indent + 1, ' ', _(menu_get_prompt(menu)));
                if (val == yes) {
                        if (def_menu) {
-                               cprint1(" (%s)", menu_get_prompt(def_menu));
-                               cprint1("  --->");
-                               cprint_done();
+                               item_add_str(" (%s)", _(menu_get_prompt(def_menu)));
+                               item_add_str("  --->");
                                if (def_menu->list) {
                                        indent += 2;
                                        build_conf(def_menu);
                                        indent -= 2;
                                }
-                       } else
-                               cprint_done();
+                       }
                        return;
                }
-               cprint_done();
        } else {
                if (menu == current_menu) {
-                       cprint(":%p", menu);
-                       cprint("---%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+                       item_make("---%*c%s", indent + 1, ' ', _(menu_get_prompt(menu)));
+                       item_set_tag(':');
+                       item_set_data(menu);
                        goto conf_childs;
                }
                child_count++;
                val = sym_get_tristate_value(sym);
                if (sym_is_choice_value(sym) && val == yes) {
-                       cprint(":%p", menu);
-                       cprint1("   ");
+                       item_make("   ");
+                       item_set_tag(':');
+                       item_set_data(menu);
                } else {
                        switch (type) {
                        case S_BOOLEAN:
-                               cprint("t%p", menu);
                                if (sym_is_changable(sym))
-                                       cprint1("[%c]", val == no ? ' ' : '*');
+                                       item_make("[%c]", val == no ? ' ' : '*');
                                else
-                                       cprint1("---");
+                                       item_make("-%c-", val == no ? ' ' : '*');
+                               item_set_tag('t');
+                               item_set_data(menu);
                                break;
                        case S_TRISTATE:
-                               cprint("t%p", menu);
                                switch (val) {
                                case yes: ch = '*'; break;
                                case mod: ch = 'M'; break;
                                default:  ch = ' '; break;
                                }
-                               if (sym_is_changable(sym))
-                                       cprint1("<%c>", ch);
-                               else
-                                       cprint1("---");
+                               if (sym_is_changable(sym)) {
+                                       if (sym->rev_dep.tri == mod)
+                                               item_make("{%c}", ch);
+                                       else
+                                               item_make("<%c>", ch);
+                               } else
+                                       item_make("-%c-", ch);
+                               item_set_tag('t');
+                               item_set_data(menu);
                                break;
                        default:
-                               cprint("s%p", menu);
-                               tmp = cprint1("(%s)", sym_get_string_value(sym));
+                               tmp = 2 + strlen(sym_get_string_value(sym)); /* () = 2 */
+                               item_make("(%s)", sym_get_string_value(sym));
                                tmp = indent - tmp + 4;
                                if (tmp < 0)
                                        tmp = 0;
-                               cprint1("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
-                                       (sym_has_value(sym) || !sym_is_changable(sym)) ?
-                                       "" : " (NEW)");
-                               cprint_done();
+                               item_add_str("%*c%s%s", tmp, ' ', _(menu_get_prompt(menu)),
+                                            (sym_has_value(sym) || !sym_is_changable(sym)) ?
+                                            "" : _(" (NEW)"));
+                               item_set_tag('s');
+                               item_set_data(menu);
                                goto conf_childs;
                        }
                }
-               cprint1("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
-                       (sym_has_value(sym) || !sym_is_changable(sym)) ?
-                       "" : " (NEW)");
+               item_add_str("%*c%s%s", indent + 1, ' ', _(menu_get_prompt(menu)),
+                         (sym_has_value(sym) || !sym_is_changable(sym)) ?
+                         "" : _(" (NEW)"));
                if (menu->prompt->type == P_MENU) {
-                       cprint1("  --->");
-                       cprint_done();
+                       item_add_str("  --->");
                        return;
                }
-               cprint_done();
        }
 
 conf_childs:
@@ -716,59 +588,45 @@ static void conf(struct menu *menu)
        struct menu *submenu;
        const char *prompt = menu_get_prompt(menu);
        struct symbol *sym;
-       char active_entry[40];
-       int stat, type, i;
+       struct menu *active_menu = NULL;
+       int res;
+       int s_scroll = 0;
 
-       unlink("lxdialog.scrltmp");
-       active_entry[0] = 0;
        while (1) {
-               cprint_init();
-               cprint("--title");
-               cprint("%s", prompt ? prompt : _("Main Menu"));
-               cprint("--menu");
-               cprint(_(menu_instructions));
-               cprint("%d", rows);
-               cprint("%d", cols);
-               cprint("%d", rows - 10);
-               cprint("%s", active_entry);
+               item_reset();
                current_menu = menu;
                build_conf(menu);
                if (!child_count)
                        break;
                if (menu == &rootmenu) {
-                       cprint(":");
-                       cprint("--- ");
-                       cprint("L");
-                       cprint(_("    Load an Alternate Configuration File"));
-                       cprint("S");
-                       cprint(_("    Save Configuration to an Alternate File"));
+                       item_make("--- ");
+                       item_set_tag(':');
+                       item_make(_("    Load an Alternate Configuration File"));
+                       item_set_tag('L');
+                       item_make(_("    Save an Alternate Configuration File"));
+                       item_set_tag('S');
                }
-               stat = exec_conf();
-               if (stat < 0)
-                       continue;
-
-               if (stat == 1 || stat == 255)
+               dialog_clear();
+               res = dialog_menu(prompt ? _(prompt) : _("Main Menu"),
+                                 _(menu_instructions),
+                                 active_menu, &s_scroll);
+               if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)
                        break;
-
-               type = input_buf[0];
-               if (!type)
+               if (!item_activate_selected())
+                       continue;
+               if (!item_tag())
                        continue;
 
-               for (i = 0; input_buf[i] && !isspace(input_buf[i]); i++)
-                       ;
-               if (i >= sizeof(active_entry))
-                       i = sizeof(active_entry) - 1;
-               input_buf[i] = 0;
-               strcpy(active_entry, input_buf);
-
-               sym = NULL;
-               submenu = NULL;
-               if (sscanf(input_buf + 1, "%p", &submenu) == 1)
+               submenu = item_data();
+               active_menu = item_data();
+               if (submenu)
                        sym = submenu->sym;
+               else
+                       sym = NULL;
 
-               switch (stat) {
+               switch (res) {
                case 0:
-                       switch (type) {
+                       switch (item_tag()) {
                        case 'm':
                                if (single_menu_mode)
                                        submenu->data = (void *) (long) !submenu->data;
@@ -796,10 +654,10 @@ static void conf(struct menu *menu)
                        if (sym)
                                show_help(submenu);
                        else
-                               show_helptext("README", _(mconf_readme));
+                               show_helptext(_("README"), _(mconf_readme));
                        break;
                case 3:
-                       if (type == 't') {
+                       if (item_is_tag('t')) {
                                if (sym_set_tristate_value(sym, yes))
                                        break;
                                if (sym_set_tristate_value(sym, mod))
@@ -807,17 +665,17 @@ static void conf(struct menu *menu)
                        }
                        break;
                case 4:
-                       if (type == 't')
+                       if (item_is_tag('t'))
                                sym_set_tristate_value(sym, no);
                        break;
                case 5:
-                       if (type == 't')
+                       if (item_is_tag('t'))
                                sym_set_tristate_value(sym, mod);
                        break;
                case 6:
-                       if (type == 't')
+                       if (item_is_tag('t'))
                                sym_toggle_tristate_value(sym);
-                       else if (type == 'm')
+                       else if (item_is_tag('m'))
                                conf(submenu);
                        break;
                case 7:
@@ -829,13 +687,8 @@ static void conf(struct menu *menu)
 
 static void show_textbox(const char *title, const char *text, int r, int c)
 {
-       int fd;
-
-       fd = creat(".help.tmp", 0777);
-       write(fd, text, strlen(text));
-       close(fd);
-       show_file(".help.tmp", title, r, c);
-       unlink(".help.tmp");
+       dialog_clear();
+       dialog_textbox(title, text, r, c);
 }
 
 static void show_helptext(const char *title, const char *text)
@@ -848,83 +701,67 @@ static void show_help(struct menu *menu)
        struct gstr help = str_new();
        struct symbol *sym = menu->sym;
 
-       if (sym->help)
+       if (menu_has_help(menu))
        {
                if (sym->name) {
                        str_printf(&help, "CONFIG_%s:\n\n", sym->name);
-                       str_append(&help, _(sym->help));
+                       str_append(&help, _(menu_get_help(menu)));
                        str_append(&help, "\n");
                }
        } else {
                str_append(&help, nohelp_text);
        }
        get_symbol_str(&help, sym);
-       show_helptext(menu_get_prompt(menu), str_get(&help));
+       show_helptext(_(menu_get_prompt(menu)), str_get(&help));
        str_free(&help);
 }
 
-static void show_file(const char *filename, const char *title, int r, int c)
-{
-       do {
-               cprint_init();
-               if (title) {
-                       cprint("--title");
-                       cprint("%s", title);
-               }
-               cprint("--textbox");
-               cprint("%s", filename);
-               cprint("%d", r ? r : rows);
-               cprint("%d", c ? c : cols);
-       } while (exec_conf() < 0);
-}
-
 static void conf_choice(struct menu *menu)
 {
-       const char *prompt = menu_get_prompt(menu);
+       const char *prompt = _(menu_get_prompt(menu));
        struct menu *child;
        struct symbol *active;
-       int stat;
 
        active = sym_get_choice_value(menu->sym);
        while (1) {
-               cprint_init();
-               cprint("--title");
-               cprint("%s", prompt ? prompt : _("Main Menu"));
-               cprint("--radiolist");
-               cprint(_(radiolist_instructions));
-               cprint("15");
-               cprint("70");
-               cprint("6");
+               int res;
+               int selected;
+               item_reset();
 
                current_menu = menu;
                for (child = menu->list; child; child = child->next) {
                        if (!menu_is_visible(child))
                                continue;
-                       cprint("%p", child);
-                       cprint("%s", menu_get_prompt(child));
+                       item_make("%s", _(menu_get_prompt(child)));
+                       item_set_data(child);
+                       if (child->sym == active)
+                               item_set_selected(1);
                        if (child->sym == sym_get_choice_value(menu->sym))
-                               cprint("ON");
-                       else if (child->sym == active)
-                               cprint("SELECTED");
-                       else
-                               cprint("OFF");
+                               item_set_tag('X');
                }
-
-               stat = exec_conf();
-               switch (stat) {
+               dialog_clear();
+               res = dialog_checklist(prompt ? _(prompt) : _("Main Menu"),
+                                       _(radiolist_instructions),
+                                        15, 70, 6);
+               selected = item_activate_selected();
+               switch (res) {
                case 0:
-                       if (sscanf(input_buf, "%p", &child) != 1)
-                               break;
-                       sym_set_tristate_value(child->sym, yes);
+                       if (selected) {
+                               child = item_data();
+                               sym_set_tristate_value(child->sym, yes);
+                       }
                        return;
                case 1:
-                       if (sscanf(input_buf, "%p", &child) == 1) {
+                       if (selected) {
+                               child = item_data();
                                show_help(child);
                                active = child->sym;
                        } else
                                show_help(menu);
                        break;
-               case 255:
+               case KEY_ESC:
+                       return;
+               case -ERRDISPLAYTOOSMALL:
                        return;
                }
        }
@@ -933,40 +770,38 @@ static void conf_choice(struct menu *menu)
 static void conf_string(struct menu *menu)
 {
        const char *prompt = menu_get_prompt(menu);
-       int stat;
 
        while (1) {
-               cprint_init();
-               cprint("--title");
-               cprint("%s", prompt ? prompt : _("Main Menu"));
-               cprint("--inputbox");
+               int res;
+               const char *heading;
+
                switch (sym_get_type(menu->sym)) {
                case S_INT:
-                       cprint(_(inputbox_instructions_int));
+                       heading = _(inputbox_instructions_int);
                        break;
                case S_HEX:
-                       cprint(_(inputbox_instructions_hex));
+                       heading = _(inputbox_instructions_hex);
                        break;
                case S_STRING:
-                       cprint(_(inputbox_instructions_string));
+                       heading = _(inputbox_instructions_string);
                        break;
                default:
-                       /* panic? */;
+                       heading = _("Internal mconf error!");
                }
-               cprint("10");
-               cprint("75");
-               cprint("%s", sym_get_string_value(menu->sym));
-               stat = exec_conf();
-               switch (stat) {
+               dialog_clear();
+               res = dialog_inputbox(prompt ? _(prompt) : _("Main Menu"),
+                                     heading, 10, 75,
+                                     sym_get_string_value(menu->sym));
+               switch (res) {
                case 0:
-                       if (sym_set_string_value(menu->sym, input_buf))
+                       if (sym_set_string_value(menu->sym, dialog_input_result))
                                return;
                        show_textbox(NULL, _("You have made an invalid entry."), 5, 43);
                        break;
                case 1:
                        show_help(menu);
                        break;
-               case 255:
+               case KEY_ESC:
                        return;
                }
        }
@@ -974,28 +809,27 @@ static void conf_string(struct menu *menu)
 
 static void conf_load(void)
 {
-       int stat;
 
        while (1) {
-               cprint_init();
-               cprint("--inputbox");
-               cprint(load_config_text);
-               cprint("11");
-               cprint("55");
-               cprint("%s", filename);
-               stat = exec_conf();
-               switch(stat) {
+               int res;
+               dialog_clear();
+               res = dialog_inputbox(NULL, load_config_text,
+                                     11, 55, filename);
+               switch(res) {
                case 0:
-                       if (!input_buf[0])
+                       if (!dialog_input_result[0])
                                return;
-                       if (!conf_read(input_buf))
+                       if (!conf_read(dialog_input_result)) {
+                               set_config_filename(dialog_input_result);
+                               sym_set_change_count(1);
                                return;
+                       }
                        show_textbox(NULL, _("File does not exist!"), 5, 38);
                        break;
                case 1:
                        show_helptext(_("Load Alternate Configuration"), load_config_help);
                        break;
-               case 255:
+               case KEY_ESC:
                        return;
                }
        }
@@ -1003,45 +837,35 @@ static void conf_load(void)
 
 static void conf_save(void)
 {
-       int stat;
-
        while (1) {
-               cprint_init();
-               cprint("--inputbox");
-               cprint(save_config_text);
-               cprint("11");
-               cprint("55");
-               cprint("%s", filename);
-               stat = exec_conf();
-               switch(stat) {
+               int res;
+               dialog_clear();
+               res = dialog_inputbox(NULL, save_config_text,
+                                     11, 55, filename);
+               switch(res) {
                case 0:
-                       if (!input_buf[0])
+                       if (!dialog_input_result[0])
                                return;
-                       if (!conf_write(input_buf))
+                       if (!conf_write(dialog_input_result)) {
+                               set_config_filename(dialog_input_result);
                                return;
+                       }
                        show_textbox(NULL, _("Can't create file!  Probably a nonexistent directory."), 5, 60);
                        break;
                case 1:
                        show_helptext(_("Save Alternate Configuration"), save_config_help);
                        break;
-               case 255:
+               case KEY_ESC:
                        return;
                }
        }
 }
 
-static void conf_cleanup(void)
-{
-       tcsetattr(1, TCSAFLUSH, &ios_org);
-       unlink(".help.tmp");
-       unlink("lxdialog.scrltmp");
-}
-
 int main(int ac, char **av)
 {
-       struct symbol *sym;
+       int saved_x, saved_y;
        char *mode;
-       int stat;
+       int res;
 
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
@@ -1050,44 +874,50 @@ int main(int ac, char **av)
        conf_parse(av[1]);
        conf_read(NULL);
 
-       sym = sym_lookup("KERNELRELEASE", 0);
-       sym_calc_value(sym);
-       sprintf(menu_backtitle, _("Linux Kernel v%s Configuration"),
-               sym_get_string_value(sym));
-
        mode = getenv("MENUCONFIG_MODE");
        if (mode) {
                if (!strcasecmp(mode, "single_menu"))
                        single_menu_mode = 1;
        }
 
-       tcgetattr(1, &ios_org);
-       atexit(conf_cleanup);
-       init_wsize();
-       conf(&rootmenu);
+       getyx(stdscr, saved_y, saved_x);
+       if (init_dialog(NULL)) {
+               fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
+               fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));
+               return 1;
+       }
 
+       set_config_filename(conf_get_configname());
        do {
-               cprint_init();
-               cprint("--yesno");
-               cprint(_("Do you wish to save your new kernel configuration?"));
-               cprint("5");
-               cprint("60");
-               stat = exec_conf();
-       } while (stat < 0);
-
-       if (stat == 0) {
-               if (conf_write(NULL)) {
+               conf(&rootmenu);
+               dialog_clear();
+               if (conf_get_changed())
+                       res = dialog_yesno(NULL,
+                                          _("Do you wish to save your "
+                                            "new kernel configuration?\n"
+                                            "<ESC><ESC> to continue."),
+                                          6, 60);
+               else
+                       res = -1;
+       } while (res == KEY_ESC);
+       end_dialog(saved_x, saved_y);
+
+       switch (res) {
+       case 0:
+               if (conf_write(filename)) {
                        fprintf(stderr, _("\n\n"
                                "Error during writing of the kernel configuration.\n"
                                "Your kernel configuration changes were NOT saved."
                                "\n\n"));
                        return 1;
                }
+       case -1:
                printf(_("\n\n"
                        "*** End of Linux kernel configuration.\n"
                        "*** Execute 'make' to build the kernel or try 'make help'."
                        "\n\n"));
-       } else {
+               break;
+       default:
                fprintf(stderr, _("\n\n"
                        "Your kernel configuration changes were NOT saved."
                        "\n\n"));
@@ -1095,3 +925,4 @@ int main(int ac, char **av)
 
        return 0;
 }
+