Commit 7c3badf9 authored by Sam Ravnborg's avatar Sam Ravnborg

kconfig: Fix indention when using menuconfig in text-onle consoles

When using menuconfig in a text-only console (no X started)
the indention was often two spaces wrong. This proved to be a ncurses
issue which are worked around by calling wrefresh more often.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 0e175d05
...@@ -94,9 +94,9 @@ static void print_item(WINDOW * win, const char *item, int choice, ...@@ -94,9 +94,9 @@ static void print_item(WINDOW * win, const char *item, int choice,
} }
if (selected) { if (selected) {
wmove(win, choice, ITEM_IDENT + 1); wmove(win, choice, ITEM_IDENT + 1);
wrefresh(win);
} }
free(menu_item); free(menu_item);
wrefresh(win);
} }
/* /*
...@@ -125,6 +125,7 @@ static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x, ...@@ -125,6 +125,7 @@ static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x,
y = y + height + 1; y = y + height + 1;
wmove(win, y, x); wmove(win, y, x);
wrefresh(win);
if ((height < item_no) && (scroll + height < item_no)) { if ((height < item_no) && (scroll + height < item_no)) {
wattrset(win, darrow_attr); wattrset(win, darrow_attr);
...@@ -139,6 +140,7 @@ static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x, ...@@ -139,6 +140,7 @@ static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x,
} }
wmove(win, cur_y, cur_x); wmove(win, cur_y, cur_x);
wrefresh(win);
} }
/* /*
...@@ -157,6 +159,17 @@ static void print_buttons(WINDOW * win, int height, int width, int selected) ...@@ -157,6 +159,17 @@ static void print_buttons(WINDOW * win, int height, int width, int selected)
wrefresh(win); wrefresh(win);
} }
/* scroll up n lines (n may be negative) */
static void do_scroll(WINDOW *win, int *scroll, int n)
{
/* Scroll menu up */
scrollok(win, TRUE);
wscrl(win, n);
scrollok(win, FALSE);
*scroll = *scroll + n;
wrefresh(win);
}
/* /*
* Display a menu for choosing among a number of options * Display a menu for choosing among a number of options
*/ */
...@@ -286,11 +299,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width, ...@@ -286,11 +299,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
if (key == KEY_UP || key == '-') { if (key == KEY_UP || key == '-') {
if (choice < 2 && scroll) { if (choice < 2 && scroll) {
/* Scroll menu down */ /* Scroll menu down */
scrollok(menu, TRUE); do_scroll(menu, &scroll, -1);
wscrl(menu, -1);
scrollok(menu, FALSE);
scroll--;
print_item(menu, items[scroll * 2 + 1], 0, FALSE, print_item(menu, items[scroll * 2 + 1], 0, FALSE,
(items[scroll * 2][0] != ':')); (items[scroll * 2][0] != ':'));
...@@ -306,11 +315,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width, ...@@ -306,11 +315,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
if ((choice > max_choice - 3) && if ((choice > max_choice - 3) &&
(scroll + max_choice < item_no)) { (scroll + max_choice < item_no)) {
/* Scroll menu up */ /* Scroll menu up */
scrollok(menu, TRUE); do_scroll(menu, &scroll, 1);
wscrl(menu, 1);
scrollok(menu, FALSE);
scroll++;
print_item(menu, items[(scroll + max_choice - 1) * 2 + 1], print_item(menu, items[(scroll + max_choice - 1) * 2 + 1],
max_choice - 1, FALSE, max_choice - 1, FALSE,
...@@ -322,8 +327,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width, ...@@ -322,8 +327,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
scrollok(menu, TRUE); scrollok(menu, TRUE);
for (i = 0; (i < max_choice); i++) { for (i = 0; (i < max_choice); i++) {
if (scroll > 0) { if (scroll > 0) {
wscrl(menu, -1); do_scroll(menu, &scroll, -1);
scroll--;
print_item(menu, items[scroll * 2 + 1], 0, FALSE, print_item(menu, items[scroll * 2 + 1], 0, FALSE,
(items[scroll * 2][0] != ':')); (items[scroll * 2][0] != ':'));
} else { } else {
...@@ -331,15 +335,11 @@ int dialog_menu(const char *title, const char *prompt, int height, int width, ...@@ -331,15 +335,11 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
choice--; choice--;
} }
} }
scrollok(menu, FALSE);
} else if (key == KEY_NPAGE) { } else if (key == KEY_NPAGE) {
for (i = 0; (i < max_choice); i++) { for (i = 0; (i < max_choice); i++) {
if (scroll + max_choice < item_no) { if (scroll + max_choice < item_no) {
scrollok(menu, TRUE); do_scroll(menu, &scroll, 1);
wscrl(menu, 1);
scrollok(menu, FALSE);
scroll++;
print_item(menu, items[(scroll + max_choice - 1) * 2 + 1], print_item(menu, items[(scroll + max_choice - 1) * 2 + 1],
max_choice - 1, FALSE, max_choice - 1, FALSE,
(items [(scroll + max_choice - 1) * 2][0] != ':')); (items [(scroll + max_choice - 1) * 2][0] != ':'));
...@@ -348,7 +348,6 @@ int dialog_menu(const char *title, const char *prompt, int height, int width, ...@@ -348,7 +348,6 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
choice++; choice++;
} }
} }
} else } else
choice = i; choice = i;
......
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