Merge pull request livecode#5899 from runrevmark/bugfix-17657

livecodepanos · web-flow · commit b3c265b5ad21 · 2017-09-04T18:32:55.000+01:00
[[ Bug 17657 ]] Fetch key codes of modifier keys in keysDown
diff --git a/docs/notes/bugfix-17657.md b/docs/notes/bugfix-17657.md
@@ -0,0 +1 @@
+# Make sure modifier keys are recognised in keysDown()
diff --git a/engine/src/mac-core.mm b/engine/src/mac-core.mm
@@ -1429,7 +1429,11 @@ bool MCMacPlatformMapKeyCode(uint32_t p_mac_keycode, uint32_t p_modifier_flags,
     else
         r_keycode = keysyms[p_mac_keycode];
     
-	// r_keycode = s_mac_keycode_map[p_mac_keycode];
+    /* The keysyms and shift_keysyms arrays don't have entries for everything. If
+     * we get 0 here we fall back to the underlying list's entries. This means
+     * that modifier keys are correctly handled */
+    if (r_keycode == 0)
+        r_keycode = s_mac_keycode_map[p_mac_keycode];
     
 	return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Make sure modifier keys are recognised in keysDown()`