From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from indigo.cs.bgu.ac.il ([132.72.42.23]:58520 "EHLO indigo.cs.bgu.ac.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753151AbYIEIci (ORCPT ); Fri, 5 Sep 2008 04:32:38 -0400 From: "Nir Tzachar" Subject: [PATCH] ncurses based config V2 Date: Fri, 5 Sep 2008 11:27:00 +0300 Message-Id: <1220603220-17090-1-git-send-email-nir@tzachar.com> In-Reply-To: <1220469076-16487-1-git-send-email-nir@tzachar.com> References: <1220469076-16487-1-git-send-email-nir@tzachar.com> In-Reply-To: <1220469076-16487-1-git-send-email-nir@tzachar.com> References: <1220469076-16487-1-git-send-email-nir@tzachar.com> Sender: linux-kbuild-owner@vger.kernel.org List-ID: To: linux-kernel@vger.kernel.org Cc: bzolnier@gmail.com, zippel@linux-m68k.org, linux-kbuild@vger.kernel.org, ariveira@gmail.com, rdunlap@xenotime.net, kosaki.motohiro@jp.fujitsu.com, 7eggert@gmx.de, Nir Tzachar Changes: 1) Fixed segfaults in help window. 2) Removed the instructions window, made the instructions appear as a button which displays a popup window. 3) Added hot keys support. As ncurses does not support several colors inside a menu, keys are highlighted using "()". 4) Optimized for 80x24 terminals. 6) Fixed zconf.y to use _menu_init 7) added nconfig to "make help" 8) Misc fixes. Comments are appreciated. Cheers. --- scripts/kconfig/Makefile | 17 +- scripts/kconfig/lkc.h | 2 +- scripts/kconfig/mconf.c | 2 + scripts/kconfig/menu.c | 2 +- scripts/kconfig/nconf.c | 2019 +++++++++++++++++++++++++++++++++++ scripts/kconfig/zconf.tab.c_shipped | 2 +- scripts/kconfig/zconf.y | 2 +- 7 files changed, 2041 insertions(+), 5 deletions(-) create mode 100644 scripts/kconfig/nconf.c diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index fa1a7d5..8062ba4 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -15,6 +15,9 @@ gconfig: $(obj)/gconf menuconfig: $(obj)/mconf $< $(Kconfig) +nconfig: $(obj)/nconf + $< $(Kconfig) + config: $(obj)/conf $< $(Kconfig) @@ -75,6 +78,7 @@ endif # Help text used by make help help: @echo ' config - Update current config utilising a line-oriented program' + @echo ' nconfig - Update current config utilising a ncurses menu based program' @echo ' menuconfig - Update current config utilising a menu based program' @echo ' xconfig - Update current config utilising a QT based front-end' @echo ' gconfig - Update current config utilising a GTK based front-end' @@ -102,6 +106,8 @@ HOST_EXTRACFLAGS += -DLOCALE # conf: Used for defconfig, oldconfig and related targets # mconf: Used for the mconfig target. # Utilizes the lxdialog package +# nconf: Used for the nconfig target. +# Utilizes ncurses # qconf: Used for the xconfig target # Based on QT which needs to be installed to compile it # gconf: Used for the gconfig target @@ -113,6 +119,7 @@ lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o conf-objs := conf.o zconf.tab.o mconf-objs := mconf.o zconf.tab.o $(lxdialog) +nconf-objs := nconf.o zconf.tab.o kxgettext-objs := kxgettext.o zconf.tab.o hostprogs-y := conf qconf gconf kxgettext @@ -121,6 +128,10 @@ ifeq ($(MAKECMDGOALS),menuconfig) hostprogs-y += mconf endif +ifeq ($(MAKECMDGOALS),nconfig) + hostprogs-y += nconf +endif + ifeq ($(MAKECMDGOALS),xconfig) qconf-target := 1 endif @@ -140,7 +151,7 @@ endif clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h -clean-files += mconf qconf gconf +clean-files += mconf qconf gconf nconf clean-files += config.pot linux.pot # Check that we have the required ncurses stuff installed for lxdialog (menuconfig) @@ -158,6 +169,10 @@ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) HOSTCFLAGS_lex.zconf.o := -I$(src) HOSTCFLAGS_zconf.tab.o := -I$(src) +HOSTLOADLIBES_nconf = -lmenu -lpanel -lform -lncurses +HOSTCFLAGS_nconf.o = +LDFLAGS_nconf.o = + HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 4a9af6f..0e9c477 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -83,7 +83,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode); void kconfig_load(void); /* menu.c */ -void menu_init(void); +void _menu_init(void); void menu_warn(struct menu *menu, const char *fmt, ...); struct menu *menu_add_menu(void); void menu_end_menu(void); diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 6841e95..8225458 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -6,6 +6,8 @@ * 2002-11-06 Petr Baudis * * i18n, 2005, Arnaldo Carvalho de Melo + * + * ncurses interface, 2008, Nir Tzachar */ #include diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 07ff8d1..ade19a3 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -35,7 +35,7 @@ static void prop_warn(struct property *prop, const char *fmt, ...) va_end(ap); } -void menu_init(void) +void _menu_init(void) { current_entry = current_menu = &rootmenu; last_entry_ptr = &rootmenu.list; diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c new file mode 100644 index 0000000..c13d28a --- /dev/null +++ b/scripts/kconfig/nconf.c @@ -0,0 +1,2019 @@ +/* + * Copyright (C) 2002 Roman Zippel + * Released under the terms of the GNU GPL v2.0. + * + * Introduced single menu mode (show all sub-menus in one large tree). + * 2002-11-06 Petr Baudis + * + * i18n, 2005, Arnaldo Carvalho de Melo + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + + +#define LKC_DIRECT_LINK +#include "lkc.h" +#include "ncurses.h" + +#define max(a,b) ({\ + typeof(a) _a = a;\ + typeof(b) _b = b;\ + _a > _b ? _a : _b; }) + +#define min(a,b) ({\ + typeof(a) _a = a;\ + typeof(b) _b = b;\ + _a < _b ? _a : _b; }) + + +static const char nconf_readme[] = N_( +"Overview\n" +"--------\n" +"Some kernel features may be built directly into the kernel.\n" +"Some may be made into loadable runtime modules. Some features\n" +"may be completely removed altogether. There are also certain\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 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 to build it in, to make it a module or\n" +" to removed it. You may also press the to cycle\n" +"through the available options (ie. Y->N->M->Y).\n" +"\n" +"Some additional keyboard hints:\n" +"\n" +"Menus\n" +"----------\n" +"o Use the Up/Down arrow keys (cursor keys) to highlight the item\n" +" you wish to change or submenu wish to select and press .\n" +" Submenus are designated by \"--->\".\n" +"\n" +" Shortcut: Press the option's highlighted letter (hotkey).\n" +" Pressing a hotkey more than once will sequence\n" +" through all visible items which use that hotkey.\n" +"\n" +" You may also use the and keys to scroll\n" +" unseen options into view.\n" +"\n" +"o To exit a menu use the cursor keys to highlight the button\n" +" and press .\n" +"\n" +" Shortcut: Press or or if there is no hotkey\n" +" using those letters. You may press a single , but\n" +" there is a delayed response which you may find annoying.\n" +"\n" +" Also, the and cursor keys will cycle between and\n" +" \n" +"\n" +"\n" +"Data Entry\n" +"-----------\n" +"o Enter the requested information and press \n" +" If you are entering hexadecimal values, it is not necessary to\n" +" add the '0x' prefix to the entry.\n" +"\n" +"o For help, use the or cursor keys to highlight the help option\n" +" and press . You can try as well.\n" +"\n" +"\n" +"Text Box (Help Window)\n" +"--------\n" +"o Use the cursor keys to scroll up/down/left/right. The VI editor\n" +" keys h,j,k,l function here as do and for those\n" +" who are familiar with less and lynx.\n" +"\n" +"o Press , , or to exit.\n" +"\n" +"\n" +"Alternate Configuration Files\n" +"-----------------------------\n" +"Menuconfig supports the use of alternate configuration files for\n" +"those who, for various reasons, find it necessary to switch\n" +"between different kernel configurations.\n" +"\n" +"At the end of the main menu you will find two options. One is\n" +"for saving the current configuration to a file of your choosing.\n" +"The other option is for loading a previously saved alternate\n" +"configuration.\n" +"\n" +"Even if you don't use alternate configuration files, but you\n" +"find during a Menuconfig session that you have completely messed\n" +"up your settings, you may use the \"Load Alternate...\" option to\n" +"restore your previously saved settings from \".config\" without\n" +"restarting Menuconfig.\n" +"\n" +"Other information\n" +"-----------------\n" +"If you use Menuconfig in an XTERM window make sure you have your\n" +"$TERM variable set to point to a xterm definition which supports color.\n" +"Otherwise, Menuconfig will look rather bad. Menuconfig will not\n" +"display correctly in a RXVT window because rxvt displays only one\n" +"intensity of color, bright.\n" +"\n" +"Menuconfig will display larger menus on screens or xterms which are\n" +"set to display more than the standard 25 row by 80 column geometry.\n" +"In order for this to work, the \"stty size\" command must be able to\n" +"display the screen's current row and column geometry. I STRONGLY\n" +"RECOMMEND that you make sure you do NOT have the shell variables\n" +"LINES and COLUMNS exported into your environment. Some distributions\n" +"export those variables via /etc/profile. Some ncurses programs can\n" +"become confused when those variables (LINES & COLUMNS) don't reflect\n" +"the true screen size.\n" +"\n" +"Optional personality available\n" +"------------------------------\n" +"If you prefer to have all of the kernel options listed in a single\n" +"menu, rather than the default multimenu hierarchy, run the menuconfig\n" +"with MENUCONFIG_MODE environment variable set to single_menu. Example:\n" +"\n" +"make MENUCONFIG_MODE = single_menu menuconfig\n" +"\n" +" will then unroll the appropriate category, or enfold it if it\n" +"is already unrolled.\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" +"\n"), +menu_instructions[] = N_( + " Arrow keys navigate the menu.\n" + " selects submenus --->.\n" + " Letters in () are hotkeys.\n" + " Pressing includes, excludes, modularizes features.\n" + " Press to go back one menu, for Help, for Search.\n" + " Legend: [*] built-in [ ] excluded module < > module capable.\n"), +radiolist_instructions[] = N_( + " Use the arrow keys to navigate this window or\n" + " press the hotkey of the item you wish to select\n" + " followed by the .\n" + " Press or for additional information about this option.\n"), +inputbox_instructions_int[] = N_( + "Please enter a decimal value.\n" + "Fractions will not be accepted.\n" + "Press to accept, to cancel."), +inputbox_instructions_hex[] = N_( + "Please enter a hexadecimal value.\n" + "Press to accept, to cancel."), +inputbox_instructions_string[] = N_( + "Please enter a string value.\n" + "Press to accept, to cancel."), +setmod_text[] = N_( + "This feature depends on another which\n" + "has been configured as a module.\n" + "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.\n" + "Accept the name shown to restore the configuration you\n" + "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" + "If you have saved a previous configuration in a file other than the\n" + "kernel's default, entering the name of the file here will allow you\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[] = N_( + "Enter a filename to which this configuration should be saved\n" + "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" + "Entering a file name here will allow you to later retrieve, modify\n" + "and use the current configuration as an alternate to whatever\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[] = N_( + "\n" + "Search for CONFIG_ symbols and display their relations.\n" + "Regular expressions are allowed.\n" + "Example: search for \"^FOO\"\n" + "Result:\n" + "-----------------------------------------------------------------\n" + "Symbol: FOO [ = m]\n" + "Prompt: Foo bus is used to drive the bar HW\n" + "Defined at drivers/pci/Kconfig:47\n" + "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n" + "Location:\n" + " -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n" + " -> PCI support (PCI [ = y])\n" + " -> PCI access mode ( [ = y])\n" + "Selects: LIBCRC32\n" + "Selected by: BAR\n" + "-----------------------------------------------------------------\n" + "o The line 'Prompt:' shows the text used in the menu structure for\n" + " this CONFIG_ symbol\n" + "o The 'Defined at' line tell at what file / line number the symbol\n" + " is defined\n" + "o The 'Depends on:' line tell what symbols needs to be defined for\n" + " this symbol to be visible in the menu (selectable)\n" + "o The 'Location:' lines tell where in the menu structure this symbol\n" + " is located\n" + " A location followed by a [ = y] indicate that this is a selectable\n" + " menu item - and current value is displayed inside brackets.\n" + "o The 'Selects:' line tell what symbol will be automatically\n" + " selected if this symbol is selected (y or m)\n" + "o The 'Selected by' line tell what symbol has selected this symbol\n" + "\n" + "Only relevant lines are shown.\n" + "\n\n" + "Search examples:\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"); + +struct mitem { + char str[256]; + char tag; + void *usrptr; + int is_hot; +}; + +#define MAX_MENU_ITEMS 4096 +static int indent; +static struct menu *current_menu; +static int child_count; +static int single_menu_mode; +/* the window in which all information appears */ +static WINDOW *main_window; +/* the largest size of the menu window */ +static int mwin_max_lines; +static int mwin_max_cols; +/* the window in which we show option buttons */ +static WINDOW *btns_window; +static MENU *curses_menu; +static MENU *btns_menu; +static ITEM *curses_menu_items[MAX_MENU_ITEMS]; +static struct mitem k_menu_items[MAX_MENU_ITEMS]; +static int items_num; +/* the currently selected button */ +static enum current_btn_t { BTN_SELECT = 0, BTN_EXIT, BTN_HELP, BTN_INSTS, + BTN_MAX} current_btn = BTN_SELECT; +static ITEM *btns_items[BTN_MAX]; +const char *current_instructions = menu_instructions; + +static char *btns[] = { + " */ + set_current_item(btns_menu, btns_items[BTN_SELECT]); + + /* Post the menu */ + post_menu(curses_menu); + post_menu(btns_menu); + refresh_all_windows(); +} + + +static void conf(struct menu *menu) +{ + char pattern[256]; + struct menu *submenu; + const char *prompt = menu_get_prompt(menu); + struct symbol *sym; + struct menu *active_menu = NULL; + int res; + int current_index = 0; + + bzero(pattern, sizeof(pattern)); + + while (1) { + reset_menu(); + current_menu = menu; + build_conf(menu); + if (!child_count) + break; + + if (menu == &rootmenu) { + item_make(NULL, 0, "--- "); + item_make(NULL, 'L', + _(" Load an Alternate Configuration File")); + item_make(NULL, 'S', + _(" Save an Alternate Configuration File")); + } + + show_menu(prompt ? _(prompt) : _("Main Menu"), + _(menu_instructions), + current_index); + while ((res = wgetch(main_window))) { + switch (res) { + case KEY_DOWN: + menu_driver(curses_menu, REQ_DOWN_ITEM); + break; + case KEY_UP: + menu_driver(curses_menu, REQ_UP_ITEM); + break; + case KEY_LEFT: + menu_driver(btns_menu, REQ_LEFT_ITEM); + break; + case KEY_RIGHT: + menu_driver(btns_menu, REQ_RIGHT_ITEM); + break; + case KEY_NPAGE: + menu_driver(curses_menu, REQ_SCR_DPAGE); + break; + case KEY_PPAGE: + menu_driver(curses_menu, REQ_SCR_UPAGE); + break; + } + if (res == 10 || res == 27 || res == 'h' || + res == 32 || res == 'n' || res == 'y' || + res == 'm' || res == '/' || res == ':') + break; + else if (canbhot(res)) { + /* check for hot keys: */ + int tmp = get_next_hot(res); + if (tmp != -1) + center_item(tmp); + } + refresh_all_windows(); + } + + /* update selected btn */ + update_current_btn(); + refresh_all_windows(); + + /* if ESC or btn_exit */ + if (res == 27 || (res == 10 && current_btn == BTN_EXIT)) + break; + + /* remember location in the menu */ + current_index = curses_item_index(); + + if (!item_tag()) + continue; + + submenu = (struct menu *) item_data(); + active_menu = (struct menu *)item_data(); + if (submenu) + sym = submenu->sym; + else + sym = NULL; + + switch (res) { + case 10: /* ENTER WAS PRESSED */ + /* check for btn help!! */ + if (current_btn == BTN_HELP) { + if (sym) + show_help(submenu); + else + show_scroll_win(_("README"), + _(nconf_readme)); + break; + } else if (current_btn == BTN_INSTS) { + show_scroll_win(_("Instructions"), + _(current_instructions)); + break; + } + + switch (item_tag()) { + case 'm': + if (single_menu_mode) + submenu->data = + (void *) (long) !submenu->data; + else + conf(submenu); + break; + case 't': + if (sym_is_choice(sym) && + sym_get_tristate_value(sym) == yes) + conf_choice(submenu); + else if (submenu->prompt->type == P_MENU) + conf(submenu); + break; + case 's': + conf_string(submenu); + break; + case 'L': + conf_load(); + break; + case 'S': + conf_save(); + break; + } + break; + case 'h': + case '?': + if (sym) + show_help(submenu); + else + show_scroll_win(_("README"), _(nconf_readme)); + break; + case 'y': + if (item_is_tag('t')) { + if (sym_set_tristate_value(sym, yes)) + break; + if (sym_set_tristate_value(sym, mod)) + btn_dialog(setmod_text, 0); + } + break; + case 'n': + if (item_is_tag('t')) + sym_set_tristate_value(sym, no); + break; + case 'm': + if (item_is_tag('t')) + sym_set_tristate_value(sym, mod); + break; + case ' ': + if (item_is_tag('t')) + sym_toggle_tristate_value(sym); + else if (item_is_tag('m')) + conf(submenu); + break; + case '/': + search_conf(); + break; + } + } +} + +/* layman's scrollble window... */ +static void show_scroll_win(const char *title, const char *text) +{ + int res; + int total_lines = get_line_no(text); + int x, y; + int start_x = 0, start_y = 0; + int text_lines = 0, text_cols = 0; + int total_cols = 0; + int win_cols = 0; + int win_lines = 0; + int i = 0; + WINDOW *win; + WINDOW *pad; + PANEL *panel; + + /* find the widest line of msg: */ + total_lines = get_line_no(text); + for (i = 0; i < total_lines; i++) { + const char *line = get_line(text, i); + int len = get_line_length(line); + total_cols = max(total_cols, len+2); + } + + /* create the pad */ + pad = newpad(total_lines+10, total_cols+10); + wattrset(pad, attributes[SCROLLWIN_TEXT]); + for (i = 0; i < total_lines; i++) { + char tmp[total_cols+10]; + const char *line = get_line(text, i); + int len = get_line_length(line); + strncpy(tmp, line, len); + tmp[len] = '\0'; + mvwprintw(pad, i, 0, tmp); + } + + win_lines = min(total_lines+2, LINES-2); + win_cols = min(total_cols+2, COLS-2); + text_lines = max(win_lines-2, 0); + text_cols = max(win_cols-2, 0); + + /* place window in middle of screen */ + y = (LINES-win_lines)/2; + x = (COLS-win_cols)/2; + + win = newwin(win_lines, win_cols, y, x); + keypad(win, TRUE); + /* show the help in the help window, and show the help panel */ + wattrset(win, attributes[SCROLLWIN_BOX]); + box(win, 0, 0); + wattrset(win, attributes[SCROLLWIN_HEADING]); + mvwprintw(win, 0, 3, " %s ", title); + panel = new_panel(win); + + /* handle scrolling */ + do { + + copywin(pad, win, start_y, start_x, 2, 2, text_lines, + text_cols, 0); + wrefresh(win); + + res = wgetch(win); + switch (res) { + case KEY_NPAGE: + case ' ': + start_y += text_lines-2; + break; + case KEY_PPAGE: + start_y -= text_lines+2; + break; + case KEY_DOWN: + start_y++; + break; + case KEY_UP: + start_y--; + break; + case KEY_LEFT: + start_x--; + break; + case KEY_RIGHT: + start_x++; + break; + } + if (res == 10 || res == 27) + break; + if (start_y < 0) + start_y = 0; + if (start_y >= total_lines-text_lines) + start_y = total_lines-text_lines; + if (start_x < 0) + start_x = 0; + if (start_x >= total_cols-text_cols) + start_x = total_cols-text_cols; + } while (res); + + del_panel(panel); + delwin(win); + refresh_all_windows(); +} + +static void show_help(struct menu *menu) +{ + struct gstr help = str_new(); + struct symbol *sym = menu->sym; + + if (menu_has_help(menu)) { + if (sym->name) { + str_printf(&help, "CONFIG_%s:\n\n", sym->name); + str_append(&help, _(menu_get_help(menu))); + str_append(&help, "\n"); + } + } else { + str_append(&help, nohelp_text); + } + get_symbol_str(&help, sym); + show_scroll_win(_(menu_get_prompt(menu)), str_get(&help)); + str_free(&help); +} + +static void conf_choice(struct menu *menu) +{ + const char *prompt = _(menu_get_prompt(menu)); + struct menu *child; + struct symbol *active; + int selected_index = 0; + int res, i = 0; + + active = sym_get_choice_value(menu->sym); + /* this is mostly duplicated from the conf() function. + * maybe refactor?? + */ + while (1) { + reset_menu(); + + for (i = 0, child = menu->list; child; child = child->next) { + if (!menu_is_visible(child)) + continue; + + if (child->sym == sym_get_choice_value(menu->sym)) + item_make(child, ':', " %s", + _(menu_get_prompt(child))); + else + item_make(child, ':', " %s", + _(menu_get_prompt(child))); + if (child->sym == active) + selected_index = i; + i++; + } + show_menu(prompt ? _(prompt) : _("Choice Menu"), + _(radiolist_instructions), + selected_index); + while ((res = wgetch(main_window))) { + switch (res) { + case KEY_DOWN: + menu_driver(curses_menu, REQ_DOWN_ITEM); + break; + case KEY_UP: + menu_driver(curses_menu, REQ_UP_ITEM); + break; + case KEY_LEFT: + menu_driver(btns_menu, REQ_LEFT_ITEM); + break; + case KEY_RIGHT: + menu_driver(btns_menu, REQ_RIGHT_ITEM); + break; + case KEY_NPAGE: + menu_driver(curses_menu, REQ_SCR_DPAGE); + break; + case KEY_PPAGE: + menu_driver(curses_menu, REQ_SCR_UPAGE); + break; + } + if (res == 10 || res == 27 || + res == 'h' || res == ' ' || + res == '?') + break; + else if (canbhot(res)) { + /* check for hot keys: */ + int tmp = get_next_hot(res); + if (tmp != -1) + center_item(tmp); + } + refresh_all_windows(); + } + /* update selected btn */ + update_current_btn(); + + /* if ESC or btn_exit */ + if (res == 27 || (res == 10 && current_btn == BTN_EXIT)) + return; + + child = item_data(); + switch (res) { + case ' ': + case 10: + if (current_btn == BTN_HELP) { + show_help(child); + break; + } else if (current_btn == BTN_INSTS) { + show_scroll_win(_("Instructions"), + _(current_instructions)); + break; + } + sym_set_tristate_value(child->sym, yes); + return; + case 'h': + case '?': + show_help(child); + active = child->sym; + break; + case KEY_EXIT: + return; + } + } +} + +static void conf_string(struct menu *menu) +{ + const char *prompt = menu_get_prompt(menu); + char dialog_input_result[256]; + + while (1) { + int res; + const char *heading; + + switch (sym_get_type(menu->sym)) { + case S_INT: + heading = _(inputbox_instructions_int); + break; + case S_HEX: + heading = _(inputbox_instructions_hex); + break; + case S_STRING: + heading = _(inputbox_instructions_string); + break; + default: + heading = _("Internal nconf error!"); + } + res = dialog_inputbox(prompt ? _(prompt) : _("Main Menu"), + heading, + sym_get_string_value(menu->sym), + dialog_input_result, + sizeof(dialog_input_result)); + switch (res) { + case 0: + if (sym_set_string_value(menu->sym, + dialog_input_result)) + return; + btn_dialog(_("You have made an invalid entry."), 0); + break; + case 1: + show_help(menu); + break; + case KEY_EXIT: + return; + } + } +} + +static void conf_load(void) +{ + char dialog_input_result[256]; + while (1) { + int res; + res = dialog_inputbox(NULL, load_config_text, + filename, + dialog_input_result, + sizeof(dialog_input_result)); + switch (res) { + case 0: + if (!dialog_input_result[0]) + return; + if (!conf_read(dialog_input_result)) { + set_config_filename(dialog_input_result); + sym_set_change_count(1); + return; + } + btn_dialog(_("File does not exist!"), 0); + break; + case 1: + show_scroll_win(_("Load Alternate Configuration"), + load_config_help); + break; + case KEY_EXIT: + return; + } + } +} + +static void conf_save(void) +{ + char dialog_input_result[256]; + while (1) { + int res; + res = dialog_inputbox(NULL, save_config_text, + filename, + dialog_input_result, + sizeof(dialog_input_result)); + switch (res) { + case 0: + if (!dialog_input_result[0]) + return; + if (!conf_write(dialog_input_result)) { + set_config_filename(dialog_input_result); + return; + } + btn_dialog(_("Can't create file! " + "Probably a nonexistent directory."), 0); + break; + case 1: + show_scroll_win(_("Save Alternate Configuration"), + save_config_help); + break; + case KEY_EXIT: + return; + } + } +} + +void setup_windows(void) +{ + int btn_lines, btn_cols; + + if (main_window != NULL) + delwin(main_window); + + /* set up the menu and menu window */ + main_window = newwin(LINES-2, COLS-2, 2, 1); + keypad(main_window, TRUE); + mwin_max_lines = LINES-7; + mwin_max_cols = COLS-6; + + scale_menu(btns_menu, &btn_lines, &btn_cols); + btn_cols = min(btn_cols, COLS-16); + btns_window = derwin(main_window, + 1, + btn_cols, + LINES-4, + (COLS-2-btn_cols)/2); + set_menu_win(btns_menu, btns_window); + set_menu_sub(btns_menu, btns_window); + + /* panels order is from bottom to top */ + new_panel(main_window); +} + +int main(int ac, char **av) +{ + char *mode; + const char *title; + int res; + int i; + + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + + conf_parse(av[1]); + conf_read(NULL); + + mode = getenv("MENUCONFIG_MODE"); + if (mode) { + if (!strcasecmp(mode, "single_menu")) + single_menu_mode = 1; + } + + /* Initialize curses */ + initscr(); + start_color(); + cbreak(); + noecho(); + raw(); + keypad(stdscr, TRUE); + clear(); + curs_set(0); + + if (COLS < 60 || LINES < 24) { + endwin(); + printf("Your terminal should have at " + "least 24 lines and 60 columns"); + endwin(); + return 1; + } + + /* set color theme */ + set_normal_colors(); + normal_color_theme(); + + notimeout(stdscr, TRUE); + /* notimeout does not seem to work!! */ + ESCDELAY = 0; + + title = set_config_filename(conf_get_configname()); + print_in_middle(stdscr, 1, 0, COLS, title, attributes[MAIN_HEADING]); + + /* set btns menu */ + for (i = 0; i < BTN_MAX; i++) + btns_items[i] = new_item(btns[i], ""); + btns_items[BTN_MAX] = NULL; + btns_menu = new_menu(btns_items); + set_menu_format(btns_menu, 1, BTN_MAX); + menu_opts_off(btns_menu, O_SHOWDESC); + menu_opts_on(btns_menu, O_SHOWMATCH); + menu_opts_on(btns_menu, O_ONEVALUE); + menu_opts_on(btns_menu, O_NONCYCLIC); + set_menu_mark(btns_menu, ""); + set_menu_fore(btns_menu, attributes[BOTTOM_MENU_FORE]); + set_menu_back(btns_menu, attributes[BOTTOM_MENU_BACK]); + + curses_menu = new_menu(curses_menu_items); + menu_opts_off(curses_menu, O_SHOWDESC); + menu_opts_on(curses_menu, O_SHOWMATCH); + menu_opts_on(curses_menu, O_ONEVALUE); + menu_opts_on(curses_menu, O_NONCYCLIC); + set_menu_mark(curses_menu, " "); + set_menu_fore(curses_menu, attributes[MAIN_MENU_FORE]); + set_menu_back(curses_menu, attributes[MAIN_MENU_BACK]); + + setup_windows(); + + do { + conf(&rootmenu); + clear(); + if (conf_get_changed()) + res = btn_dialog(_("Do you wish to save your " + "new kernel configuration?\n" + " to continue."), + 2, + " ", + ""); + else + res = -1; + } while (res == KEY_EXIT); + unpost_menu(curses_menu); + unpost_menu(btns_menu); + free_menu(curses_menu); + free_menu(btns_menu); + delwin(main_window); + endwin(); + + + 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")); + break; + default: + fprintf(stderr, _("\n\n" + "Your kernel configuration changes were NOT saved." + "\n\n")); + } + + return 0; +} + diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped index 95df833..ef5b369 100644 --- a/scripts/kconfig/zconf.tab.c_shipped +++ b/scripts/kconfig/zconf.tab.c_shipped @@ -2255,7 +2255,7 @@ void conf_parse(const char *name) zconf_initscan(name); sym_init(); - menu_init(); + _menu_init(); modules_sym = sym_lookup(NULL, 0); modules_sym->type = S_BOOLEAN; modules_sym->flags |= SYMBOL_AUTO; diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 9710b82..cbb72fd 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -472,7 +472,7 @@ void conf_parse(const char *name) zconf_initscan(name); sym_init(); - menu_init(); + _menu_init(); modules_sym = sym_lookup(NULL, 0); modules_sym->type = S_BOOLEAN; modules_sym->flags |= SYMBOL_AUTO; -- 1.5.6.4