mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 12:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

keyboard: handle more keys properly

Browse Source
This commit is contained in:
Matheus
2022-10-14 13:33:48 -03:00
parent d9eabb20c6
commit c1c5d779e5
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/x86_64/ps2kbd.c
+31 -7
View File
@@ -124,20 +124,34 @@ static char codes[] = {
KEYCODE_F12
};
static char extendedcodes[] = {
static char extendedcodes[128] = {
[0x1C] = KEYCODE_KEYPADENTER,
[0x1D] = KEYCODE_RIGHTCTRL,
[0x35] = KEYCODE_KEYPADSLASH, // k/
[0x38] = KEYCODE_RIGHTALT, // altgr
[0x47] = KEYCODE_HOME, // home
[0x48] = KEYCODE_UP, // up
[0x49] = KEYCODE_PAGEUP, // page up
[0x4B] = KEYCODE_LEFT, // left
[0x4D] = KEYCODE_RIGHT, // right
[0x4F] = KEYCODE_END, // end
[0x50] = KEYCODE_DOWN, // down
[0x51] = KEYCODE_PAGEDOWN, // page down
[0x52] = KEYCODE_INSERT, // insert
[0x53] = KEYCODE_DELETE // delete
};
static bool extended = false;
void ps2kbd_irq(){
uint8_t scancode = inb(0x60);
if(scancode == 0xE0)
return; // TODO support extended scancodes
if(scancode == 0xE0){
extended = true;
return;
}
kbpacket_t packet;
// TODO convert scancode to keycode
packet.flags = 0;
if(scancode & 0x80){
@@ -145,7 +159,17 @@ void ps2kbd_irq(){
scancode &= 0x7F;
}
packet.keycode = codes[scancode];
char *tab = codes;
if(extended){
tab = extendedcodes;
extended = false;
}
packet.keycode = tab[scancode];
if(!packet.keycode)
return;
keyboard_packet(kb, packet);
src/sys/keyboard.c
+2 -2
View File
@@ -9,11 +9,11 @@
// some keys are sent to the applications in escape sequences
static char asciitable[] = {
0, '\033', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', 0, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', 0, '\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 0, '*', 0, ' ', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '+', '4', '1', '2', '3', '0', '.', 0, 0, 0, 0, 0
0, '\033', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', 0, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', 0, '\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 0, '*', 0, ' ', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '+', '1', '2', '3', '0', '.', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '\n', 0, '/', 0, 0, '\n', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
static char asciitableupper[] = {
0, '\033', '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', '\b', '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n', 0, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '\"', '~', 0, '|', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', 0, '*', 0, ' ', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '+', '4', '1', '2', '3', '0', '.', 0, 0, 0, 0, 0
0, '\033', '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', '\b', '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n', 0, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '\"', '~', 0, '|', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', 0, '*', 0, ' ', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '+', '1', '2', '3', '0', '.', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '\n', 0, '/', 0, 0, '\n', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
static uint32_t kblist;