fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / scripts / kconfig / mconf.c

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 730d316..3f9a132 100644 (file)
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -4,6 +4,8 @@
  *
  * Introduced single menu mode (show all sub-menus in one large tree).
  * 2002-11-06 Petr Baudis <pasky@ucw.cz>
  *
  * Introduced single menu mode (show all sub-menus in one large tree).
  * 2002-11-06 Petr Baudis <pasky@ucw.cz>

+ *
+ * i18n, 2005, Arnaldo Carvalho de Melo <acme@conectiva.com.br>

  */
 
 #include <sys/ioctl.h>
  */
 
 #include <sys/ioctl.h>


@@ -18,12 +20,14 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>

+#include <locale.h>

 
 #define LKC_DIRECT_LINK
 #include "lkc.h"
 
 #define LKC_DIRECT_LINK
 #include "lkc.h"

+#include "lxdialog/dialog.h"

 
 static char menu_backtitle[128];
 
 static char menu_backtitle[128];

-static const char mconf_readme[] =
+static const char mconf_readme[] = N_(

 "Overview\n"
 "--------\n"
 "Some kernel features may be built directly into the kernel.\n"
 "Overview\n"
 "--------\n"
 "Some kernel features may be built directly into the kernel.\n"


@@ -156,39 +160,53 @@ static const char mconf_readme[] =
 "\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"
 "\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",
-menu_instructions[] =
+"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 --->.  "
        "Highlighted letters are hotkeys.  "
        "Pressing <Y> includes, <N> excludes, <M> modularizes features.  "
        "Press <Esc><Esc> to exit, <?> for Help, </> for Search.  "
        "Arrow keys navigate the menu.  "
        "<Enter> selects submenus --->.  "
        "Highlighted letters are hotkeys.  "
        "Pressing <Y> includes, <N> excludes, <M> modularizes features.  "
        "Press <Esc><Esc> to exit, <?> for Help, </> for Search.  "

-       "Legend: [*] built-in  [ ] excluded  <M> module  < > module capable",
-radiolist_instructions[] =
+       "Legend: [*] built-in  [ ] excluded  <M> module  < > module capable"),
+radiolist_instructions[] = N_(

        "Use the arrow keys to navigate this window or "
        "press the hotkey of the item you wish to select "
        "followed by the <SPACE BAR>. "
        "Use the arrow keys to navigate this window or "
        "press the hotkey of the item you wish to select "
        "followed by the <SPACE BAR>. "

-       "Press <?> for additional information about this option.",
-inputbox_instructions_int[] =
+       "Press <?> for additional information about this option."),
+inputbox_instructions_int[] = N_(

        "Please enter a decimal value. "
        "Fractions will not be accepted.  "
        "Please enter a decimal value. "
        "Fractions will not be accepted.  "

-       "Use the <TAB> key to move from the input field to the buttons below it.",
-inputbox_instructions_hex[] =
+       "Use the <TAB> key to move from the input field to the buttons below it."),
+inputbox_instructions_hex[] = N_(

        "Please enter a hexadecimal value. "
        "Please enter a hexadecimal value. "

-       "Use the <TAB> key to move from the input field to the buttons below it.",
-inputbox_instructions_string[] =
+       "Use the <TAB> key to move from the input field to the buttons below it."),
+inputbox_instructions_string[] = N_(

        "Please enter a string value. "
        "Please enter a string value. "

-       "Use the <TAB> key to move from the input field to the buttons below it.",
-setmod_text[] =
+       "Use the <TAB> key to move from the input field to the buttons below it."),
+setmod_text[] = N_(

        "This feature depends on another which has been configured as a module.\n"
        "This feature depends on another which has been configured as a module.\n"

-       "As a result, this feature will be built as a module.",
-nohelp_text[] =
-       "There is no help available for this kernel option.\n",
-load_config_text[] =
+       "As a result, this feature will be built as a module."),
+nohelp_text[] = N_(
+       "There is no help available for this kernel option.\n"),
+load_config_text[] = N_(

        "Enter the name of the configuration file you wish to load.  "
        "Accept the name shown to restore the configuration you "
        "Enter the name of the configuration file you wish to load.  "
        "Accept the name shown to restore the configuration you "

-       "last retrieved.  Leave blank to abort.",
-load_config_help[] =
+       "last retrieved.  Leave blank to abort."),
+load_config_help[] = N_(

        "\n"
        "For various reasons, one may wish to keep several different kernel\n"
        "configurations available on a single machine.\n"
        "\n"
        "For various reasons, one may wish to keep several different kernel\n"
        "configurations available on a single machine.\n"


@@ -198,11 +216,11 @@ load_config_help[] =
        "to modify that configuration.\n"
        "\n"
        "If you are uncertain, then you have probably never used alternate\n"
        "to modify that configuration.\n"
        "\n"
        "If you are uncertain, then you have probably never used alternate\n"

-       "configuration files.  You should therefor leave this blank to abort.\n",
-save_config_text[] =
+       "configuration files.  You should therefor leave this blank to abort.\n"),
+save_config_text[] = N_(

        "Enter a filename to which this configuration should be saved "
        "Enter a filename to which this configuration should be saved "

-       "as an alternate.  Leave blank to abort.",
-save_config_help[] =
+       "as an alternate.  Leave blank to abort."),
+save_config_help[] = N_(

        "\n"
        "For various reasons, one may wish to keep different kernel\n"
        "configurations available on a single machine.\n"
        "\n"
        "For various reasons, one may wish to keep different kernel\n"
        "configurations available on a single machine.\n"


@@ -212,10 +230,11 @@ save_config_help[] =
        "configuration options you have selected at that time.\n"
        "\n"
        "If you are uncertain what all this means then you should probably\n"
        "configuration options you have selected at that time.\n"
        "\n"
        "If you are uncertain what all this means then you should probably\n"

-       "leave this blank.\n",
-search_help[] =
+       "leave this blank.\n"),
+search_help[] = N_(

        "\n"
        "Search for CONFIG_ symbols and display their relations.\n"
        "\n"
        "Search for CONFIG_ symbols and display their relations.\n"

+       "Regular expressions are allowed.\n"

        "Example: search for \"^FOO\"\n"
        "Result:\n"
        "-----------------------------------------------------------------\n"
        "Example: search for \"^FOO\"\n"
        "Result:\n"
        "-----------------------------------------------------------------\n"


@@ -250,18 +269,14 @@ search_help[] =
        "Examples: USB  => find all CONFIG_ symbols containing USB\n"
        "          ^USB => find all CONFIG_ symbols starting with USB\n"
        "          USB$ => find all CONFIG_ symbols ending with USB\n"
        "Examples: USB  => find all CONFIG_ symbols containing USB\n"
        "          ^USB => find all CONFIG_ symbols starting with USB\n"
        "          USB$ => find all CONFIG_ symbols ending with USB\n"

-       "\n";
+       "\n");

 
 

-static signed char buf[4096], *bufptr = buf;
-static signed char input_buf[4096];

 static char filename[PATH_MAX+1] = ".config";
 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 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);
 static int single_menu_mode;
 
 static void conf(struct menu *menu);


@@ -272,12 +287,6 @@ 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_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)
 {
 
 static void init_wsize(void)
 {


@@ -305,8 +314,8 @@ static void init_wsize(void)
        }
 
        if (rows < 19 || cols < 80) {
        }
 
        if (rows < 19 || cols < 80) {

-               fprintf(stderr, "Your display is too small to run Menuconfig!\n");
-               fprintf(stderr, "It must be at least 19 lines by 80 columns.\n");
+               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);
        }
 
                exit(1);
        }
 


@@ -314,54 +323,6 @@ static void init_wsize(void)
        cols -= 5;
 }
 
        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;
 static void get_prompt_str(struct gstr *r, struct property *prop)
 {
        int i, j;


@@ -434,121 +395,30 @@ static struct gstr get_relations_str(struct symbol **sym_arr)
        return res;
 }
 
        return res;
 }
 

-pid_t pid;
-
-static void winch_handler(int sig)
-{
-       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);
-
-       return WEXITSTATUS(stat);
-}
-

 static void search_conf(void)
 {
        struct symbol **sym_arr;
 static void search_conf(void)
 {
        struct symbol **sym_arr;

-       int stat;

        struct gstr res;
        struct gstr res;

-
+       int dres;

 again:
 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 (omit CONFIG_)"),
+                             10, 75, "");
+       switch (dres) {

        case 0:
                break;
        case 1:
        case 0:
                break;
        case 1:

-               show_helptext("Search Configuration", search_help);
+               show_helptext(_("Search Configuration"), search_help);

                goto again;
        default:
                return;
        }
 
                goto again;
        default:
                return;
        }
 

-       sym_arr = sym_re_search(input_buf);
+       sym_arr = sym_re_search(dialog_input_result);

        res = get_relations_str(sym_arr);
        free(sym_arr);
        res = get_relations_str(sym_arr);
        free(sym_arr);

