Commit 90fe4c50 authored by Masahiro Yamada's avatar Masahiro Yamada

kconfig: menuconfig: remove OLD_NCURSES macro

This code has been here for more than 20 years. The bug in the old days
no longer matters.
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 491b146d
...@@ -18,22 +18,6 @@ ...@@ -18,22 +18,6 @@
#endif #endif
#include <ncurses.h> #include <ncurses.h>
/*
* Colors in ncurses 1.9.9e do not work properly since foreground and
* background colors are OR'd rather than separately masked. This version
* of dialog was hacked to work with ncurses 1.9.9e, making it incompatible
* with standard curses. The simplest fix (to make this work with standard
* curses) uses the wbkgdset() function, not used in the original hack.
* Turn it off if we're building with 1.9.9e, since it just confuses things.
*/
#if defined(NCURSES_VERSION) && defined(_NEED_WRAP) && !defined(GCC_PRINTFLIKE)
#define OLD_NCURSES 1
#undef wbkgdset
#define wbkgdset(w,p) /*nothing */
#else
#define OLD_NCURSES 0
#endif
#define TR(params) _tracef params #define TR(params) _tracef params
#define KEY_ESC 27 #define KEY_ESC 27
......
...@@ -63,15 +63,7 @@ static void do_print_item(WINDOW * win, const char *item, int line_y, ...@@ -63,15 +63,7 @@ static void do_print_item(WINDOW * win, const char *item, int line_y,
/* Clear 'residue' of last item */ /* Clear 'residue' of last item */
wattrset(win, dlg.menubox.atr); wattrset(win, dlg.menubox.atr);
wmove(win, line_y, 0); wmove(win, line_y, 0);
#if OLD_NCURSES
{
int i;
for (i = 0; i < menu_width; i++)
waddch(win, ' ');
}
#else
wclrtoeol(win); wclrtoeol(win);
#endif
wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr); wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr);
mvwaddstr(win, line_y, item_x, menu_item); mvwaddstr(win, line_y, item_x, menu_item);
if (hotkey) { if (hotkey) {
......
...@@ -336,16 +336,7 @@ static void print_line(WINDOW * win, int row, int width) ...@@ -336,16 +336,7 @@ static void print_line(WINDOW * win, int row, int width)
waddnstr(win, line, MIN(strlen(line), width - 2)); waddnstr(win, line, MIN(strlen(line), width - 2));
/* Clear 'residue' of previous line */ /* Clear 'residue' of previous line */
#if OLD_NCURSES
{
int x = getcurx(win);
int i;
for (i = 0; i < width - x; i++)
waddch(win, ' ');
}
#else
wclrtoeol(win); wclrtoeol(win);
#endif
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment