Commit 063f4661 authored by Dirk Gouders's avatar Dirk Gouders Committed by Yann E. MORIN
Browse files

mconf: handle keys in empty dialogs 



When entering an empty dialog, using the movement keys resulted in
unexpected characters beeing displayed, other keys like "z" and "h"
did not work as expected.

This patch handles the movement keys as well as other keys, especially
"z", "h" and "/".

Signed-off-by: default avatarDirk Gouders <dirk@gouders.net>
[yann.morin.1998@free.fr: keep lines <80 chars, so reorder test]
Tested-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent 57a9c760

scripts/kconfig/lxdialog/menubox.c

+5 −4
Original line number Diff line number Diff line
@@ -303,10 +303,11 @@ do_resize: 
				}

		}



		if (i < max_choice ||

		if (item_count() != 0 &&

		    (i < max_choice ||

		     key == KEY_UP || key == KEY_DOWN ||

		     key == '-' || key == '+' ||

		    key == KEY_PPAGE || key == KEY_NPAGE) {

		     key == KEY_PPAGE || key == KEY_NPAGE)) {

			/* Remove highligt of current item */

			print_item(scroll + choice, choice, FALSE);

scripts/kconfig/mconf.c

+6 −5
Original line number Diff line number Diff line
@@ -670,11 +670,12 @@ static void conf(struct menu *menu, struct menu *active_menu) 
				  active_menu, &s_scroll);

		if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)

			break;

		if (item_count() != 0) {

			if (!item_activate_selected())

				continue;

			if (!item_tag())

				continue;



		}

		submenu = item_data();

		active_menu = item_data();

		if (submenu)

CRA Git | Maintained and supported by SUSTech CRA and CCSE