Skip to content

Add key event #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2025
Merged

Add key event #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/drivers/include/drivers/keyboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ typedef enum keyboard_key {

void init_keyboard();

typedef void (*keyboard_cb_t)(uint8_t, char, keyboard_event_t, keyboard_mod_t);

void keyboard_set_cb(keyboard_cb_t cb);

char keyboard_char(uint8_t code, bool shift);

#endif // KEYBOARD_H
303 changes: 52 additions & 251 deletions src/drivers/src/keyboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,84 +2,78 @@

#include "cpu/isr.h"
#include "cpu/ports.h"
#include "libc/signal.h"
#include "libc/stdio.h"

void print_letter(uint8_t scancode);

static keyboard_cb_t _cb = 0;
static uint8_t last_code = 0;
static bool lctrl = false;
static bool rctrl = false;
static bool lalt = false;
static bool ralt = false;
static bool lshift = false;
static bool rshift = false;
static bool lsuper = false;
static bool rsuper = false;

void keyboard_set_cb(keyboard_cb_t cb) {
_cb = cb;
}
static uint8_t last_code = 0;
static bool lctrl = false;
static bool rctrl = false;
static bool lalt = false;
static bool ralt = false;
static bool lshift = false;
static bool rshift = false;
static bool lsuper = false;
static bool rsuper = false;

