18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-19 06:26:01 +01:00

Lua script screens beside the WebAssembly ones

This commit is contained in:
2026-11-10 15:29:25 +01:00
parent a73585dca0
commit c4924f756d
34 changed files with 3777 additions and 1635 deletions

View File

@@ -76,6 +76,10 @@ void global_settings::FinalizeConfig()
wasm_enabled = false;
#endif
#ifndef WITH_LUA
luascreens_enabled = false;
#endif
#ifdef _WIN32
Console::ModeSet(iFeedbackMode, iFeedbackPort);
#endif
@@ -881,23 +885,30 @@ bool global_settings::ConfigParseUI(cParser& Parser, const std::string& token)
return false;
}
bool global_settings::ConfigParseWasm(cParser& Parser, std::string_view const token)
bool global_settings::ConfigParseScriptScreens(cParser& Parser, std::string_view const token)
{
if (token == "luascreens.enabled")
{
ParseOne(Parser, luascreens_enabled, 1);
return true;
}
if (token == "wasm.enabled")
{
ParseOne(Parser, wasm_enabled, 1);
return true;
}
if (token == "wasm.cabframes")
// wasm.cabframes and wasm.externalframes: the first names of the keys, from before the Lua screens
if (token == "screens.cabframes" || token == "wasm.cabframes")
{
ParseOneClamped(Parser, wasm_cabframes, 1, 1000);
ParseOneClamped(Parser, screens_cabframes, 1, 1000);
return true;
}
if (token == "wasm.externalframes")
if (token == "screens.externalframes" || token == "wasm.externalframes")
{
ParseOneClamped(Parser, wasm_externalframes, 1, 1000);
ParseOneClamped(Parser, screens_externalframes, 1, 1000);
return true;
}
@@ -1400,7 +1411,7 @@ void global_settings::ConfigParse(cParser& Parser)
if (ConfigParsePython(Parser, token))
continue;
if (ConfigParseWasm(Parser, token))
if (ConfigParseScriptScreens(Parser, token))
continue;
if (ConfigParseNetwork(Parser, token))
@@ -1870,9 +1881,10 @@ global_settings::export_as_text( std::ostream &Output ) const {
export_as_text( Output, "python.threadedupload", python_threadedupload );
export_as_text( Output, "python.uploadmain", python_uploadmain );
export_as_text( Output, "python.mipmaps", python_mipmaps );
export_as_text( Output, "luascreens.enabled", luascreens_enabled );
export_as_text( Output, "wasm.enabled", wasm_enabled );
export_as_text( Output, "wasm.cabframes", wasm_cabframes );
export_as_text( Output, "wasm.externalframes", wasm_externalframes );
export_as_text( Output, "screens.cabframes", screens_cabframes );
export_as_text( Output, "screens.externalframes", screens_externalframes );
export_as_text( Output, "async.trainThreads", trainThreads );
for( auto const &server : network_servers ) {
Output