:: commit 9423860745552e67558d4edb9ec493ca0fa87845

mintsuki <mintsuki@protonmail.com> — 2021-07-11 00:03

parents: f66620052d

Revert "readline: rewrite Ctrl-[pnbf] to arrows"

This reverts commit 9e2d9f1630353d3e89874ba4732b32b293726857.
diff --git a/stage23/lib/readline.c b/stage23/lib/readline.c
index ecbfac71..201780ff 100644
--- a/stage23/lib/readline.c
+++ b/stage23/lib/readline.c
@@ -35,22 +35,6 @@ int getchar_internal(uint8_t scancode, uint8_t ascii) {
             return GETCHAR_PGDOWN;
         case 0x01:
             return GETCHAR_ESCAPE;
-
-        // special case checks for C-[pnfb]
-#define CTRL_CHECK(ch, key)             \
-            if ((ascii | 0x60) == ch) { \
-                return key;             \
-            } else {                    \
-                break;                  \
-            }
-        case 0x19:
-            CTRL_CHECK('p', GETCHAR_CURSOR_UP);
-        case 0x31:
-            CTRL_CHECK('n', GETCHAR_CURSOR_DOWN);
-        case 0x21:
-            CTRL_CHECK('f', GETCHAR_CURSOR_RIGHT);
-        case 0x30:
-            CTRL_CHECK('b', GETCHAR_CURSOR_LEFT);
 #elif defined (uefi)
         case SCAN_F10:
             return GETCHAR_F10;
@@ -74,22 +58,8 @@ int getchar_internal(uint8_t scancode, uint8_t ascii) {
             return GETCHAR_PGDOWN;
         case SCAN_ESC:
             return GETCHAR_ESCAPE;
-
-        // special case checks for C-[pnfb]
-        // EFI for some reason reports scancode zero if Ctrl is held
-#define CTRL_CHECK(ch, key)             \
-            if ((ascii | 0x60) == ch) { \
-                return key;             \
-            }
-        case 0:
-            CTRL_CHECK('p', GETCHAR_CURSOR_UP);
-            CTRL_CHECK('n', GETCHAR_CURSOR_DOWN);
-            CTRL_CHECK('f', GETCHAR_CURSOR_RIGHT);
-            CTRL_CHECK('b', GETCHAR_CURSOR_LEFT);
-            break;
 #endif
     }
-#undef CTRL_CHECK
     switch (ascii) {
         case '\r':
             return '\n';
tab: 248 wrap: offon