libretro/Mesen
1
0
Fork 0
mirror of https://github.com/libretro/Mesen.git synced 2025-02-22 01:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Debugger: Allow Lua scripts to be loaded from the command line

Browse Source
This commit is contained in:
Sour 2018-03-25 13:34:51 -04:00
parent aaecfc6ba5
commit 9be9a57565
3 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GUI.NET/Debugger/DebugWindowManager.cs
View File

@ -55,12 +55,13 @@ namespace Mesen.GUI.Debugger
frm.ShowAddress(address, usePrgRom);
}
public static void OpenScriptWindow(bool forceBlank)
public static frmScript OpenScriptWindow(bool forceBlank)
{
frmScript frm = new frmScript(forceBlank);
_openedWindows.Add(frm);
frm.FormClosed += Debugger_FormClosed;
frm.Show();
return frm;
}
public static frmDebugger GetDebugger()

2
GUI.NET/Debugger/frmScript.cs
View File

@ -196,7 +196,7 @@ namespace Mesen.GUI.Debugger
return true;
}
private void LoadScriptFile(string filepath, bool runScript = true)
public void LoadScriptFile(string filepath, bool runScript = true)
{
if(File.Exists(filepath)) {
if(!SavePrompt()) {

68
GUI.NET/Forms/frmMain.cs
View File

@ -8,6 +8,7 @@ using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
@ -31,8 +32,9 @@ namespace Mesen.GUI.Forms
private frmCheatList _cheatListWindow;
private frmHdPackEditor _hdPackEditorWindow;
private ResourcePath? _currentRomPath = null;
private Image _pauseButton = Mesen.GUI.Properties.Resources.Pause;
private Image _playButton = Mesen.GUI.Properties.Resources.Play;
List<string> _luaScriptsToLoad = new List<string>();
private Image _pauseButton = Resources.Pause;
private Image _playButton = Resources.Play;
private string _currentGame = null;
private bool _customSize = false;
private double? _switchOptionScale = null;
@ -119,23 +121,58 @@ namespace Mesen.GUI.Forms
public void LoadGameFromCommandLine(List<string> switches)
{
foreach(string arg in switches) {
if(arg != null) {
string path = arg;
Func<string, bool, string> getValidPath = (string path, bool forLua) => {
path = path.Trim();
if(path.ToLower().EndsWith(".lua") == forLua) {
try {
if(File.Exists(path)) {
this.LoadFile(path);
break;
}
//Try loading file as a relative path to the folder Mesen was started from
path = Path.Combine(Program.OriginalFolder, path);
if(File.Exists(path)) {
this.LoadFile(path);
break;
if(!File.Exists(path)) {
//Try loading file as a relative path to the folder Mesen was started from
path = Path.Combine(Program.OriginalFolder, path);
}
return path;
} catch { }
}
return null;
};
//Check if any Lua scripts were specified
_luaScriptsToLoad = new List<string>();
foreach(string arg in switches) {
string path = getValidPath(arg, true);
if(path != null) {
_luaScriptsToLoad.Add(path);
}
}
bool fileLoaded = false;
foreach(string arg in switches) {
string path = getValidPath(arg, false);
if(path != null) {
this.LoadFile(path);
fileLoaded = true;
break;
}
}
if(!fileLoaded) {
if(_emuThread == null) {
//When no ROM is loaded, only process Lua scripts if a ROM was specified as a command line param
_luaScriptsToLoad.Clear();
} else {
//No game was specified, but a game is running already, load the scripts right away
LoadLuaScripts();
}
}
}
private void LoadLuaScripts()
{
if(_luaScriptsToLoad.Count > 0) {
foreach(string luaScript in _luaScriptsToLoad) {
frmScript scriptWindow = DebugWindowManager.OpenScriptWindow(true);
scriptWindow.LoadScriptFile(luaScript);
}
_luaScriptsToLoad.Clear();
}
}
@ -521,6 +558,7 @@ namespace Mesen.GUI.Forms
this.StartEmuThread();
this.BeginInvoke((MethodInvoker)(() => {
UpdateViewerSize();
LoadLuaScripts();
}));
Task.Run(() => {