Skip to content

Emscripten keyboard #393

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
OneLoneCoder merged 3 commits into from
Jun 11, 2025
Merged

Emscripten keyboard #393

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0165ec
remove duplicate for PK_BACKSLASH
Moros1138 Nov 12, 2024
c2c9f50
handle number pad state
Moros1138 Nov 12, 2024
26f4777
pass the pk_code directly
Moros1138 Nov 12, 2024
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
44 changes: 40 additions & 4 deletions olcPixelGameEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7010,7 +7010,7 @@ namespace olc
mapKeys[DOM_PK_CAPS_LOCK] = Key::CAPS_LOCK;
mapKeys[DOM_PK_SEMICOLON] = Key::OEM_1; mapKeys[DOM_PK_SLASH] = Key::OEM_2; mapKeys[DOM_PK_BACKQUOTE] = Key::OEM_3;
mapKeys[DOM_PK_BRACKET_LEFT] = Key::OEM_4; mapKeys[DOM_PK_BACKSLASH] = Key::OEM_5; mapKeys[DOM_PK_BRACKET_RIGHT] = Key::OEM_6;
mapKeys[DOM_PK_QUOTE] = Key::OEM_7; mapKeys[DOM_PK_BACKSLASH] = Key::OEM_8;
mapKeys[DOM_PK_QUOTE] = Key::OEM_7;

// Keyboard Callbacks
emscripten_set_keydown_callback("#canvas", 0, 1, keyboard_callback);
Expand Down Expand Up @@ -7173,12 +7173,48 @@ namespace olc
//TY Moros
static EM_BOOL keyboard_callback(int eventType, const EmscriptenKeyboardEvent* e, void* userData)
{
// we maintain our own state for teh number pad, default true
static bool numPadActive = true;

// THANK GOD!! for this compute function. And thanks Dandistine for pointing it out!
int pk_code = emscripten_compute_dom_pk_code(e->code);

if(!numPadActive)
{
/**
* we need to react differently if the numlock is not
* active. this block ensures uniform behavior with
* windows and linux, MacOS is a lost cause due to GLUT.
*/
switch(pk_code)
{
case DOM_PK_NUMPAD_7: pk_code = DOM_PK_HOME; break;
case DOM_PK_NUMPAD_8: pk_code = DOM_PK_ARROW_UP; break;
case DOM_PK_NUMPAD_9: pk_code = DOM_PK_PAGE_UP; break;
case DOM_PK_NUMPAD_4: pk_code = DOM_PK_ARROW_LEFT; break;
case DOM_PK_NUMPAD_5: pk_code = DOM_PK_UNKNOWN; break;
case DOM_PK_NUMPAD_6: pk_code = DOM_PK_ARROW_RIGHT; break;
case DOM_PK_NUMPAD_1: pk_code = DOM_PK_END; break;
case DOM_PK_NUMPAD_2: pk_code = DOM_PK_ARROW_DOWN; break;
case DOM_PK_NUMPAD_3: pk_code = DOM_PK_PAGE_DOWN; break;
case DOM_PK_NUMPAD_0: pk_code = DOM_PK_INSERT; break;
case DOM_PK_NUMPAD_DECIMAL: pk_code = DOM_PK_DELETE; break;
default:
break;
}
}

// check for keydown + numlock and act appropriately
if (eventType == EMSCRIPTEN_EVENT_KEYDOWN && pk_code == DOM_PK_NUM_LOCK)
{
numPadActive = !numPadActive;
}

if (eventType == EMSCRIPTEN_EVENT_KEYDOWN)
ptrPGE->olc_UpdateKeyState(emscripten_compute_dom_pk_code(e->code), true);
ptrPGE->olc_UpdateKeyState(pk_code, true);

// THANK GOD!! for this compute function. And thanks Dandistine for pointing it out!
if (eventType == EMSCRIPTEN_EVENT_KEYUP)
ptrPGE->olc_UpdateKeyState(emscripten_compute_dom_pk_code(e->code), false);
ptrPGE->olc_UpdateKeyState(pk_code, false);

//Consume keyboard events so that keys like F1 and F5 don't do weird things
return EM_TRUE;
Expand Down