8000 js: report Cmd, and release keys the browser never says came up by benface · Pull Request #698 · not-fl3/miniquad · GitHub
[go: up one dir, main page]
Skip to content

js: report Cmd, and release keys the browser never says came up #698

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

Open
benface wants to merge 1 commit into
base: master
Choose a base branch
from
Open

js: report Cmd, and release keys the browser never says came up #698

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
74 changes: 50 additions & 24 deletions js/gl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,17 +576,50 @@ function into_sapp_keycode(key_code) {
case "ShiftLeft": return 340;
case "ControlLeft": return 341;
case "AltLeft": return 342;
case "OSLeft": return 343;
// Cmd and the Windows key: "Meta" in every browser, and "OS" in
// Firefox before version 118.
case "MetaLeft": case "OSLeft": return 343;
case "ShiftRight": return 344;
case "ControlRight": return 345;
case "AltRight": return 346;
case "OSRight": return 347;
case "MetaRight": case "OSRight": return 347;
case "ContextMenu": return 348;
}

console.log("Unsupported keyboard key: ", key_code)
}

function into_sapp_modifiers(event) {
var modifiers = 0;
if (event.ctrlKey) {
modifiers |= SAPP_MODIFIER_CTRL;
}
if (event.shiftKey) {
modifiers |= SAPP_MODIFIER_SHIFT;
}
if (event.altKey) {
modifiers |= SAPP_MODIFIER_ALT;
}
if (event.metaKey) {
modifiers |= SAPP_MODIFIER_SUPER;
}
return modifiers;
}

// The keys the app was told went down, and not yet that they came up.
var keys_down = new Set();

// Tell the app the keys `released` picks came up, as browsers don't
// always say.
function release_keys(released, modifiers) {
keys_down.forEach(function (key) {
if (released(key)) {
keys_down.delete(key);
wasm_exports.key_up(key, modifiers);
}
});
}

function dpi_scale() {
if (high_dpi) {
return window.devicePixelRatio || 1.0;
Expand Down Expand Up @@ -1228,17 +1261,8 @@ var importObject = {
break;
}

var modifiers = 0;
if (event.ctrlKey) {
modifiers |= SAPP_MODIFIER_CTRL;
}
if (event.shiftKey) {
modifiers |= SAPP_MODIFIER_SHIFT;
}
if (event.altKey) {
modifiers |= SAPP_MODIFIER_ALT;
}
wasm_exports.key_down(sapp_key_code, modifiers, event.repeat);
keys_down.add(sapp_key_code);
wasm_exports.key_down(sapp_key_code, into_sapp_modifiers(event), event.repeat);
// for "space", "quote", and "slash" preventDefault will prevent
// key_press event, so send it here instead
if (sapp_key_code == 32 || sapp_key_code == 39 || sapp_key_code == 47) {
Expand All @@ -1247,20 +1271,22 @@ var importObject = {
};
canvas. (event) {
var sapp_key_code = into_sapp_keycode(event.code);
var modifiers = into_sapp_modifiers(event);

var modifiers = 0;
if (event.ctrlKey) {
modifiers |= SAPP_MODIFIER_CTRL;
}
if (event.shiftKey) {
modifiers |= SAPP_MODIFIER_SHIFT;
}
if (event.altKey) {
modifiers |= SAPP_MODIFIER_ALT;
}

keys_down.delete(sapp_key_code);
wasm_exports.key_up(sapp_key_code, modifiers);
// macOS browsers send no keyup for a key released while Cmd
// is down, so every key but the modifiers (340 to 347),
// which do send one, comes up with Cmd.
if (sapp_key_code == 343 || sapp_key_code == 347) {
release_keys(function (key) { return key < 340 || key > 347; }, modifiers);
}
};
// Once the canvas loses focus, as when Cmd+Tab switches apps or
// Ctrl+Tab switches tabs, its keys come up elsewhere.
canvas.addEventListener("blur", function () {
release_keys(function () { return true; }, 0);
});
canvas. (event) {
var sapp_key_code = into_sapp_keycode(event.code);

Expand Down
Loading
0