-       show_textbox("Search Results", str_get(&res), 0, 0);
+       show_textbox(_("Search Results"), str_get(&res), 0, 0);

        str_free(&res);
 }
 
        str_free(&res);
 }
 


@@ -572,24 +442,24 @@ static void build_conf(struct menu *menu)
                        switch (prop->type) {
                        case P_MENU:
                                child_count++;
                        switch (prop->type) {
                        case P_MENU:
                                child_count++;

-                               cprint("m%p", menu);
-

                                if (single_menu_mode) {
                                if (single_menu_mode) {

-                                       cprint1("%s%*c%s",
-                                               menu->data ? "-->" : "++>",
-                                               indent + 1, ' ', prompt);
+                                       item_make("%s%*c%s",
+                                                 menu->data ? "-->" : "++>",
+                                                 indent + 1, ' ', prompt);

                                } else
                                } 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;
                        default:
                                if (prompt) {
                                        child_count++;
                                if (single_menu_mode && menu->data)
                                        goto conf_childs;
                                return;
                        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
                                }
                        }
                } else


@@ -610,10 +480,9 @@ static void build_conf(struct menu *menu)
 
                val = sym_get_tristate_value(sym);
                if (sym_is_changable(sym)) {
 
                val = sym_get_tristate_value(sym);
                if (sym_is_changable(sym)) {

-                       cprint("t%p", menu);

                        switch (type) {
                        case S_BOOLEAN:
                        switch (type) {
                        case S_BOOLEAN:

-                               cprint1("[%c]", val == no ? ' ' : '*');
+                               item_make("[%c]", val == no ? ' ' : '*');

                                break;
                        case S_TRISTATE:
                                switch (val) {
                                break;
                        case S_TRISTATE:
                                switch (val) {


@@ -621,84 +490,87 @@ static void build_conf(struct menu *menu)
                                case mod: ch = 'M'; break;
                                default:  ch = ' '; break;
                                }
                                case mod: ch = 'M'; break;
                                default:  ch = ' '; break;
                                }

-                               cprint1("<%c>", ch);
+                               item_make("<%c>", ch);

                                break;
                        }
                                break;
                        }

+                       item_set_tag('t');
+                       item_set_data(menu);

                } else {
                } 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) {
                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;
                                }
                                if (def_menu->list) {
                                        indent += 2;
                                        build_conf(def_menu);
                                        indent -= 2;
                                }

-                       } else
-                               cprint_done();
+                       }

                        return;
                }
                        return;
                }

-               cprint_done();

        } else {
                if (menu == current_menu) {
        } 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) {
                        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:
                } else {
                        switch (type) {
                        case S_BOOLEAN:

-                               cprint("t%p", menu);

                                if (sym_is_changable(sym))
                                if (sym_is_changable(sym))

-                                       cprint1("[%c]", val == no ? ' ' : '*');
+                                       item_make("[%c]", val == no ? ' ' : '*');

                                else
                                else

-                                       cprint1("---");
+                                       item_make("---");
+                               item_set_tag('t');
+                               item_set_data(menu);

                                break;
                        case S_TRISTATE:
                                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))
                                switch (val) {
                                case yes: ch = '*'; break;
                                case mod: ch = 'M'; break;
                                default:  ch = ' '; break;
                                }
                                if (sym_is_changable(sym))

-                                       cprint1("<%c>", ch);
+                                       item_make("<%c>", ch);

                                else
                                else

-                                       cprint1("---");
+                                       item_make("---");
+                               item_set_tag('t');
+                               item_set_data(menu);

                                break;
                        default:
                                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;
                                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;
                        }
                }
                                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) {
                if (menu->prompt->type == P_MENU) {

-                       cprint1("  --->");
-                       cprint_done();
+                       item_add_str("  --->");

                        return;
                }
                        return;
                }

-               cprint_done();

        }
 
 conf_childs:
        }
 
 conf_childs:


