ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lua console - put a cap on number of messages that can hit the console window in a give pass through lua scripts, set it arbitrarily at 50, fixes #376

This commit is contained in:
adelikat 2019-11-16 14:56:17 -06:00
parent eb1d87933b
commit c9f7838833
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -97,7 +97,7 @@ namespace BizHawk.Client.EmuHawk
LuaListView.QueryItemIcon += LuaListView_QueryItemImage;
// this is bad, in case we ever have more than one gui part running lua.. not sure how much other badness there is like that
LuaSandbox.DefaultLogger = ConsoleLog;
LuaSandbox.DefaultLogger = WriteToOutputWindow;
}
public PlatformEmuLuaLibrary LuaImp { get; private set; }
@ -120,14 +120,6 @@ namespace BizHawk.Client.EmuHawk
// Do nothing
}
private void ConsoleLog(string message)
{
OutputBox.Text += message + Environment.NewLine + Environment.NewLine;
OutputBox.SelectionStart = OutputBox.Text.Length;
OutputBox.ScrollToCaret();
UpdateDialog();
}
private void LuaConsole_Load(object sender, EventArgs e)
{
// Hack for previous config settings
@ -160,7 +152,7 @@ namespace BizHawk.Client.EmuHawk
OpenScriptMenuItem.Enabled = false;
NewScriptToolbarItem.Enabled = false;
OpenScriptToolbarItem.Enabled = false;
ConsoleLog("The Lua environment can currently only be created on Windows. You may not load scripts.");
WriteToOutputWindow("The Lua environment can currently only be created on Windows. You may not load scripts.");
}
LuaListView.AllColumns.Clear();
@ -490,6 +482,8 @@ namespace BizHawk.Client.EmuHawk
return LuaImp.ScriptList.Any(t => path == t.Path);
}
private int _messageCount;
private const int MaxCount = 50;
public void WriteToOutputWindow(string message)
{
if (!OutputBox.IsHandleCreated || OutputBox.IsDisposed)
@ -499,9 +493,15 @@ namespace BizHawk.Client.EmuHawk
OutputBox.Invoke(() =>
{
OutputBox.Text += message;
OutputBox.SelectionStart = OutputBox.Text.Length;
OutputBox.ScrollToCaret();
_messageCount++;
if (_messageCount <= MaxCount)
{
OutputBox.Text += message;
OutputBox.SelectionStart = OutputBox.Text.Length;
OutputBox.ScrollToCaret();
}
});
}
@ -603,6 +603,8 @@ namespace BizHawk.Client.EmuHawk
MessageBox.Show(ex.ToString());
}
}
_messageCount = 0;
}
private FileInfo GetSaveFileFromUser()
@ -890,7 +892,7 @@ namespace BizHawk.Client.EmuHawk
}
catch (IOException)
{
ConsoleLog($"Unable to access file {item.Path}");
WriteToOutputWindow($"Unable to access file {item.Path}");
}
catch (Exception ex)
{
@ -1357,7 +1359,7 @@ namespace BizHawk.Client.EmuHawk
{
if (InputBox.Text.Contains("emu.frameadvance("))
{
ConsoleLog("emu.frameadvance() can not be called from the console");
WriteToOutputWindow("emu.frameadvance() can not be called from the console");
return;
}
@ -1372,7 +1374,7 @@ namespace BizHawk.Client.EmuHawk
if (OutputBox.Text == consoleBeforeCall)
{
ConsoleLog("Command successfully executed");
WriteToOutputWindow("Command successfully executed");
}
});
});