static void keyboard_callback(registers_t * regs) {
/* The PIC leaves us the scancode in port 0x60 */
uint8_t scancode = port_byte_in(0x60);
uint8_t keycode = scancode;
if (_cb) {
keyboard_event_t event = KEY_EVENT_PRESS;
bool press = keycode < 0x80;
uint8_t scancode = port_byte_in(0x60);
uint8_t keycode = scancode;
keyboard_event_t key_event = KEY_EVENT_PRESS;
bool press = keycode < 0x80;

if (press) {
if (keycode == last_code) {
event = KEY_EVENT_REPEAT;
}
else {
if (keycode == KEY_LSHIFT) {
lshift = true;
}
if (keycode == KEY_RSHIFT) {
lshift = true;
}
}
last_code = keycode;
if (press) {
if (keycode == last_code) {
key_event = KEY_EVENT_REPEAT;
}

else {
keycode -= 0x80;
event = KEY_EVENT_RELEASE;
last_code = 0;

if (keycode == KEY_LSHIFT) {
lshift = false;
lshift = true;
}
if (keycode == KEY_RSHIFT) {
lshift = false;
lshift = true;
}
}
last_code = keycode;
}

char c = keyboard_char(keycode, lshift || rshift);
else {
keycode -= 0x80;
key_event = KEY_EVENT_RELEASE;
last_code = 0;

keyboard_mod_t mods = 0;
if (lctrl || rctrl) {
mods |= KEY_MOD_CTRL;
if (keycode == KEY_LSHIFT) {
lshift = false;
}
if (lalt || ralt) {
mods |= KEY_MOD_ALT;
}
if (lshift || rshift) {
mods |= KEY_MOD_SHIFT;
}
if (lsuper || rsuper) {
mods |= KEY_MOD_SUPER;
if (keycode == KEY_RSHIFT) {
lshift = false;
}
}

_cb(keycode, c, event, mods);
char c = keyboard_char(keycode, lshift || rshift);

keyboard_mod_t mods = 0;
if (lctrl || rctrl) {
mods |= KEY_MOD_CTRL;
}
else {
printf("Keyboard scancode: %u, ", scancode);
print_letter(scancode);
printf("\n");
if (lalt || ralt) {
mods |= KEY_MOD_ALT;
}
if (lshift || rshift) {
mods |= KEY_MOD_SHIFT;
}
if (lsuper || rsuper) {
mods |= KEY_MOD_SUPER;
}

ebus_event_t event;
event.event_id = EBUS_EVENT_KEY;
event.key.event = key_event;
event.key.mods = mods;
event.key.c = c;
event.key.keycode = keycode;
event.key.scancode = scancode;
queue_event(&event);
}

void init_keyboard() {
Expand All @@ -96,196 +90,3 @@ char keyboard_char(uint8_t code, bool shift) {
}
return keyMap[code];
}

void print_letter(uint8_t scancode) {
switch (scancode) {
default:
/* 'keuyp' event corresponds to the 'keydown' + 0x80
* it may still be a scancode we haven't implemented yet, or
* maybe a control/escape sequence */
if (scancode <= 0x7f) {
printf("Unknown key down");
}
else if (scancode <= 0x39 + 0x80) {
printf("key up ");
print_letter(scancode - 0x80);
}
else {
printf("Unknown key up");
}
break;
case 0x0:
break;
case 0x1:
printf("ESC");
break;
case 0x2:
printf("1");
break;
case 0x3:
printf("2");
break;
case 0x4:
printf("3");
break;
case 0x5:
printf("4");
break;
case 0x6:
printf("5");
break;
case 0x7:
printf("6");
break;
case 0x8:
printf("7");
break;
case 0x9:
printf("8");
break;
case 0x0A:
printf("9");
break;
case 0x0B:
printf("0");
break;
case 0x0C:
printf("-");
break;
case 0x0D:
printf("+");
break;
case 0x0E:
printf("Backspace");
break;
case 0x0F:
printf("Tab");
break;
case 0x10:
printf("Q");
break;
case 0x11:
printf("W");
break;
case 0x12:
printf("E");
break;
case 0x13:
printf("R");
break;
case 0x14:
printf("T");
break;
case 0x15:
printf("Y");
break;
case 0x16:
printf("U");
break;
case 0x17:
printf("I");
break;
case 0x18:
printf("O");
break;
case 0x19:
printf("P");
break;
case 0x1A:
printf("[");
break;
case 0x1B:
printf("]");
break;
case 0x1C:
printf("ENTER");
break;
case 0x1D:
printf("LCtrl");
break;
case 0x1E:
printf("A");
break;
case 0x1F:
printf("S");
break;
case 0x20:
printf("D");
break;
case 0x21:
printf("F");
break;
case 0x22:
printf("G");
break;
case 0x23:
printf("H");
break;
case 0x24:
printf("J");
break;
case 0x25:
printf("K");
break;
case 0x26:
printf("L");
break;
case 0x27:
printf(";");
break;
case 0x28:
printf("'");
break;
case 0x29:
printf("`");
break;
case 0x2A:
printf("LShift");
break;
case 0x2B:
printf("\\");
break;
case 0x2C:
printf("Z");
break;
case 0x2D:
printf("X");
break;
case 0x2E:
printf("C");
break;
case 0x2F:
printf("V");
break;
case 0x30:
printf("B");
break;
case 0x31:
printf("N");
break;
case 0x32:
printf("M");
break;
case 0x33:
printf(",");
break;
case 0x34:
printf(".");
break;
case 0x35:
printf("/");
break;
case 0x36:
printf("Rshift");
break;
case 0x37:
printf("Keypad *");
break;
case 0x38:
printf("LAlt");
break;
case 0x39:
printf("Spc");
break;
}
}
21 changes: 18 additions & 3 deletions src/ebus/include/ebus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
*/

enum EBUS_EVENT {
EBUS_EVENT_ANY = 0,
EBUS_EVENT_TIMER = 1,
EBUS_EVENT_USER_MSG = 2,
EBUS_EVENT_ANY = 0,
EBUS_EVENT_TIMER,
EBUS_EVENT_USER_MSG,
EBUS_EVENT_KEY,
};

typedef struct _ebus_event {
Expand All @@ -35,6 +36,13 @@ typedef struct _ebus_event {
struct {
const char * msg;
} user_msg;
struct {
uint8_t event;
uint8_t mods;
char c;
uint32_t keycode;
uint32_t scancode;
} key;
};
} ebus_event_t;

Expand Down Expand Up @@ -62,6 +70,13 @@ void ebus_free(ebus_t * bus);

int ebus_queue_size(ebus_t * bus);

/**
* @brief
*
* @param bus
* @param handler
* @return int id, <= 0 for failure
*/
int ebus_register_handler(ebus_t * bus, ebus_handler_t * handler);
void ebus_unregister_handler(ebus_t * bus, int handler_id);

Expand Down
Loading