@@ -713,59 +585,45 @@ static void conf(struct menu *menu)
        struct menu *submenu;
        const char *prompt = menu_get_prompt(menu);
        struct symbol *sym;
        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) {
        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) {
                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;
                        break;

-
-               type = input_buf[0];
-               if (!type)
+               if (!item_activate_selected())
+                       continue;
+               if (!item_tag())

                        continue;
 
                        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;
                        sym = submenu->sym;

+               else
+                       sym = NULL;

 
 

-               switch (stat) {
+               switch (res) {

                case 0:
                case 0:

-                       switch (type) {
+                       switch (item_tag()) {

                        case 'm':
                                if (single_menu_mode)
                                        submenu->data = (void *) (long) !submenu->data;
                        case 'm':
                                if (single_menu_mode)
                                        submenu->data = (void *) (long) !submenu->data;


@@ -793,10 +651,10 @@ static void conf(struct menu *menu)
                        if (sym)
                                show_help(submenu);
                        else
                        if (sym)
                                show_help(submenu);
                        else

-                               show_helptext("README", mconf_readme);
+                               show_helptext("README", _(mconf_readme));

                        break;
                case 3:
                        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))
                                if (sym_set_tristate_value(sym, yes))
                                        break;
                                if (sym_set_tristate_value(sym, mod))


@@ -804,17 +662,17 @@ static void conf(struct menu *menu)
                        }
                        break;
                case 4:
                        }
                        break;
                case 4:

-                       if (type == 't')
+                       if (item_is_tag('t'))

                                sym_set_tristate_value(sym, no);
                        break;
                case 5:
                                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:
                                sym_set_tristate_value(sym, mod);
                        break;
                case 6:

-                       if (type == 't')
+                       if (item_is_tag('t'))

                                sym_toggle_tristate_value(sym);
                                sym_toggle_tristate_value(sym);

-                       else if (type == 'm')
+                       else if (item_is_tag('m'))

                                conf(submenu);
                        break;
                case 7:
                                conf(submenu);
                        break;
                case 7:


@@ -826,13 +684,8 @@ static void conf(struct menu *menu)
 
 static void show_textbox(const char *title, const char *text, int r, int c)
 {
 
 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)
 }
 
 static void show_helptext(const char *title, const char *text)


@@ -849,7 +702,7 @@ static void show_help(struct menu *menu)
        {
                if (sym->name) {
                        str_printf(&help, "CONFIG_%s:\n\n", sym->name);
        {
                if (sym->name) {
                        str_printf(&help, "CONFIG_%s:\n\n", sym->name);

-                       str_append(&help, sym->help);
+                       str_append(&help, _(sym->help));

                        str_append(&help, "\n");
                }
        } else {
                        str_append(&help, "\n");
                }
        } else {


@@ -860,68 +713,52 @@ static void show_help(struct menu *menu)
        str_free(&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);
        struct menu *child;
        struct symbol *active;
 static void conf_choice(struct menu *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) {
 
        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;
 
                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))
                        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:
                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:
                        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;
                                show_help(child);
                                active = child->sym;
                        } else
                                show_help(menu);
                        break;

-               case 255:
+               case KEY_ESC:
+                       return;
+               case -ERRDISPLAYTOOSMALL:

                        return;
                }
        }
                        return;
                }
        }


@@ -930,40 +767,38 @@ static void conf_choice(struct menu *menu)
 static void conf_string(struct menu *menu)
 {
        const char *prompt = menu_get_prompt(menu);
 static void conf_string(struct menu *menu)
 {
        const char *prompt = menu_get_prompt(menu);

-       int stat;

 
        while (1) {
 
        while (1) {

-               cprint_init();
-               cprint("--title");
-               cprint("%s", prompt ? prompt : "Main Menu");
-               cprint("--inputbox");
+               int res;
+               char *heading;
+

                switch (sym_get_type(menu->sym)) {
                case S_INT:
                switch (sym_get_type(menu->sym)) {
                case S_INT:

-                       cprint(inputbox_instructions_int);
+                       heading = _(inputbox_instructions_int);

                        break;
                case S_HEX:
                        break;
                case S_HEX:

-                       cprint(inputbox_instructions_hex);
+                       heading = _(inputbox_instructions_hex);

                        break;
                case S_STRING:
                        break;
                case S_STRING:

-                       cprint(inputbox_instructions_string);
+                       heading = _(inputbox_instructions_string);

                        break;
                default:
                        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:
                case 0:

-                       if (sym_set_string_value(menu->sym, input_buf))
+                       if (sym_set_string_value(menu->sym, dialog_input_result))

                                return;
                                return;

-                       show_textbox(NULL, "You have made an invalid entry.", 5, 43);
+                       show_textbox(NULL, _("You have made an invalid entry."), 5, 43);

                        break;
                case 1:
                        show_help(menu);
                        break;
                        break;
                case 1:
                        show_help(menu);
                        break;

-               case 255:
+               case KEY_ESC:

                        return;
                }
        }
                        return;
                }
        }


@@ -971,28 +806,24 @@ static void conf_string(struct menu *menu)
 
 static void conf_load(void)
 {
 
 static void conf_load(void)
 {

-       int stat;

 
        while (1) {
 
        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:
                case 0:

-                       if (!input_buf[0])
+                       if (!dialog_input_result[0])

                                return;
                                return;

-                       if (!conf_read(input_buf))
+                       if (!conf_read(dialog_input_result))

                                return;
                                return;

-                       show_textbox(NULL, "File does not exist!", 5, 38);
+                       show_textbox(NULL, _("File does not exist!"), 5, 38);

                        break;
                case 1:
                        break;
                case 1:

-                       show_helptext("Load Alternate Configuration", load_config_help);
+                       show_helptext(_("Load Alternate Configuration"), load_config_help);

                        break;
                        break;

-               case 255:
+               case KEY_ESC:

                        return;
                }
        }
                        return;
                }
        }


@@ -1000,28 +831,23 @@ static void conf_load(void)
 
 static void conf_save(void)
 {
 
 static void conf_save(void)
 {

-       int stat;
-

        while (1) {
        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:
                case 0:

-                       if (!input_buf[0])
+                       if (!dialog_input_result[0])

                                return;
                                return;

-                       if (!conf_write(input_buf))
+                       if (!conf_write(dialog_input_result))

                                return;
                                return;

-                       show_textbox(NULL, "Can't create file!  Probably a nonexistent directory.", 5, 60);
+                       show_textbox(NULL, _("Can't create file!  Probably a nonexistent directory."), 5, 60);

                        break;
                case 1:
                        break;
                case 1:

-                       show_helptext("Save Alternate Configuration", save_config_help);
+                       show_helptext(_("Save Alternate Configuration"), save_config_help);

                        break;
                        break;

-               case 255:
+               case KEY_ESC:

                        return;
                }
        }
                        return;
                }
        }


