Skip to content

Commit 85cfaa0

Browse files
Improve detection of Meta/Command key on Mac (#20895)
- Add `0xE0` for Firefox on Mac - Add `|| win.keys[348]` for right Command key
1 parent 870a773 commit 85cfaa0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/library_glfw.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ var LibraryGLFW = {
343343
case 0x11:return 341; // DOM_VK_CONTROL -> GLFW_KEY_LEFT_CONTROL
344344
case 0x12:return 342; // DOM_VK_ALT -> GLFW_KEY_LEFT_ALT
345345
case 0x5B:return 343; // DOM_VK_WIN -> GLFW_KEY_LEFT_SUPER
346+
case 0xE0:return 343; // DOM_VK_META -> GLFW_KEY_LEFT_SUPER
346347
// case 0x10:return 344; // DOM_VK_SHIFT -> GLFW_KEY_RIGHT_SHIFT (DOM_KEY_LOCATION_RIGHT)
347348
// case 0x11:return 345; // DOM_VK_CONTROL -> GLFW_KEY_RIGHT_CONTROL (DOM_KEY_LOCATION_RIGHT)
348349
// case 0x12:return 346; // DOM_VK_ALT -> GLFW_KEY_RIGHT_ALT (DOM_KEY_LOCATION_RIGHT)
@@ -359,7 +360,7 @@ var LibraryGLFW = {
359360
if (win.keys[340]) mod |= 0x0001; // GLFW_MOD_SHIFT
360361
if (win.keys[341]) mod |= 0x0002; // GLFW_MOD_CONTROL
361362
if (win.keys[342]) mod |= 0x0004; // GLFW_MOD_ALT
362-
if (win.keys[343]) mod |= 0x0008; // GLFW_MOD_SUPER
363+
if (win.keys[343] || win.keys[348]) mod |= 0x0008; // GLFW_MOD_SUPER
363364
// add caps and num lock keys? only if lock_key_mod is set
364365
return mod;
365366
},

0 commit comments

Comments
 (0)