diff options
| author | Sam Ravnborg <sam@neptun.ravnborg.org> | 2006-09-02 22:01:42 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@neptun.ravnborg.org> | 2006-09-30 11:19:20 +0200 |
| commit | 737ecae264bc759e2033d99e99138f690f3beabf (patch) | |
| tree | 55193f039f5ddfe55b391bbaecca308671532ae2 | |
| parent | kbuild: do not build mconf & lxdialog unless needed (diff) | |
| download | linux-737ecae264bc759e2033d99e99138f690f3beabf.tar.xz linux-737ecae264bc759e2033d99e99138f690f3beabf.zip | |
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 <sam@ravnborg.org>
| -rw-r--r-- | scripts/kconfig/lxdialog/menubox.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c index fcd95a985328..0d83159d9012 100644 --- a/scripts/kconfig/lxdialog/menubox.c +++ b/scripts/kconfig/lxdialog/menubox.c @@ -63,19 +63,19 @@ static int menu_width, item_x; /* * Print menu item */ -static void do_print_item(WINDOW * win, const char *item, int choice, +static void do_print_item(WINDOW * win, const char *item, int line_y, int selected, int hotkey) { int j; char *menu_item = malloc(menu_width + 1); strncpy(menu_item, item, menu_width - item_x); - menu_item[menu_width] = 0; + menu_item[menu_width - item_x] = '\0'; j = first_alpha(menu_item, "YyNnMmHh"); /* Clear 'residue' of last item */ wattrset(win, dlg.menubox.atr); - wmove(win, choice, 0); + wmove(win, line_y, 0); #if OLD_NCURSES { int i; @@ -86,14 +86,14 @@ static void do_print_item(WINDOW * win, const char *item, int choice, wclrtoeol(win); #endif wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr); - mvwaddstr(win, choice, item_x, menu_item); + mvwaddstr(win, line_y, item_x, menu_item); if (hotkey) { wattrset(win, selected ? dlg.tag_key_selected.atr : dlg.tag_key.atr); - mvwaddch(win, choice, item_x + j, menu_item[j]); + mvwaddch(win, line_y, item_x + j, menu_item[j]); } if (selected) { - wmove(win, choice, item_x + 1); + wmove(win, line_y, item_x + 1); } free(menu_item); wrefresh(win); |