@@ -1030,22 +856,24 @@ static void conf_save(void)
 static void conf_cleanup(void)
 {
        tcsetattr(1, TCSAFLUSH, &ios_org);
 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;
        char *mode;
 }
 
 int main(int ac, char **av)
 {
        struct symbol *sym;
        char *mode;

-       int stat;
+       int res;
+
+       setlocale(LC_ALL, "");
+       bindtextdomain(PACKAGE, LOCALEDIR);
+       textdomain(PACKAGE);

 
        conf_parse(av[1]);
        conf_read(NULL);
 
 
        conf_parse(av[1]);
        conf_read(NULL);
 

-       sym = sym_lookup("KERNELRELEASE", 0);
+       sym = sym_lookup("KERNELVERSION", 0);

        sym_calc_value(sym);
        sym_calc_value(sym);

-       sprintf(menu_backtitle, "Linux Kernel v%s Configuration",
+       sprintf(menu_backtitle, _("Linux Kernel v%s Configuration"),

                sym_get_string_value(sym));
 
        mode = getenv("MENUCONFIG_MODE");
                sym_get_string_value(sym));
 
        mode = getenv("MENUCONFIG_MODE");


@@ -1057,33 +885,41 @@ int main(int ac, char **av)
        tcgetattr(1, &ios_org);
        atexit(conf_cleanup);
        init_wsize();
        tcgetattr(1, &ios_org);
        atexit(conf_cleanup);
        init_wsize();

-       conf(&rootmenu);
-
+       reset_dialog();
+       init_dialog(menu_backtitle);

        do {
        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) {
+               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();
+
+       switch (res) {
+       case 0:

                if (conf_write(NULL)) {
                if (conf_write(NULL)) {

-                       fprintf(stderr, "\n\n"
+                       fprintf(stderr, _("\n\n"

                                "Error during writing of the kernel configuration.\n"
                                "Your kernel configuration changes were NOT saved."
                                "Error during writing of the kernel configuration.\n"
                                "Your kernel configuration changes were NOT saved."

-                               "\n\n");
+                               "\n\n"));

                        return 1;
                }
                        return 1;
                }

-               printf("\n\n"
+       case -1:
+               printf(_("\n\n"

                        "*** End of Linux kernel configuration.\n"
                        "*** Execute 'make' to build the kernel or try 'make help'."
                        "*** End of Linux kernel configuration.\n"
                        "*** Execute 'make' to build the kernel or try 'make help'."

-                       "\n\n");
-       } else {
-               fprintf(stderr, "\n\n"
+                       "\n\n"));
+               break;
+       default:
+               fprintf(stderr, _("\n\n"

                        "Your kernel configuration changes were NOT saved."
                        "Your kernel configuration changes were NOT saved."

-                       "\n\n");
+                       "\n\n"));

        }
 
        return 0;
        }
 
        return 0;