GIT e9a3f46eb252f6703e22bfafa830309788be63ae git+ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/lxdialog.git commit Author: Sam Ravnborg Date: Mon Sep 25 17:35:43 2006 +0200 kconfig/menuconfig: do not let ncurses clutter screen on exit Do not initialize ncurses twice - it causes unpredicable results. My display was sometimes weird after running make menuconfig and I had to execute 'reset' to properly restore my display. Signed-off-by: Sam Ravnborg commit d90fc9116d5a39194097d0044a7ce01936f45543 Author: Sam Ravnborg Date: Sat Sep 2 22:01:42 2006 +0200 kconfig/lxdialog: clear long menu lines Menulines that were wider than the available line width is now properly null terminated. While at it renamed the variable choice => line_y so it better reflect the usage in do_print_item(). Signed-off-by: Sam Ravnborg commit 0882fbb24cd3a42f7bef7bfc91c014d91ebd4797 Author: Sam Ravnborg Date: Sat Sep 2 21:32:14 2006 +0200 kbuild: do not build mconf & lxdialog unless needed Due to a limitation in kbuild all objects referred by xxx-y or xxx-objs will be build when one of the targets needs to e build. This caused lxdialog to be build pulling in ncurses that is not always available. So avoid building mconf & lxdialog unless really needed. Signed-off-by: Sam Ravnborg commit 54ceb19a5656b6b7ae374831c078216d5e1a4a71 Author: Sam Ravnborg Date: Sun Jul 30 09:47:33 2006 +0200 kconfig/lxdialog: fix make mrproper No Makefile in scripts/kconfig/lxdialog anymore, so do not go there during make mrproper. Signed-off-by: Sam Ravnborg commit 466ac6aa895d1c25964f9fef4502bb9b1cab6dd9 Author: Sam Ravnborg Date: Sat Jul 29 22:48:57 2006 +0200 kconfig/lxdialog: support resize In all dialogs now properly catch KEY_RESIZE and take proper action. In mconf try to behave sensibly when a dialog routine returns -ERRDISPLAYTOOSMALL. The original check for a screnn size of 80x19 is kept for now. It may make sense to remove it later, but thats anyway what much text is adjusted for. Signed-off-by: Sam Ravnborg commit 0d9076ae65ffa0a1d7bbaf8cf0b16ac1eac63b6e Author: Sam Ravnborg Date: Fri Jul 28 23:57:48 2006 +0200 kconfig/lxdialog: let behave as expected is used to step one back in the dialogs. When lxdialog became built-in pressing once would cause one step back and pressing would cause two steps back. This patch - based on concept from Roman Zippel - makes one a noop and pressing will cause one step backward. In addition the final yes/no dialog now has the option to go back to the the kernel configuration. So if you get too far out you can now go back to configuring the kernel without saving and starting all over again. Signed-off-by: Sam Ravnborg commit 49140e7b29bb1fcc195efef3e1c54c144dd2eff7 Author: Sam Ravnborg Date: Thu Jul 27 22:10:27 2006 +0200 kconfig/menuconfig: lxdialog is now built-in lxdialog was previously called as an external program causing screen to flicker when used. With this patch lxdialog is now built-in. It is loosly based om previous work by: Petr Baudis Following is a list of changes: o Moved build of dialog routings to kconfig Makefile o menubox + checklist uses a new item list to hold all menu items o in util.c implmented helper function to deal with item list o menubox now uses parameters to save scroll state (avoids temp file) o textbox now get text to be displayed as parameter and not a file o make sure to properly delete subwin's before main windows o killed unused files: lxdialog.c msgbox.c o modified return value for ESC to match direct calling o in a few places the code has been adjusted to 80 char wide o in textbox a small refactoring was made to make code remotely readable o in mconf removed all unused stuff (functions/variables) Following is a list of know short comings: a) pressing ESC twice will be interpreted as two ESC presses b) resize does not work. menuconfig needs to be restarted to be adjusted Signed-off-by: Sam Ravnborg commit 0caea54a7495001f8192c4c1558711bc4200c910 Author: Sam Ravnborg Date: Mon Jul 24 22:19:51 2006 +0200 kconfig/lxdialog: add a new theme bluetitle which is now default The bluetitle theme is a slightly modified version of the colorscheme that -mm users has been used to. The bluetitle is more readable especially on some LCD screens so it is now default. Anyone that really wants the old color selection can get it by selecting the classic color theme: make MENUCONFIG_COLOR=classic menuconfig The bluetitle theme was modified by Roman Zippel to further improve readability on LCD screens. Signed-off-by: Sam Ravnborg commit cd0125d4c9bc9c2192a265989b1c60e94cd398b3 Author: Sam Ravnborg Date: Mon Jul 24 22:04:04 2006 +0200 kconfig/lxdialog: add support for color themes and add blackbg theme The blackbg theme was originally made by: Han Boetes It was copied from a patch by "Randy.Dunlap" which was also the inspiration source for the color theme support. Signed-off-by: Sam Ravnborg commit 9238251dddc15b52656e70b74dffe56193d01215 Author: Sam Ravnborg Date: Mon Jul 24 21:40:46 2006 +0200 kconfig/lxdialog: refactor color support Clean up and refactor color support. All color support are now in util.c including color definitions. In the process introduced a global variable named 'dlg' which is used all over to set color - thats the reason why all files are changed. Signed-off-by: Sam Ravnborg scripts/kconfig/lxdialog/util.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c index d54440f..e836ca1 100644 --- a/scripts/kconfig/lxdialog/util.c +++ b/scripts/kconfig/lxdialog/util.c @@ -219,6 +219,7 @@ static void init_dialog_colors(void) /* * Setup for color display */ +<<<<<<< HEAD/scripts/kconfig/lxdialog/util.c static void color_setup(const char *theme) { int use_color; @@ -230,6 +231,21 @@ static void color_setup(const char *them } else set_mono_theme(); } +======= +static void color_setup(const char *theme) +{ + if (set_theme(theme)) { + if (has_colors()) { /* Terminal supports color? */ + start_color(); + init_dialog_colors(); + } + } + else + { + set_mono_theme(); + } +} +>>>>>>> /scripts/kconfig/lxdialog/util.c /* * Set window to attribute 'attr'