more emulator features, sub # instr

emulator/keycodes.lua

@@ -1,18 +1,19 @@
--- These are the keycodes provided by the keyboard peripheral to the CPU within the emulator.
+
 -- copied from Brick_LuaLogic/bricks/input/keyboard-global.lua
+-- with some key names changed from Torque format to LOVE format.
 
 return {
 	["backspace"]     = 8,
 	["tab"]           = 9,
 	["return"]        = 13,
 	
-	["lshift"]        = 16,
-	["lcontrol"]      = 17,
+	["lshift"]        = 16, -- 0x10
+	["lctrl"]         = 17, --["lcontrol"]      = 17,
 	["lalt"]          = 18,
 	
 	-- this block does not match vkey codes
-	["rshift"]        = 20,
-	["rcontrol"]      = 21,
+	["rshift"]        = 20, -- 0x14
+	["rctrl"]         = 21, --["rcontrol"]      = 21,
 	["ralt"]          = 22,
 	
 	-- this block does not match vkey codes
@@ -20,6 +21,7 @@ return {
 	["="]             = 25,
 	[","]             = 26,
 	["."]             = 27,
+	["-"]             = 28, -- not in bl
 	["/"]             = 29,
 	["`"]             = 30,
 	
@@ -50,7 +52,7 @@ return {
 	["["]             = 60,
 	["\\"]            = 61,
 	["]"]             = 62,
-	["apostrophe"]    = 63,
+	["\'"]            = 63, --["apostrophe"]    = 63,
 	
 	["a"]             = 65,
 	["b"]             = 66,
@@ -79,22 +81,22 @@ return {
 	["y"]             = 89,
 	["z"]             = 90,
 	
-	["numpad0"]       = 96,
-	["numpad1"]       = 97,
-	["numpad2"]       = 98,
-	["numpad3"]       = 99,
-	["numpad4"]       = 100,
-	["numpad5"]       = 101,
-	["numpad6"]       = 102,
-	["numpad7"]       = 103,
-	["numpad8"]       = 104,
-	["numpad9"]       = 105,
-	["*"]             = 106,
-	["+"]             = 107,
-	["numpadenter"]   = 108,
-	["minus"]         = 109,
-	["numpaddecimal"] = 110,
-	--["/"]             = 111, -- already 29
+	["kp0"]           = 96,  --["numpad0"]       = 96,
+	["kp1"]           = 97,  --["numpad1"]       = 97,
+	["kp2"]           = 98,  --["numpad2"]       = 98,
+	["kp3"]           = 99,  --["numpad3"]       = 99,
+	["kp4"]           = 100, --["numpad4"]       = 100,
+	["kp5"]           = 101, --["numpad5"]       = 101,
+	["kp6"]           = 102, --["numpad6"]       = 102,
+	["kp7"]           = 103, --["numpad7"]       = 103,
+	["kp8"]           = 104, --["numpad8"]       = 104,
+	["kp9"]           = 105, --["numpad9"]       = 105,
+	["kp*"]           = 106, --["*"]             = 106,
+	["kp+"]           = 107, --["+"]             = 107,
+	["kpenter"]       = 108, --["numpadenter"]   = 108,
+	["kp-"]           = 109, --["minus"]         = 109,
+	["kp."]           = 110, --["numpaddecimal"] = 110,
+	["kp/"]           = 111, --["/"]             = 111,
 	
 	["f1"]            = 112,
 	["f2"]            = 113,
@@ -109,5 +111,5 @@ return {
 	["f11"]           = 122,
 	["f12"]           = 123,
 	
-	["invalid"]       = 127,
+	--["invalid"]       = 127,
 }