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: Sam Ravnborg <[email protected]>
diff --git a/scripts/lxdialog/menubox.c b/scripts/lxdialog/menubox.c
index 89fcf41..461ee08 100644
--- a/scripts/lxdialog/menubox.c
+++ b/scripts/lxdialog/menubox.c
@@ -92,13 +92,13 @@ static void print_item(WINDOW * win, con
wattrset(win, selected ? tag_key_selected_attr : tag_key_attr);
mvwaddch(win, choice, ITEM_IDENT + j, menu_item[j]);
}
if (selected) {
wmove(win, choice, ITEM_IDENT + 1);
- wrefresh(win);
}
free(menu_item);
+ wrefresh(win);
}
/*
* Print the scroll indicators.
*/
@@ -123,10 +123,11 @@ static void print_arrows(WINDOW * win, i
waddch(win, ACS_HLINE);
}
y = y + height + 1;
wmove(win, y, x);
+ wrefresh(win);
if ((height < item_no) && (scroll + height < item_no)) {
wattrset(win, darrow_attr);
waddch(win, ACS_DARROW);
waddstr(win, "(+)");
@@ -137,10 +138,11 @@ static void print_arrows(WINDOW * win, i
waddch(win, ACS_HLINE);
waddch(win, ACS_HLINE);
}
wmove(win, cur_y, cur_x);
+ wrefresh(win);
}
/*
* Display the termination buttons.
*/
@@ -155,10 +157,21 @@ static void print_buttons(WINDOW * win,
wmove(win, y, x + 1 + 12 * selected);
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
*/
int dialog_menu(const char *title, const char *prompt, int height, int width,
int menu_height, const char *current, int item_no,
@@ -284,15 +297,11 @@ int dialog_menu(const char *title, const
(items[(scroll + choice) * 2][0] != ':'));
if (key == KEY_UP || key == '-') {
if (choice < 2 && scroll) {
/* Scroll menu down */
- scrollok(menu, TRUE);
- wscrl(menu, -1);
- scrollok(menu, FALSE);
-
- scroll--;
+ do_scroll(menu, &scroll, -1);
print_item(menu, items[scroll * 2 + 1], 0, FALSE,
(items[scroll * 2][0] != ':'));
} else
choice = MAX(choice - 1, 0);
@@ -304,15 +313,11 @@ int dialog_menu(const char *title, const
(items[(scroll + choice) * 2][0] != ':'));
if ((choice > max_choice - 3) &&
(scroll + max_choice < item_no)) {
/* Scroll menu up */
- scrollok(menu, TRUE);
- wscrl(menu, 1);
- scrollok(menu, FALSE);
-
- scroll++;
+ do_scroll(menu, &scroll, 1);
print_item(menu, items[(scroll + max_choice - 1) * 2 + 1],
max_choice - 1, FALSE,
(items [(scroll + max_choice - 1) * 2][0] != ':'));
} else
@@ -320,37 +325,31 @@ int dialog_menu(const char *title, const
} else if (key == KEY_PPAGE) {
scrollok(menu, TRUE);
for (i = 0; (i < max_choice); i++) {
if (scroll > 0) {
- wscrl(menu, -1);
- scroll--;
+ do_scroll(menu, &scroll, -1);
print_item(menu, items[scroll * 2 + 1], 0, FALSE,
(items[scroll * 2][0] != ':'));
} else {
if (choice > 0)
choice--;
}
}
- scrollok(menu, FALSE);
} else if (key == KEY_NPAGE) {
for (i = 0; (i < max_choice); i++) {
if (scroll + max_choice < item_no) {
- scrollok(menu, TRUE);
- wscrl(menu, 1);
- scrollok(menu, FALSE);
- scroll++;
+ do_scroll(menu, &scroll, 1);
print_item(menu, items[(scroll + max_choice - 1) * 2 + 1],
max_choice - 1, FALSE,
(items [(scroll + max_choice - 1) * 2][0] != ':'));
} else {
if (choice + 1 < max_choice)
choice++;
}
}
-
} else
choice = i;
print_item(menu, items[(scroll + choice) * 2 + 1],
choice, TRUE, (items[(scroll + choice) * 2][0] != ':'));
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
