2008-05-29 Robert Millan <rmh@aybabtu.com>

        * term/i386/pc/at_keyboard.c (grub_console_checkkey): Add support for
        control key combinations.

diff --git a/ChangeLog b/ChangeLog
index dcbf025ab074fece8098a78615b35434701addbb..f70fdfddbe858fdce3ab20403ba3f5d6ca4ca761 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-29  Robert Millan  <rmh@aybabtu.com>
+
+       * term/i386/pc/at_keyboard.c (grub_console_checkkey): Add support for
+       control key combinations.
+
 2008-05-29  Robert Millan  <rmh@aybabtu.com>
 
        * util/powerpc/ieee1275/grub-install.in: Move from here ...

diff --git a/term/i386/pc/at_keyboard.c b/term/i386/pc/at_keyboard.c
index 51799e1540b51958a9633f91ca97fda7cbe455a5..2417bf5f4d378e967290a8f92290e88bd691e693 100644 (file)
--- a/term/i386/pc/at_keyboard.c
+++ b/term/i386/pc/at_keyboard.c
@@ -186,7 +186,9 @@ grub_console_checkkey (void)
        key = -1;
        break;
       default:
-       if ((at_keyboard_status & (KEYBOARD_STATUS_SHIFT_L | KEYBOARD_STATUS_SHIFT_R))
+       if (at_keyboard_status & (KEYBOARD_STATUS_CTRL_L | KEYBOARD_STATUS_CTRL_R))
+         key = keyboard_map[key] - 'a' + 1;
+       else if ((at_keyboard_status & (KEYBOARD_STATUS_SHIFT_L | KEYBOARD_STATUS_SHIFT_R))
            && keyboard_map_shift[key])
          key = keyboard_map_shift[key];
        else