Revert "Merge pull request scratchfoundation#1341 from cwillisf/use-keycode-for-whenKeyPressed"

Christopher Willis-Ford · Christopher Willis-Ford · commit f75c91759c3e · 2017-10-27T10:49:27.000-07:00
This reverts commit 10a60fa, reversing changes made to 23fddb0.
diff --git a/src/scratch/ScratchRuntime.as b/src/scratch/ScratchRuntime.as
@@ -37,7 +37,6 @@ import flash.media.*;
 import flash.net.*;
 import flash.system.System;
 import flash.text.TextField;
-import flash.ui.Keyboard;
 import flash.utils.*;
 
 import interpreter.*;
@@ -949,37 +948,31 @@ public class ScratchRuntime {
 
 	public function keyDown(evt:KeyboardEvent):void {
 		shiftIsDown = evt.shiftKey;
-		var ch:int = getCharCode(evt);
+		var ch:int = evt.charCode;
+		if (evt.charCode == 0) ch = mapArrowKey(evt.keyCode);
+		if ((65 <= ch) && (ch <= 90)) ch += 32; // map A-Z to a-z
 		if (!(evt.target is TextField)) startKeyHats(ch);
 		if (ch < 128) keyIsDown[ch] = true;
 	}
 
 	public function keyUp(evt:KeyboardEvent):void {
 		shiftIsDown = evt.shiftKey;
-		var ch:int = getCharCode(evt);
+		var ch:int = evt.charCode;
+		if (evt.charCode == 0) ch = mapArrowKey(evt.keyCode);
+		if ((65 <= ch) && (ch <= 90)) ch += 32; // map A-Z to a-z
 		if (ch < 128) keyIsDown[ch] = false;
 	}
 
 	private function clearKeyDownArray():void {
 		for (var i:int = 0; i < 128; i++) keyIsDown[i] = false;
 	}
 
-	// Get an ASCII value for the key pressed:
-	// - Latin letters will be normalized to lower-case
-	// - Arrows will be mapped to ASCII/Unicode delimiters (this is a traditional hack in Scratch 2.0; see mapArrowKey)
-	private static function getCharCode(evt:KeyboardEvent):int {
-		var arrowCode:int = mapArrowKey(evt.keyCode);
-		if (arrowCode) return arrowCode;
-		return String.fromCharCode(evt.keyCode).toLowerCase().charCodeAt(0);
-	}
-
-	// Map key codes for arrow keys to ASCII delimiters, and other key codes to zero.
-	// See https://en.wikipedia.org/wiki/Delimiter#ASCII_delimited_text
-	private static function mapArrowKey(keyCode:int):int {
-		if (keyCode == Keyboard.LEFT) return 28; // file separator
-		if (keyCode == Keyboard.UP) return 30; // group separator
-		if (keyCode == Keyboard.RIGHT) return 29; // record separator
-		if (keyCode == Keyboard.DOWN) return 31; // unit separator
+	private function mapArrowKey(keyCode:int):int {
+		// map key codes for arrow keys to ASCII, other key codes to zero
+		if (keyCode == 37) return 28;
+		if (keyCode == 38) return 30;
+		if (keyCode == 39) return 29;
+		if (keyCode == 40) return 31;
 		return 0;
 	}
 
