Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

readline: Fix handling of escape key for BIOS

Browse Source
This commit is contained in:
mintsuki 2021-05-19 08:13:15 +02:00
parent 4c1782357a
commit eb51e5a14a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stage23/lib/readline.c
View File

@ -33,6 +33,8 @@ int getchar_internal(uint8_t scancode, uint8_t ascii) {
return GETCHAR_PGUP;
case 0x51:
return GETCHAR_PGDOWN;
case 0x01:
return GETCHAR_ESCAPE;
#elif defined (uefi)
case SCAN_F10:
return GETCHAR_F10;
@ -55,7 +57,7 @@ int getchar_internal(uint8_t scancode, uint8_t ascii) {
case SCAN_PAGE_DOWN:
return GETCHAR_PGDOWN;
case SCAN_ESC:
return '\e';
return GETCHAR_ESCAPE;
#endif
}
switch (ascii) {
@ -65,8 +67,9 @@ int getchar_internal(uint8_t scancode, uint8_t ascii) {
return '\b';
}
// Guard against non-printable values
if (ascii < 0x20 || ascii > 0x7e)
if (ascii < 0x20 || ascii > 0x7e) {
return -1;
}
return ascii;
}

1
stage23/lib/readline.h
View File

@ -13,6 +13,7 @@
#define GETCHAR_PGUP (-17)
#define GETCHAR_PGDOWN (-18)
#define GETCHAR_F10 (-19)
#define GETCHAR_ESCAPE (-20)
int getchar(void);
void readline(const char *orig_str, char *buf, size_t limit);

2
stage23/menu.c
View File

@ -258,7 +258,7 @@ refresh:
case GETCHAR_F10:
disable_cursor();
return buffer;
case '\e':
case GETCHAR_ESCAPE:
disable_cursor();
return NULL;
default: