Przeglądaj źródła

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: Dirk Gouders <dirk@gouders.net>
[yann.morin.1998@free.fr: keep lines <80 chars, so reorder test]
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Dirk Gouders 12 lat temu
rodzic
commit
063f4661fd
2 zmienionych plików z 11 dodań i 9 usunięć
  1. 5 4
      scripts/kconfig/lxdialog/menubox.c
  2. 6 5
      scripts/kconfig/mconf.c

+ 5 - 4
scripts/kconfig/lxdialog/menubox.c

@@ -303,10 +303,11 @@ do_resize:
 				}
 				}
 		}
 		}
 
 
-		if (i < max_choice ||
-		    key == KEY_UP || key == KEY_DOWN ||
-		    key == '-' || key == '+' ||
-		    key == KEY_PPAGE || key == KEY_NPAGE) {
+		if (item_count() != 0 &&
+		    (i < max_choice ||
+		     key == KEY_UP || key == KEY_DOWN ||
+		     key == '-' || key == '+' ||
+		     key == KEY_PPAGE || key == KEY_NPAGE)) {
 			/* Remove highligt of current item */
 			/* Remove highligt of current item */
 			print_item(scroll + choice, choice, FALSE);
 			print_item(scroll + choice, choice, FALSE);
 
 

+ 6 - 5
scripts/kconfig/mconf.c

@@ -670,11 +670,12 @@ static void conf(struct menu *menu, struct menu *active_menu)
 				  active_menu, &s_scroll);
 				  active_menu, &s_scroll);
 		if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)
 		if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)
 			break;
 			break;
-		if (!item_activate_selected())
-			continue;
-		if (!item_tag())
-			continue;
-
+		if (item_count() != 0) {
+			if (!item_activate_selected())
+				continue;
+			if (!item_tag())
+				continue;
+		}
 		submenu = item_data();
 		submenu = item_data();
 		active_menu = item_data();
 		active_menu = item_data();
 		if (submenu)
 		if (submenu)