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

updated arg parser

This commit is contained in:
Ashafix 2017-07-17 01:28:22 +02:00
parent a5ea733269
commit a71255b4b2
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.EmuHawk/ArgParser.cs
View File

@ -20,6 +20,7 @@ namespace BizHawk.Client.EmuHawk
public HashSet<int> _currAviWriterFrameList;
public int _autoDumpLength;
public bool _autoCloseOnDump = false;
// chrome is never shown, even in windowed mode
public bool _chromeless = false;
public bool startFullscreen = false;
public string luaScript = null;

2
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -2430,7 +2430,7 @@ namespace BizHawk.Client.EmuHawk
showMenuVisible = true; // need to always be able to restore this as an emergency measure
}
if (_chromeless)
if (argParse._chromeless)
{
showMenuVisible = true; // I decided this was always possible in chromeless mode, we'll see what they think
}

48
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -153,7 +153,6 @@ namespace BizHawk.Client.EmuHawk
}
};
ArgParser argParse = new ArgParser();
argParse.parseArguments(args);
Database.LoadDatabase(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "gamedb.txt"));
@ -299,9 +298,9 @@ namespace BizHawk.Client.EmuHawk
Global.MovieSession.ReadOnly = true;
// if user is dumping and didnt supply dump length, make it as long as the loaded movie
if (_autoDumpLength == 0)
if (argParse._autoDumpLength == 0)
{
_autoDumpLength = movie.InputLogLength;
argParse._autoDumpLength = movie.InputLogLength;
}
// Copy pasta from drag & drop
@ -374,6 +373,16 @@ namespace BizHawk.Client.EmuHawk
LoadQuickSave("QuickSave" + Global.Config.SaveSlot);
}
}
//start Lua Console if requested in the command line arguments
if (luaConsole)
{
GlobalWin.Tools.Load<LuaConsole>();
}
//load Lua Script if requested in the command line arguments
if (luaScript != null)
{
GlobalWin.Tools.LuaConsole.LoadLuaFile(luaScript);
}
//start Lua Console if requested in the command line arguments
if (argParse.luaConsole)
@ -1022,15 +1031,15 @@ namespace BizHawk.Client.EmuHawk
{
// TODO - maybe apply a hack tracked during fullscreen here to override it
FormBorderStyle = FormBorderStyle.None;
MainMenuStrip.Visible = Global.Config.DispChrome_MenuFullscreen && !_chromeless;
MainStatusBar.Visible = Global.Config.DispChrome_StatusBarFullscreen && !_chromeless;
MainMenuStrip.Visible = Global.Config.DispChrome_MenuFullscreen && !argParse._chromeless;
MainStatusBar.Visible = Global.Config.DispChrome_StatusBarFullscreen && !argParse._chromeless;
}
else
{
MainStatusBar.Visible = Global.Config.DispChrome_StatusBarWindowed && !_chromeless;
MainMenuStrip.Visible = Global.Config.DispChrome_MenuWindowed && !_chromeless;
MaximizeBox = MinimizeBox = Global.Config.DispChrome_CaptionWindowed && !_chromeless;
if (Global.Config.DispChrome_FrameWindowed == 0 || _chromeless)
MainStatusBar.Visible = Global.Config.DispChrome_StatusBarWindowed && !argParse._chromeless;
MainMenuStrip.Visible = Global.Config.DispChrome_MenuWindowed && !argParse._chromeless;
MaximizeBox = MinimizeBox = Global.Config.DispChrome_CaptionWindowed && !argParse._chromeless;
if (Global.Config.DispChrome_FrameWindowed == 0 || argParse._chromeless)
{
FormBorderStyle = FormBorderStyle.None;
}
@ -1356,7 +1365,6 @@ namespace BizHawk.Client.EmuHawk
// AVI/WAV state
private IVideoWriter _currAviWriter;
private readonly HashSet<int> _currAviWriterFrameList;
private AutofireController _autofireNullControls;
@ -1399,13 +1407,9 @@ namespace BizHawk.Client.EmuHawk
private Point _windowedLocation;
private bool _needsFullscreenOnLoad;
private int _autoDumpLength;
private readonly bool _autoCloseOnDump;
private int _lastOpenRomFilter;
// chrome is never shown, even in windowed mode
private readonly bool _chromeless;
private ArgParser argParse = new ArgParser();
// Resources
private Bitmap _statusBarDiskLightOnImage;
private Bitmap _statusBarDiskLightOffImage;
@ -1472,7 +1476,7 @@ namespace BizHawk.Client.EmuHawk
}
}
if (!Global.Config.DispChrome_CaptionWindowed || _chromeless)
if (!Global.Config.DispChrome_CaptionWindowed || argParse._chromeless)
{
str = "";
}
@ -3272,9 +3276,9 @@ namespace BizHawk.Client.EmuHawk
try
{
// is this the best time to handle this? or deeper inside?
if (_currAviWriterFrameList != null)
if (argParse._currAviWriterFrameList != null)
{
if (!_currAviWriterFrameList.Contains(Emulator.Frame))
if (!argParse._currAviWriterFrameList.Contains(Emulator.Frame))
{
goto HANDLE_AUTODUMP;
}
@ -3357,13 +3361,13 @@ namespace BizHawk.Client.EmuHawk
}
HANDLE_AUTODUMP:
if (_autoDumpLength > 0)
if (argParse._autoDumpLength > 0)
{
_autoDumpLength--;
if (_autoDumpLength == 0) // finish
argParse._autoDumpLength--;
if (argParse._autoDumpLength == 0) // finish
{
StopAv();
if (_autoCloseOnDump)
if (argParse._autoCloseOnDump)
{
_exit = true;
}