Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added a workaround for MacOS causing LUA crash with OpenComputers

Browse source 
The rootcause probably lies in LWJGL. OC isn't protected against it and won't be fixed, consequently we now have a wrapper to prevent the crash.
This commit is contained in:
LemADEC 2020-07-09 20:25:22 +02:00
parent 9581a691d6
commit 6a416420eb
3 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/resources/assets/warpdrive/lua.ComputerCraft/common/warpdriveCommons
View file

@ -421,6 +421,17 @@ local function format_address(value)
return str
end
local function format_charNumber(value)
if value ~= nil
and type(value) == "number"
and value <= 255
and value >= 0 then
return string.char(value)
else
return string.char(0)
end
end
----------- Input controls
local function input_readInteger(currentValue)
@ -1304,6 +1315,7 @@ w = {
format_boolean = format_boolean,
format_string = format_string,
format_address = format_address,
format_charNumber = format_charNumber,
input_readInteger = input_readInteger,
input_readText = input_readText,
input_readConfirmation = input_readConfirmation,

22
src/main/resources/assets/warpdrive/lua.OpenComputers/common/usr/lib/warpdriveCommons.lua
View file

@ -427,6 +427,17 @@ local function format_address(value)
return str
end
local function format_charNumber(value)
if value ~= nil
and type(value) == "number"
and value <= 65535
and value >= 0 then
return unicode.char(value)
else
return string.char(0)
end
end
----------- Input controls
local function input_readInteger(currentValue)
@ -453,7 +464,7 @@ local function input_readInteger(currentValue)
local firstParam = params[3]
if firstParam == nil then firstParam = "none" end
if eventName == "key_down" then
local character = string.char(params[3])
local character = format_charNumber(params[3])
local keycode = params[4]
if keycode >= 2 and keycode <= 10 then -- 1 to 9
@ -558,7 +569,7 @@ local function input_readText(currentValue)
local firstParam = params[3]
if firstParam == nil then firstParam = "none" end
if eventName == "key_down" then
local character = string.char(params[3])
local character = format_charNumber(params[3])
local keycode = params[4]
if keycode == 14 then -- Backspace
@ -616,7 +627,7 @@ local function input_readConfirmation(message)
local firstParam = params[3]
if firstParam == nil then firstParam = "none" end
if eventName == "key_down" then
local character = string.char(params[3])
local character = format_charNumber(params[3])
local keycode = params[4]
if keycode == 28 then -- Return or Enter
@ -699,7 +710,7 @@ local function input_readEnum(currentValue, list, toValue, toDescription, noValu
local firstParam = params[3]
if firstParam == nil then firstParam = "none" end
if eventName == "key_down" then
local character = string.char(params[3])
local character = format_charNumber(params[3])
local keycode = params[4]
if keycode == 14 or keycode == 211 then -- Backspace or Delete
@ -1156,7 +1167,7 @@ local function run()
-- w.sleep(0.2)
if eventName == "key_down" then
local character = string.char(params[3])
local character = format_charNumber(params[3])
local keycode = params[4]
ignoreNextChar = false
@ -1285,6 +1296,7 @@ w = {
format_boolean = format_boolean,
format_string = format_string,
format_address = format_address,
format_charNumber = format_charNumber,
input_readInteger = input_readInteger,
input_readText = input_readText,
input_readConfirmation = input_readConfirmation,

2
src/main/resources/assets/warpdrive/lua.OpenComputers/warpdriveShipController/startup
View file

@ -316,7 +316,7 @@ function ship_page_setRotation()
local firstParam = params[3]
if firstParam == nil then firstParam = "none" end
if eventName == "key_down" then
local character = string.char(params[3])
local character = w.format_charNumber(params[3])
local keycode = params[4]
if keycode == 200 then