mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-06-01 06:44:27 +08:00
Fixed detection of function keys on Emscripten
Fixes https://github.com/libsdl-org/SDL/issues/11973
(cherry picked from commit 67382e9c83)
This commit is contained in:
@@ -794,6 +794,20 @@ static EM_BOOL Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent
|
|||||||
return preventDefault;
|
return preventDefault;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool IsFunctionKey(SDL_Scancode scancode)
|
||||||
|
{
|
||||||
|
if (scancode >= SDL_SCANCODE_F1 && scancode <= SDL_SCANCODE_F12) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (scancode >= SDL_SCANCODE_F13 && scancode <= SDL_SCANCODE_F24) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This is a great tool to see web keyboard events live:
|
||||||
|
* https://w3c.github.io/uievents/tools/key-event-viewer.html
|
||||||
|
*/
|
||||||
static EM_BOOL Emscripten_HandleKey(int eventType, const EmscriptenKeyboardEvent *keyEvent, void *userData)
|
static EM_BOOL Emscripten_HandleKey(int eventType, const EmscriptenKeyboardEvent *keyEvent, void *userData)
|
||||||
{
|
{
|
||||||
const SDL_Keycode keycode = Emscripten_MapKeyCode(keyEvent);
|
const SDL_Keycode keycode = Emscripten_MapKeyCode(keyEvent);
|
||||||
@@ -823,7 +837,7 @@ static EM_BOOL Emscripten_HandleKey(int eventType, const EmscriptenKeyboardEvent
|
|||||||
(scancode == SDL_SCANCODE_UP) ||
|
(scancode == SDL_SCANCODE_UP) ||
|
||||||
(scancode == SDL_SCANCODE_RIGHT) ||
|
(scancode == SDL_SCANCODE_RIGHT) ||
|
||||||
(scancode == SDL_SCANCODE_DOWN) ||
|
(scancode == SDL_SCANCODE_DOWN) ||
|
||||||
((scancode >= SDL_SCANCODE_F1) && (scancode <= SDL_SCANCODE_F15)) ||
|
IsFunctionKey(scancode) ||
|
||||||
keyEvent->ctrlKey) {
|
keyEvent->ctrlKey) {
|
||||||
is_nav_key = SDL_TRUE;
|
is_nav_key = SDL_TRUE;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user