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

Lua - Added an input box to the script console for on-the-fly command input 

Set ImageScaling to None for all buttons in the toolbar in order to fix scaling issues
This commit is contained in:
christoph.boehmwalder 2015-01-02 19:36:32 +00:00
parent e54693fedb
commit e11811e2f8
4 changed files with 811 additions and 688 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
View File

@ -78,6 +78,11 @@ namespace BizHawk.Client.EmuHawk
// Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable
private static void LogWithSeparator(string separator, string terminator, params object[] outputs)
{
if(outputs == null)
{
GlobalWin.Tools.LuaConsole.WriteToOutputWindow("NULL");
return;
}
for (var outIndex = 0; outIndex < outputs.Length; outIndex++)
{
var output = outputs[outIndex];

9
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
View File

@ -7,6 +7,7 @@ using LuaInterface;
using System.Reflection;
using System.Collections.Generic;
using BizHawk.Emulation.Common;
using System.IO;
namespace BizHawk.Client.EmuHawk
{
@ -142,11 +143,17 @@ namespace BizHawk.Client.EmuHawk
public Lua SpawnCoroutine(string file)
{
var lua = _lua.NewThread();
var main = lua.LoadFile(PathManager.MakeAbsolutePath(file, null));
var main = lua.LoadString(File.ReadAllText(file), "main");
lua.Push(main); // push main function on to stack for subsequent resuming
return lua;
}
public void ExecuteString(string command)
{
_currThread = _lua.NewThread();
_currThread.DoString(command);
}
public ResumeResult ResumeScript(Lua script)
{
EventsLibrary.CurrentThread = script;

1402
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

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

@ -23,6 +23,9 @@ namespace BizHawk.Client.EmuHawk
private bool _sortReverse;
private string _lastColumnSorted;
private List<string> _consoleCommandHistory = new List<string>();
private int _consoleCommandHistoryIndex = -1;
public LuaConsole()
{
_sortReverse = false;
@ -51,6 +54,9 @@ namespace BizHawk.Client.EmuHawk
LuaListView.QueryItemText += LuaListView_QueryItemText;
LuaListView.QueryItemBkColor += LuaListView_QueryItemBkColor;
LuaListView.VirtualMode = true;
InputBox.AutoCompleteCustomSource.AddRange(LuaImp.Docs.Select(a=> a.Library + "."+ a.Name).ToArray());
InputBox.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
}
public EmuLuaLibrary LuaImp { get; set; }
@ -110,9 +116,11 @@ namespace BizHawk.Client.EmuHawk
if (LuaAlreadyInSession(processedPath) == false)
{
var luaFile = new LuaFile(string.Empty, processedPath);
_luaList.Add(luaFile);
LuaListView.ItemCount = _luaList.Count;
Global.Config.RecentLua.Add(processedPath);
if (!Global.Config.DisableLuaScriptsOnLoad)
{
@ -123,7 +131,7 @@ namespace BizHawk.Client.EmuHawk
}
catch (Exception e)
{
if (e.ToString().Substring(0, 32) == "LuaInterface.LuaScriptException:")
if (e.GetType() == typeof(LuaInterface.LuaScriptException))
{
luaFile.Enabled = false;
ConsoleLog(e.Message);
@ -175,7 +183,7 @@ namespace BizHawk.Client.EmuHawk
}
catch (Exception e)
{
if (e.ToString().Substring(0, 32) == "LuaInterface.LuaScriptException:")
if (e is LuaScriptException)
{
file.Enabled = false;
ConsoleLog(e.Message);
@ -380,7 +388,7 @@ namespace BizHawk.Client.EmuHawk
}
}
}
catch (Exception ex)
catch (Exception ex) // TODO: it would be better to only catch LuaScriptException and LuaException and rethrow the generic ones
{
if (ex is LuaScriptException || ex is LuaException)
{
@ -682,7 +690,7 @@ namespace BizHawk.Client.EmuHawk
}
catch (Exception ex)
{
if (ex.ToString().Substring(0, 32) == "LuaInterface.LuaScriptException:")
if (ex is LuaScriptException)
{
item.Enabled = false;
ConsoleLog(ex.Message);
@ -934,7 +942,7 @@ namespace BizHawk.Client.EmuHawk
#endregion
#region Dialog, Listview, OutputBox
#region Dialog, Listview, OutputBox, InputBox
private void LuaConsole_DragDrop(object sender, DragEventArgs e)
{
@ -960,7 +968,7 @@ namespace BizHawk.Client.EmuHawk
}
catch (Exception ex)
{
if (ex.ToString().Substring(0, 32) == "LuaInterface.LuaScriptException:" || ex.ToString().Substring(0, 26) == "LuaInterface.LuaException:")
if (ex is LuaScriptException || ex is LuaException)
{
ConsoleLog(ex.Message);
}
@ -1072,6 +1080,69 @@ namespace BizHawk.Client.EmuHawk
ToggleScriptMenuItem_Click(sender, e);
}
private void InputBox_KeyDown(object sender, KeyEventArgs e)
{
if(e.KeyCode == Keys.Enter)
{
string consoleBeforeCall = OutputBox.Text;
// TODO: Maybe make these try-catches more general
if (InputBox.Text != "")
{
try
{
LuaImp.ExecuteString(InputBox.Text);
// TODO: This isn't exactly optimal
if (OutputBox.Text == consoleBeforeCall)
ConsoleLog("Command successfully executed");
}
catch (LuaScriptException ex)
{
ConsoleLog(ex.ToString());
}
_consoleCommandHistory.Insert(0, InputBox.Text);
_consoleCommandHistoryIndex = -1;
InputBox.Clear();
}
}
else if(e.KeyCode == Keys.Up)
{
if (_consoleCommandHistoryIndex < _consoleCommandHistory.Count-1)
{
_consoleCommandHistoryIndex++;
InputBox.Text = _consoleCommandHistory[_consoleCommandHistoryIndex];
InputBox.Select(InputBox.Text.Length, 0);
}
e.Handled = true;
}
else if(e.KeyCode == Keys.Down)
{
if (_consoleCommandHistoryIndex == 0)
{
_consoleCommandHistoryIndex--;
InputBox.Text = "";
}
else if (_consoleCommandHistoryIndex > 0)
{
_consoleCommandHistoryIndex--;
InputBox.Text = _consoleCommandHistory[_consoleCommandHistoryIndex];
InputBox.Select(InputBox.Text.Length, 0);
}
e.Handled = true;
}
else if(e.KeyCode == Keys.Tab)
{
this.ProcessTabKey(false);
e.Handled = true;
}
}
protected override bool ProcessTabKey(bool forward)
{
// TODO: Make me less dirty (please)
return false;
}
#endregion
private void EraseToolbarItem_Click(object sender, EventArgs e)