support for Fn keys

normal/main.c

@@ -164,7 +164,20 @@ static struct
   {
     {"backspace", '\b'},
     {"tab", '\t'},
-    {"delete", GRUB_TERM_KEY_DC}
+    {"delete", GRUB_TERM_KEY_DC},
+    {"insert", GRUB_TERM_KEY_INSERT},
+    {"f1", GRUB_TERM_KEY_F1},
+    {"f2", GRUB_TERM_KEY_F2},
+    {"f3", GRUB_TERM_KEY_F3},
+    {"f4", GRUB_TERM_KEY_F4},
+    {"f5", GRUB_TERM_KEY_F5},
+    {"f6", GRUB_TERM_KEY_F6},
+    {"f7", GRUB_TERM_KEY_F7},
+    {"f8", GRUB_TERM_KEY_F8},
+    {"f9", GRUB_TERM_KEY_F9},
+    {"f10", GRUB_TERM_KEY_F10},
+    {"f11", GRUB_TERM_KEY_F11},
+    {"f12", GRUB_TERM_KEY_F12},
   };
 
 /* Add a menu entry to the current menu context (as given by the environment

normal/menu_entry.c

@@ -1337,6 +1337,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
 	  break;
 
 	case GRUB_TERM_CTRL | 'h':
+	case '\b':
 	  if (! backward_delete_char (screen, 1))
 	    goto fail;
 	  break;
@@ -1375,10 +1376,12 @@ grub_menu_entry_run (grub_menu_entry_t entry)
 	  return;
 
 	case GRUB_TERM_CTRL | 'c':
+	case GRUB_TERM_KEY_F2:
 	  grub_cmdline_run (1);
 	  goto refresh;
 
 	case GRUB_TERM_CTRL | 'x':
+	case GRUB_TERM_KEY_F10:
 	  {
 	    int chars_before = grub_normal_get_char_counter ();
 	    run (screen);

normal/menu_text.c

@@ -120,17 +120,10 @@ print_message (int nested, int edit, struct grub_term_output *term)
   if (edit)
     {
       grub_putcode ('\n', term);
-#ifdef GRUB_MACHINE_EFI
       grub_print_message_indented (_("Minimum Emacs-like screen editing is \
-supported. TAB lists completions. Press F1 to boot, F2=Ctrl-a, F3=Ctrl-e, \
-F4 for a command-line or ESC to discard edits and return to the GRUB menu."),
-                                   STANDARD_MARGIN, STANDARD_MARGIN, term);
-#else
-      grub_print_message_indented (_("Minimum Emacs-like screen editing is \
-supported. TAB lists completions. Press Ctrl-x to boot, Ctrl-c for a \
+supported. TAB lists completions. Press Ctrl-x or F10 to boot, Ctrl-c or F2 for a \
 command-line or ESC to discard edits and return to the GRUB menu."),
                                    STANDARD_MARGIN, STANDARD_MARGIN, term);
-#endif
     }
   else
     {