vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* normal/menu_text.c (print_message): Clean up the message and show

Browse source 
the Fn information when on EFI
	* term/efi/console.c (grub_console_checkkey): Add F4 support.
This commit is contained in:
EFI Coder 2010-04-09 21:16:17 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent 027de555e2
commit 25f4e25287
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-04-09 EFI Coder <eficoder@hotmail.com>
* normal/menu_text.c (print_message): Clean up the message and show
the Fn information when on EFI
* term/efi/console.c (grub_console_checkkey): Add F4 support.
2010-04-09 Vladimir Serbinenko <phcoder@gmail.com> 2010-04-09 Vladimir Serbinenko <phcoder@gmail.com>
* normal/autofs.c (read_fs_list): New parameter 'prefix'. * normal/autofs.c (read_fs_list): New parameter 'prefix'.

11
normal/menu_text.c
View file

@ -176,10 +176,17 @@ print_message (int nested, int edit, struct grub_term_output *term)
if (edit) if (edit)
{ {
grub_putcode ('\n', term); 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 \ 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 to boot, Ctrl-c for a \
command-line or ESC to return menu."), STANDARD_MARGIN, STANDARD_MARGIN, command-line or ESC to discard edits and return to the GRUB menu."),
term); STANDARD_MARGIN, STANDARD_MARGIN, term);
#endif
} }
else else
{ {

3
term/efi/console.c
View file

@ -194,6 +194,9 @@ grub_console_checkkey (void)
case 0x0d: case 0x0d:
read_key = 5; read_key = 5;
break; break;
case 0x0e:
read_key = 3;
break;
case 0x17: case 0x17:
read_key = '\e'; read_key = '\e';
break; break;