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

Merge remote-tracking branch 'refs/remotes/TASVideos/master' into NewrRelease

This commit is contained in:
Hathor86 2015-10-11 19:40:46 +02:00
parent 29e4c1753f daed8bb3cf
commit 8f123527e8
386 changed files with 23113 additions and 17590 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
BizHawk.Client.Common/BinarySaveStates.cs
View File

@ -2,80 +2,133 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using ICSharpCode.SharpZipLib.Zip;
//using Ionic.Zip;
namespace BizHawk.Client.Common
{
public enum BinaryStateLump
public class BinaryStateLump
{
Versiontag,
Corestate,
Framebuffer,
Input,
CorestateText,
[Name("BizState 1", "0")]
public static BinaryStateLump Versiontag { get; private set; }
[Name("Core", "bin")]
public static BinaryStateLump Corestate { get; private set; }
[Name("Framebuffer", "bmp")]
public static BinaryStateLump Framebuffer { get; private set; }
[Name("Input Log", "txt")]
public static BinaryStateLump Input { get; private set; }
[Name("CoreText", "txt")]
public static BinaryStateLump CorestateText { get; private set; }
[Name("MovieSaveRam", "bin")]
public static BinaryStateLump MovieSaveRam { get; private set; }
// Only for movies they probably shoudln't be leaching this stuff
Movieheader,
Comments,
Subtitles,
SyncSettings,
[Name("Header", "txt")]
public static BinaryStateLump Movieheader { get; private set; }
[Name("Comments", "txt")]
public static BinaryStateLump Comments { get; private set; }
[Name("Subtitles", "txt")]
public static BinaryStateLump Subtitles { get; private set; }
[Name("SyncSettings", "json")]
public static BinaryStateLump SyncSettings { get; private set; }
// TasMovie
LagLog,
StateHistory,
StateHistorySettings,
Markers,
ClientSettings,
VerificationLog,
[Name("LagLog")]
public static BinaryStateLump LagLog { get; private set; }
[Name("GreenZone")]
public static BinaryStateLump StateHistory { get; private set; }
[Name("GreenZoneSettings", "txt")]
public static BinaryStateLump StateHistorySettings { get; private set; }
[Name("Markers", "txt")]
public static BinaryStateLump Markers { get; private set; }
[Name("ClientSettings", "json")]
public static BinaryStateLump ClientSettings { get; private set; }
[Name("VerificationLog", "txt")]
public static BinaryStateLump VerificationLog { get; private set; }
UserData
[Name("UserData", "txt")]
public static BinaryStateLump UserData { get; private set; }
// branchstuff
[Name("Branches\\CoreData", "bin")]
public static BinaryStateLump BranchCoreData { get; private set; }
[Name("Branches\\InputLog", "txt")]
public static BinaryStateLump BranchInputLog { get; private set; }
[Name("Branches\\FrameBuffer", "bmp")]
public static BinaryStateLump BranchFrameBuffer { get; private set; }
[Name("Branches\\LagLog", "bin")]
public static BinaryStateLump BranchLagLog { get; private set; }
[Name("Branches\\Header", "json")]
public static BinaryStateLump BranchHeader { get; private set; }
[Name("Branches\\Markers", "txt")]
public static BinaryStateLump BranchMarkers { get; private set; }
[AttributeUsage(AttributeTargets.Property)]
private class NameAttribute : Attribute
{
public string Name { get; private set; }
public string Ext { get; private set; }
public NameAttribute(string name)
{
Name = name;
}
public NameAttribute(string name, string ext)
{
Name = name;
Ext = ext;
}
}
public virtual string ReadName { get { return Name; } }
public virtual string WriteName { get { return Ext != null ? Name + '.' + Ext : Name; } }
public string Name { get; protected set; }
public string Ext { get; protected set; }
private BinaryStateLump(string name, string ext)
{
Name = name;
Ext = ext;
}
protected BinaryStateLump() { }
static BinaryStateLump()
{
foreach (var prop in typeof(BinaryStateLump).GetProperties(BindingFlags.Public | BindingFlags.Static))
{
var attr = prop.GetCustomAttributes(false).OfType<NameAttribute>().Single();
object value = new BinaryStateLump(attr.Name, attr.Ext);
prop.SetValue(null, value, null);
}
}
}
public static class BinaryStateFileNames
/// <summary>
/// describes a BinaryStateLump virtual name that has a numerical index
/// </summary>
public class IndexedStateLump : BinaryStateLump
{
private static readonly Dictionary<BinaryStateLump, string> ReadNames;
private static readonly Dictionary<BinaryStateLump, string> WriteNames;
static void AddLumpName(BinaryStateLump token, string name)
private BinaryStateLump _root;
private int _idx;
public IndexedStateLump(BinaryStateLump root)
{
ReadNames[token] = Path.GetFileNameWithoutExtension(name);
WriteNames[token] = name;
}
static BinaryStateFileNames()
{
ReadNames = new Dictionary<BinaryStateLump, string>();
WriteNames = new Dictionary<BinaryStateLump, string>();
AddLumpName(BinaryStateLump.Versiontag, "BizState 1.0");
AddLumpName(BinaryStateLump.Corestate, "Core");
AddLumpName(BinaryStateLump.Framebuffer, "Framebuffer.bmp");
AddLumpName(BinaryStateLump.Input, "Input Log.txt");
AddLumpName(BinaryStateLump.CorestateText, "CoreText.txt");
AddLumpName(BinaryStateLump.Movieheader, "Header.txt");
// Only for movies they probably shoudln't be leaching this stuff
AddLumpName(BinaryStateLump.Comments, "Comments.txt");
AddLumpName(BinaryStateLump.Subtitles, "Subtitles.txt");
AddLumpName(BinaryStateLump.SyncSettings, "SyncSettings.json");
// TasMovie
AddLumpName(BinaryStateLump.LagLog, "LagLog");
AddLumpName(BinaryStateLump.StateHistory, "GreenZone");
AddLumpName(BinaryStateLump.StateHistorySettings, "GreenZoneSettings.txt");
AddLumpName(BinaryStateLump.Markers, "Markers.txt");
AddLumpName(BinaryStateLump.ClientSettings, "ClientSettings.json");
AddLumpName(BinaryStateLump.VerificationLog, "VerificationLog.txt");
AddLumpName(BinaryStateLump.UserData, "UserData.txt");
_root = root;
Ext = _root.Ext;
Calc();
}
public static string GetReadName(BinaryStateLump lump)
private void Calc()
{
return ReadNames[lump];
Name = _root.Name + _idx;
}
public static string GetWriteName(BinaryStateLump lump)
public void Increment()
{
return WriteNames[lump];
_idx++;
Calc();
}
}
@ -132,7 +185,14 @@ namespace BizHawk.Client.Common
_entriesbyname = new Dictionary<string, ZipEntry>();
foreach (ZipEntry z in _zip)
{
_entriesbyname.Add(Path.GetFileNameWithoutExtension(z.Name), z);
string name = z.Name;
int i;
if ((i = name.LastIndexOf('.')) != -1)
{
name = name.Substring(0, i);
}
_entriesbyname.Add(name.Replace('/', '\\'), z);
}
}
@ -167,11 +227,11 @@ namespace BizHawk.Client.Common
}
}
[Obsolete]
public bool HasLump(BinaryStateLump lump)
{
string name = BinaryStateFileNames.GetReadName(lump);
ZipEntry e;
return _entriesbyname.TryGetValue(name, out e);
return _entriesbyname.TryGetValue(lump.ReadName, out e);
}
/// <summary>
@ -183,9 +243,8 @@ namespace BizHawk.Client.Common
/// <returns>true if callback was called and stream was loaded</returns>
public bool GetLump(BinaryStateLump lump, bool abort, Action<Stream, long> callback)
{
string name = BinaryStateFileNames.GetReadName(lump);
ZipEntry e;
if (_entriesbyname.TryGetValue(name, out e))
if (_entriesbyname.TryGetValue(lump.ReadName, out e))
{
using (var zs = _zip.GetInputStream(e))
{
@ -197,7 +256,7 @@ namespace BizHawk.Client.Common
if (abort)
{
throw new Exception("Essential zip section not found: " + name);
throw new Exception("Essential zip section not found: " + lump.ReadName);
}
return false;
@ -277,8 +336,7 @@ namespace BizHawk.Client.Common
public void PutLump(BinaryStateLump lump, Action<Stream> callback)
{
var name = BinaryStateFileNames.GetWriteName(lump);
_zip.WriteItem(name, callback);
_zip.WriteItem(lump.WriteName, callback);
}
public void PutLump(BinaryStateLump lump, Action<BinaryWriter> callback)

112
BizHawk.Client.EmuHawk/AVOut/BitmapBufferVideoProvder.cs → BizHawk.Client.Common/BitmapBufferVideoProvider.cs
View File

@ -1,56 +1,56 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Drawing;
using BizHawk.Emulation.Common;
using BizHawk.Bizware.BizwareGL;
namespace BizHawk.Client.EmuHawk
{
public class BitmapBufferVideoProvider : IVideoProvider, IDisposable
{
BitmapBuffer bb;
public BitmapBufferVideoProvider(BitmapBuffer bb)
{
this.bb = bb;
}
public void Dispose()
{
if (bb != null) bb.Dispose();
bb = null;
}
public int[] GetVideoBuffer()
{
return bb.Pixels;
}
public int VirtualWidth
{
get { return bb.Width; }
}
public int VirtualHeight
{
get { return bb.Height; }
}
public int BufferWidth
{
get { return bb.Width; }
}
public int BufferHeight
{
get { return bb.Height; }
}
public int BackgroundColor
{
get { return 0; }
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Drawing;
using BizHawk.Emulation.Common;
using BizHawk.Bizware.BizwareGL;
namespace BizHawk.Client.Common
{
public class BitmapBufferVideoProvider : IVideoProvider, IDisposable
{
BitmapBuffer bb;
public BitmapBufferVideoProvider(BitmapBuffer bb)
{
this.bb = bb;
}
public void Dispose()
{
if (bb != null) bb.Dispose();
bb = null;
}
public int[] GetVideoBuffer()
{
return bb.Pixels;
}
public int VirtualWidth
{
get { return bb.Width; }
}
public int VirtualHeight
{
get { return bb.Height; }
}
public int BufferWidth
{
get { return bb.Width; }
}
public int BufferHeight
{
get { return bb.Height; }
}
public int BackgroundColor
{
get { return 0; }
}
}
}

8
BizHawk.Client.Common/BizHawk.Client.Common.csproj
View File

@ -103,6 +103,7 @@
<Compile Include="7z\SevenZipSfx.cs" />
<Compile Include="7z\StreamWrappers.cs" />
<Compile Include="BinarySaveStates.cs" />
<Compile Include="BitmapBufferVideoProvider.cs" />
<Compile Include="config\Binding.cs" />
<Compile Include="config\Config.cs" />
<Compile Include="config\ConfigService.cs" />
@ -133,6 +134,7 @@
<Compile Include="lua\EmuLuaLibrary.Joypad.cs" />
<Compile Include="lua\EmuLuaLibrary.MainMemory.cs" />
<Compile Include="lua\EmuLuaLibrary.Memory.cs" />
<Compile Include="lua\EmuLuaLibrary.MemorySavestate.cs" />
<Compile Include="lua\EmuLuaLibrary.Movie.cs" />
<Compile Include="lua\EmuLuaLibrary.NES.cs" />
<Compile Include="lua\EmuLuaLibrary.SNES.cs" />
@ -156,6 +158,8 @@
<Compile Include="movie\bk2\Bk2Movie.HeaderApi.cs">
<DependentUpon>Bk2Movie.cs</DependentUpon>
</Compile>
<Compile Include="movie\tasproj\StateManagerState.cs" />
<Compile Include="movie\tasproj\TasBranch.cs" />
<Compile Include="movie\tasproj\TasMovie.History.cs" />
<Compile Include="movie\bk2\Bk2Movie.InputLog.cs">
<DependentUpon>Bk2Movie.cs</DependentUpon>
@ -256,6 +260,10 @@
<Project>{5160CFB1-5389-47C1-B7F6-8A0DC97641EE}</Project>
<Name>BizHawk.Bizware.BizwareGL.OpenTK</Name>
</ProjectReference>
<ProjectReference Include="..\Bizware\BizHawk.Bizware.BizwareGL.SlimDX\BizHawk.Bizware.BizwareGL.SlimDX.csproj">
<Project>{E6B436B1-A3CD-4C9A-8F76-5D7154726884}</Project>
<Name>BizHawk.Bizware.BizwareGL.SlimDX</Name>
</ProjectReference>
<ProjectReference Include="..\Bizware\BizHawk.Bizware.BizwareGL\BizHawk.Bizware.BizwareGL.csproj">
<Project>{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}</Project>
<Name>BizHawk.Bizware.BizwareGL</Name>

16
BizHawk.Client.Common/GLManager.cs
View File

@ -35,7 +35,8 @@ namespace BizHawk.Client.Common
{
return new ContextRef
{
gc = gc
gc = gc,
gl = gc.IGL
};
}
@ -59,13 +60,24 @@ namespace BizHawk.Client.Common
public void Activate(ContextRef cr)
{
bool begun = false;
//this needs a begin signal to set the swap chain to the next backbuffer
if (cr.gl is BizHawk.Bizware.BizwareGL.Drivers.SlimDX.IGL_SlimDX9)
{
cr.gc.Begin();
begun = true;
}
if (cr == ActiveContext)
return;
ActiveContext = cr;
if (cr.gc != null)
{
//TODO - this is checking the current context inside to avoid an extra NOP context change. make this optional or remove it, since we're tracking it here
cr.gc.Begin();
if(!begun)
cr.gc.Begin();
}
if (cr.gl != null)
{

8
BizHawk.Client.Common/Global.cs
View File

@ -79,7 +79,7 @@ namespace BizHawk.Client.Common
{
get
{
switch(Global.Emulator.SystemId)
switch(Emulator.SystemId)
{
default:
case "NULL":
@ -91,11 +91,11 @@ namespace BizHawk.Client.Common
case "SG":
return SystemInfo.SG;
case "SMS":
if ((Global.Emulator as SMS).IsGameGear)
if ((Emulator as SMS).IsGameGear)
{
return SystemInfo.GG;
}
else if ((Global.Emulator as SMS).IsSG1000)
else if ((Emulator as SMS).IsSG1000)
{
return SystemInfo.SG;
}
@ -114,7 +114,7 @@ namespace BizHawk.Client.Common
case "SNES":
return SystemInfo.SNES;
case "GB":
if ((Global.Emulator as Gameboy).IsCGBMode())
if ((Emulator as Gameboy).IsCGBMode())
{
return SystemInfo.GBC;
}

2
BizHawk.Client.Common/PathManager.cs
View File

@ -29,6 +29,8 @@ namespace BizHawk.Client.Common
/// </summary>
public static string MakeProgramRelativePath(string path) { return MakeAbsolutePath("%exe%/" + path, null); }
public static string GetDllDirectory() { return Path.Combine(GetExeDirectoryAbsolute(), "dll"); }
/// <summary>
/// The location of the default INI file
/// </summary>

67
BizHawk.Client.Common/QuickBmpFile.cs
View File

@ -143,6 +143,66 @@ namespace BizHawk.Client.Common
}
}
unsafe static void Blit_Any_NoFlip(BMP src, BMP dst)
{
int w = dst.Width;
int h = dst.Height;
int in_w = src.Width;
int in_h = src.Height;
int* sp = src.Data;
int* dp = dst.Data;
for (int j = 0; j < h; j++)
{
sp = src.Data + in_w * (j * in_h / h);
for (int i = 0; i < w; i++)
{
dp[i] = sp[i * in_w / w];
}
dp += w;
}
}
public unsafe static void Copy(IVideoProvider src, IVideoProvider dst)
{
if (src.BufferWidth == dst.BufferWidth && src.BufferHeight == dst.BufferHeight)
{
Array.Copy(src.GetVideoBuffer(), dst.GetVideoBuffer(), src.GetVideoBuffer().Length);
}
else
{
fixed (int* srcp = src.GetVideoBuffer(), dstp = dst.GetVideoBuffer())
{
Blit_Any_NoFlip(new BMP
{
Data = srcp,
Width = src.BufferWidth,
Height = src.BufferHeight
},
new BMP
{
Data = dstp,
Width = dst.BufferWidth,
Height = dst.BufferHeight
});
}
}
}
/// <summary>
/// if passed to QuickBMPFile.Load(), will size itself to match the incoming bmp
/// </summary>
public class LoadedBMP : IVideoProvider
{
public int[] VideoBuffer { get; set; }
public int[] GetVideoBuffer() { return VideoBuffer; }
public int VirtualWidth { get { return BufferWidth; } }
public int VirtualHeight { get { return BufferHeight; } }
public int BufferWidth { get; set; }
public int BufferHeight { get; set; }
public int BackgroundColor { get { return unchecked((int)0xff000000); } }
}
public unsafe static bool Load(IVideoProvider v, Stream s)
{
var bf = BITMAPFILEHEADER.FromStream(s);
@ -158,6 +218,13 @@ namespace BizHawk.Client.Common
byte[] src = new byte[in_w * in_h * 4];
s.Read(src, 0, src.Length);
if (v is LoadedBMP)
{
var l = v as LoadedBMP;
l.BufferWidth = in_w;
l.BufferHeight = in_h;
l.VideoBuffer = new int[in_w * in_h];
}
int[] dst = v.GetVideoBuffer();
fixed (byte *srcp = src)

128
BizHawk.Client.Common/RomLoader.cs
View File

@ -238,7 +238,7 @@ namespace BizHawk.Client.Common
try
{
var ext = file.Extension.ToLower();
var ext = file.Extension.ToLowerInvariant();
if (ext == ".m3u")
{
//HACK ZONE - currently only psx supports m3u
@ -256,10 +256,25 @@ namespace BizHawk.Client.Common
{
Disc disc = null;
string discPath = e.Path;
string discExt = Path.GetExtension(discPath).ToLower();
disc = Disc.LoadAutomagic(discPath);
//--- load the disc in a context which will let us abort if it's going to take too long
var discMountJob = new DiscMountJob { IN_FromPath = discPath };
discMountJob.IN_SlowLoadAbortThreshold = 8;
discMountJob.Run();
disc = discMountJob.OUT_Disc;
if (discMountJob.OUT_SlowLoadAborted)
{
System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk");
return false;
}
if (discMountJob.OUT_ErrorLevel)
throw new InvalidOperationException("\r\n" + discMountJob.OUT_Log);
if(disc == null)
throw new InvalidOperationException("Can't load one of the files specified in the M3U");
var discName = Path.GetFileNameWithoutExtension(discPath);
discNames.Add(discName);
discs.Add(disc);
@ -274,11 +289,11 @@ namespace BizHawk.Client.Common
sw.WriteLine("Disc could not be identified as known-good. Look for a better rip.");
else
{
sw.WriteLine("Disc was identified (99.99% confidently) as known good.");
sw.WriteLine("Disc was identified (99.99% confidently) as known good with disc id hash CRC32:{0:X8}",discHash);
sw.WriteLine("Nonetheless it could be an unrecognized romhack or patched version.");
sw.WriteLine("According to redump.org, the ideal hash for entire disc is: CRC32:{0:X8}", game.GetStringValue("dh"));
sw.WriteLine("The file you loaded hasn't been hashed entirely (it would take too long)");
sw.WriteLine("Compare it with the full hash calculated by the PSX menu's disc hasher tool");
sw.WriteLine("Compare it with the full hash calculated by the PSX menu's Hash Discs tool");
}
}
else
@ -289,7 +304,6 @@ namespace BizHawk.Client.Common
}
nextEmulator = new Octoshock(nextComm, discs, discNames, null, GetCoreSettings<Octoshock>(), GetCoreSyncSettings<Octoshock>());
nextEmulator.CoreComm.RomStatusDetails = "PSX etc.";
nextEmulator.CoreComm.RomStatusDetails = sw.ToString();
game = new GameInfo { Name = Path.GetFileNameWithoutExtension(file.Name) };
game.System = "PSX";
@ -313,6 +327,10 @@ namespace BizHawk.Client.Common
System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk");
return false;
}
if (discMountJob.OUT_ErrorLevel)
throw new InvalidOperationException("\r\n" + discMountJob.OUT_Log);
var disc = discMountJob.OUT_Disc;
//-----------
@ -372,11 +390,11 @@ namespace BizHawk.Client.Common
else
{
StringWriter sw = new StringWriter();
sw.WriteLine("Disc was identified (99.99% confidently) as known good.");
sw.WriteLine("Disc was identified (99.99% confidently) as known good with disc id hash CRC32:{0:X8}", discHash);
sw.WriteLine("Nonetheless it could be an unrecognized romhack or patched version.");
sw.WriteLine("According to redump.org, the ideal hash for entire disc is: CRC32:{0:X8}", game.GetStringValue("dh"));
sw.WriteLine("The file you loaded hasn't been hashed entirely (it would take too long)");
sw.WriteLine("Compare it with the full hash calculated by the PSX menu's disc hasher tool");
sw.WriteLine("Compare it with the full hash calculated by the PSX menu's Hash Discs tool");
nextEmulator.CoreComm.RomStatusDetails = sw.ToString();
}
break;
@ -386,7 +404,7 @@ namespace BizHawk.Client.Common
break;
}
}
else if (file.Extension.ToLower() == ".xml")
else if (file.Extension.ToLowerInvariant() == ".xml")
{
try
{
@ -424,6 +442,69 @@ namespace BizHawk.Client.Common
roms,
(AppleII.Settings)GetCoreSettings<AppleII>());
break;
case "PSX":
var entries = xmlGame.AssetFullPaths;
var discs = new List<Disc>();
var discNames = new List<string>();
var sw = new StringWriter();
foreach (var e in entries)
{
Disc disc = null;
string discPath = e;
//--- load the disc in a context which will let us abort if it's going to take too long
var discMountJob = new DiscMountJob { IN_FromPath = discPath };
discMountJob.IN_SlowLoadAbortThreshold = 8;
discMountJob.Run();
disc = discMountJob.OUT_Disc;
if (discMountJob.OUT_SlowLoadAborted)
{
System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk");
return false;
}
if (discMountJob.OUT_ErrorLevel)
throw new InvalidOperationException("\r\n" + discMountJob.OUT_Log);
if (disc == null)
throw new InvalidOperationException("Can't load one of the files specified in the M3U");
var discName = Path.GetFileNameWithoutExtension(discPath);
discNames.Add(discName);
discs.Add(disc);
var discType = new DiscIdentifier(disc).DetectDiscType();
sw.WriteLine("{0}", Path.GetFileName(discPath));
if (discType == DiscType.SonyPSX)
{
string discHash = new DiscHasher(disc).Calculate_PSX_BizIDHash().ToString("X8");
game = Database.CheckDatabase(discHash);
if (game == null || game.IsRomStatusBad() || game.Status == RomStatus.NotInDatabase)
sw.WriteLine("Disc could not be identified as known-good. Look for a better rip.");
else
{
sw.WriteLine("Disc was identified (99.99% confidently) as known good with disc id hash CRC32:{0:X8}", discHash);
sw.WriteLine("Nonetheless it could be an unrecognized romhack or patched version.");
sw.WriteLine("According to redump.org, the ideal hash for entire disc is: CRC32:{0:X8}", game.GetStringValue("dh"));
sw.WriteLine("The file you loaded hasn't been hashed entirely (it would take too long)");
sw.WriteLine("Compare it with the full hash calculated by the PSX menu's Hash Discs tool");
}
}
else
{
sw.WriteLine("Not a PSX disc");
}
sw.WriteLine("-------------------------");
}
// todo: copy pasta from PSX .cue section
nextEmulator = new Octoshock(nextComm, discs, discNames, null, GetCoreSettings<Octoshock>(), GetCoreSyncSettings<Octoshock>());
nextEmulator.CoreComm.RomStatusDetails = sw.ToString();
game = new GameInfo { Name = Path.GetFileNameWithoutExtension(file.Name) };
game.System = "PSX";
break;
default:
return false;
}
@ -451,22 +532,39 @@ namespace BizHawk.Client.Common
}
}
}
else if (file.Extension.ToLowerInvariant() == ".psf" || file.Extension.ToLowerInvariant() == ".minipsf")
{
Func<Stream, int, byte[]> cbDeflater = (Stream instream, int size) =>
{
var inflater = new ICSharpCode.SharpZipLib.Zip.Compression.Inflater(false);
var iis = new ICSharpCode.SharpZipLib.Zip.Compression.Streams.InflaterInputStream(instream, inflater);
MemoryStream ret = new MemoryStream();
iis.CopyTo(ret);
return ret.ToArray();
};
PSF psf = new PSF();
psf.Load(path, cbDeflater);
nextEmulator = new Octoshock(nextComm, psf, GetCoreSettings<Octoshock>(), GetCoreSyncSettings<Octoshock>());
nextEmulator.CoreComm.RomStatusDetails = "It's a PSF, what do you want.";
//total garbage, this
rom = new RomGame(file);
game = rom.GameInfo;
}
else // most extensions
{
rom = new RomGame(file);
//hacky for now
if (file.Extension.ToLower() == ".exe")
{
if (file.Extension.ToLowerInvariant() == ".exe")
rom.GameInfo.System = "PSX";
}
if (string.IsNullOrEmpty(rom.GameInfo.System))
{
// Has the user picked a preference for this extension?
if (PreferredPlatformIsDefined(rom.Extension.ToLower()))
if (PreferredPlatformIsDefined(rom.Extension.ToLowerInvariant()))
{
rom.GameInfo.System = Global.Config.PreferredPlatformsForExtensions[rom.Extension.ToLower()];
rom.GameInfo.System = Global.Config.PreferredPlatformsForExtensions[rom.Extension.ToLowerInvariant()];
}
else if (ChoosePlatform != null)
{
@ -487,7 +585,7 @@ namespace BizHawk.Client.Common
var isXml = false;
// other xml has already been handled
if (file.Extension.ToLower() == ".xml")
if (file.Extension.ToLowerInvariant() == ".xml")
{
game.System = "SNES";
isXml = true;

29
BizHawk.Client.Common/SavestateManager.cs
View File

@ -72,6 +72,15 @@ namespace BizHawk.Client.Common
tw.WriteLine(data);
});
}
if (Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie is TasMovie)
{
bs.PutLump(BinaryStateLump.LagLog,
delegate(BinaryWriter bw)
{
(Global.MovieSession.Movie as TasMovie).TasLagLog.Save(bw);
});
}
}
}
@ -97,6 +106,17 @@ namespace BizHawk.Client.Common
}
}
public static void PopulateFramebuffer(byte[] bytes)
{
using (var ms = new MemoryStream(bytes))
{
using (var br = new BinaryReader(ms))
{
PopulateFramebuffer(br);
}
}
}
public static bool LoadStateFile(string path, string name)
{
var core = Global.Emulator.AsStatable();
@ -146,6 +166,15 @@ namespace BizHawk.Client.Common
Global.UserBag = (Dictionary<string, object>)ConfigService.LoadWithType(userData);
}
if (bl.HasLump(BinaryStateLump.LagLog)
&& Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie is TasMovie)
{
bl.GetLump(BinaryStateLump.LagLog, false, delegate(BinaryReader br, long length)
{
(Global.MovieSession.Movie as TasMovie).TasLagLog.Load(br);
});
}
}
catch
{

7
BizHawk.Client.Common/XmlGame.cs
View File

@ -16,12 +16,14 @@ namespace BizHawk.Client.Common
public XmlGame()
{
Assets = new List<KeyValuePair<string, byte[]>>();
AssetFullPaths = new List<string>();
GI = new GameInfo();
}
public XmlDocument Xml { get; set; }
public GameInfo GI { get; set; }
public IList<KeyValuePair<string, byte[]>> Assets { get; set; }
public IList<string> AssetFullPaths { get; set; } // TODO: Hack work around, to avoid having to refactor Assets into a object array, should be refactored!
public static XmlGame Create(HawkFile f)
{
@ -45,6 +47,7 @@ namespace BizHawk.Client.Common
},
Xml = x
};
string fullpath = string.Empty;
var n = y.SelectSingleNode("./LoadAssets");
if (n != null)
@ -79,7 +82,7 @@ namespace BizHawk.Client.Common
else
{
// relative path
var fullpath = Path.GetDirectoryName(f.CanonicalFullPath.Split('|').First()) ?? string.Empty;
fullpath = Path.GetDirectoryName(f.CanonicalFullPath.Split('|').First()) ?? string.Empty;
fullpath = Path.Combine(fullpath, filename.Split('|').First());
try
{
@ -107,7 +110,7 @@ namespace BizHawk.Client.Common
}
ret.Assets.Add(new KeyValuePair<string, byte[]>(filename, data));
ret.AssetFullPaths.Add(fullpath);
using (var sha1 = System.Security.Cryptography.SHA1.Create())
{
sha1.TransformFinalBlock(data, 0, data.Length);

127
BizHawk.Client.Common/config/Config.cs
View File

@ -175,38 +175,39 @@ namespace BizHawk.Client.Common
public static class DefaultMessageOptions
{
public const int
DispFPSx = 0,
DispFPSy = 0,
DispFrameCx = 0,
DispFrameCy = 14,
DispLagx = 0,
DispLagy = 42,
DispInpx = 0,
DispInpy = 28,
DispRecx = 0,
DispRecy = 56,
DispMultix = 0,
DispMultiy = 14,
DispMessagex = 3,
DispMessagey = 0,
DispAutoholdx = 0,
DispAutoholdy = 0,
DispRamWatchx = 0,
DispRamWatchy = 70,
DispFPSx = 0,
DispFPSy = 0,
DispFrameCx = 0,
DispFrameCy = 14,
DispLagx = 0,
DispLagy = 42,
DispInpx = 0,
DispInpy = 28,
DispRecx = 0,
DispRecy = 56,
DispMultix = 0,
DispMultiy = 14,
DispMessagex = 3,
DispMessagey = 0,
DispAutoholdx = 0,
DispAutoholdy = 0,
DispRamWatchx = 0,
DispRamWatchy = 70,
MessagesColor = -1,
AlertMessageColor = -65536,
LastInputColor = -23296,
MovieInput = -8355712,
MessagesColor = -1,
AlertMessageColor = -65536,
LastInputColor = -23296,
MovieInput = -8355712,
DispFPSanchor = 0, // 0 = UL, 1 = UR, 2 = DL, 3 = DR
DispFrameanchor = 0,
DispLaganchor = 0,
DispInpanchor = 0,
DispRecanchor = 0,
DispMultianchor = 1,
DispMessageanchor = 2,
DispAutoholdanchor = 1;
DispFPSanchor = 0, // 0 = UL, 1 = UR, 2 = DL, 3 = DR
DispFrameanchor = 0,
DispLaganchor = 0,
DispInpanchor = 0,
DispWatchAnchor = 0,
DispRecanchor = 0,
DispMultianchor = 1,
DispMessageanchor = 2,
DispAutoholdanchor = 1;
}
// Display options
@ -215,49 +216,53 @@ namespace BizHawk.Client.Common
public bool DisplayLagCounter = false;
public bool DisplayInput = false;
public bool DisplayRerecordCount = false;
public bool DisplayMessages = true;
public bool DispBlurry = false; // make display look ugly
public bool DispFixAspectRatio = true;
public bool DispFixScaleInteger = true;
public bool DispFullscreenHacks = true;
public int DispSpeedupFeatures = 2;
public bool DispBlurry = false; // make display look ugly
public bool DispFixAspectRatio = true;
public bool DispFixScaleInteger = true;
public bool DispFullscreenHacks = true;
public int DispFPSx = DefaultMessageOptions.DispFPSx;
public int DispFPSy = DefaultMessageOptions.DispFPSy;
public int DispFrameCx = DefaultMessageOptions.DispFrameCx;
public int DispFrameCy = DefaultMessageOptions.DispFrameCy;
public int DispLagx = DefaultMessageOptions.DispLagx;
public int DispLagy = DefaultMessageOptions.DispLagy;
public int DispInpx = DefaultMessageOptions.DispInpx;
public int DispInpy = DefaultMessageOptions.DispInpy;
public int DispRecx = DefaultMessageOptions.DispRecx;
public int DispRecy = DefaultMessageOptions.DispRecy;
public int DispMultix = DefaultMessageOptions.DispMultix;
public int DispMultiy = DefaultMessageOptions.DispMultiy;
public int DispFrameCx = DefaultMessageOptions.DispFrameCx;
public int DispFrameCy = DefaultMessageOptions.DispFrameCy;
public int DispLagx = DefaultMessageOptions.DispLagx;
public int DispLagy = DefaultMessageOptions.DispLagy;
public int DispInpx = DefaultMessageOptions.DispInpx;
public int DispInpy = DefaultMessageOptions.DispInpy;
public int DispRecx = DefaultMessageOptions.DispRecx;
public int DispRecy = DefaultMessageOptions.DispRecy;
public int DispMultix = DefaultMessageOptions.DispMultix;
public int DispMultiy = DefaultMessageOptions.DispMultiy;
public int DispRamWatchx = DefaultMessageOptions.DispRamWatchx;
public int DispRamWatchy = DefaultMessageOptions.DispRamWatchy;
public int DispMessagex = DefaultMessageOptions.DispMessagex;
public int DispMessagey = DefaultMessageOptions.DispMessagey;
public int DispMessagex = DefaultMessageOptions.DispMessagex;
public int DispMessagey = DefaultMessageOptions.DispMessagey;
public int DispAutoholdx = DefaultMessageOptions.DispAutoholdx;
public int DispAutoholdy = DefaultMessageOptions.DispAutoholdy;
public int DispAutoholdy = DefaultMessageOptions.DispAutoholdy;
public int DispFPSanchor = DefaultMessageOptions.DispFPSanchor; // 0 = UL, 1 = UR, 2 = DL, 3 = DR
public int DispFrameanchor = DefaultMessageOptions.DispFrameanchor;
public int DispLaganchor = DefaultMessageOptions.DispLaganchor;
public int DispInpanchor = DefaultMessageOptions.DispInpanchor;
public int DispRecanchor = DefaultMessageOptions.DispRecanchor;
public int DispMultianchor = DefaultMessageOptions.DispMultianchor;
public int DispMessageanchor = DefaultMessageOptions.DispMessageanchor;
public int DispAutoholdanchor = DefaultMessageOptions.DispAutoholdanchor;
public int DispFPSanchor = DefaultMessageOptions.DispFPSanchor; // 0 = UL, 1 = UR, 2 = DL, 3 = DR
public int DispFrameanchor = DefaultMessageOptions.DispFrameanchor;
public int DispLaganchor = DefaultMessageOptions.DispLaganchor;
public int DispInpanchor = DefaultMessageOptions.DispInpanchor;
public int DispWatchesanchor = DefaultMessageOptions.DispWatchAnchor;
public int DispRecanchor = DefaultMessageOptions.DispRecanchor;
public int DispMultianchor = DefaultMessageOptions.DispMultianchor;
public int DispMessageanchor = DefaultMessageOptions.DispMessageanchor;
public int DispAutoholdanchor = DefaultMessageOptions.DispAutoholdanchor;
public int MessagesColor = DefaultMessageOptions.MessagesColor;
public int AlertMessageColor = DefaultMessageOptions.AlertMessageColor;
public int LastInputColor = DefaultMessageOptions.LastInputColor;
public int MovieInput = DefaultMessageOptions.MovieInput;
public int MessagesColor = DefaultMessageOptions.MessagesColor;
public int AlertMessageColor = DefaultMessageOptions.AlertMessageColor;
public int LastInputColor = DefaultMessageOptions.LastInputColor;
public int MovieInput = DefaultMessageOptions.MovieInput;
public int DispPrescale = 1;
//warning: we dont even want to deal with changing this at runtime. but we want it changed here for config purposes. so dont check this variable. check in GlobalWin or something like that.
public EDispMethod DispMethod = EDispMethod.OpenGL;
public EDispMethod DispMethod = EDispMethod.SlimDX9;
public int DispChrome_FrameWindowed = 2;
public bool DispChrome_StatusBarWindowed = true;
@ -265,6 +270,8 @@ namespace BizHawk.Client.Common
public bool DispChrome_MenuWindowed = true;
public bool DispChrome_StatusBarFullscreen = false;
public bool DispChrome_MenuFullscreen = false;
public bool DispChrome_Fullscreen_AutohideMouse = true;
public bool DispChrome_AllowDoubleClickFullscreen = true;
public EDispManagerAR DispManagerAR = EDispManagerAR.System;
public int DispCustomUserARWidth = 1;

14
BizHawk.Client.Common/inputAdapters/InputAdapters.cs
View File

@ -383,7 +383,7 @@ namespace BizHawk.Client.Common
private List<string> _justPressed = new List<string>();
}
/// SuuperW: Old code commented
///// SuuperW: I'm leaving the old class in case I accidentally screwed something up
//public class AutoFireStickyXorAdapter : IController, ISticky
//{
// public int On { get; set; }
@ -534,6 +534,8 @@ namespace BizHawk.Client.Common
// private List<string> _justPressed = new List<string>();
//}
// commenting this out, it breaks the autofire hotkey
public class AutoFireStickyXorAdapter : IController, ISticky
{
// TODO: Change the AutoHold adapter to be one of these, with an 'Off' value of 0?
@ -675,23 +677,15 @@ namespace BizHawk.Client.Common
_floatPatterns.ElementAt(i).Value.GetNextValue(lagged);
}
// SuuperW: What does this even do? I set a breakpoint inside the loop and it wasn't reached.
private WorkingDictionary<string, AutoPatternBool> _toggledButtons = new WorkingDictionary<string, AutoPatternBool>();
private List<string> _justPressed = new List<string>();
public void MassToggleStickyState(List<string> buttons)
{
foreach (var button in buttons.Where(button => !_justPressed.Contains(button)))
{
if (_boolPatterns.ContainsKey(button))
{
_toggledButtons[button] = _boolPatterns[button];
SetSticky(button, false);
}
else
{
_boolPatterns[button] = _toggledButtons[button];
_toggledButtons.Remove(button);
}
SetSticky(button, true);
}
_justPressed = buttons;

96
BizHawk.Client.Common/lua/EmuLuaLibrary.MemorySavestate.cs Normal file
View File

@ -0,0 +1,96 @@
using System;
using System.Collections.Generic;
using System.IO;
using LuaInterface;
using BizHawk.Emulation.Common.IEmulatorExtensions;
namespace BizHawk.Client.Common
{
public sealed class MemorySavestateEmuLuaLibrary : LuaLibraryBase
{
public MemorySavestateEmuLuaLibrary(Lua lua)
: base(lua) { }
public MemorySavestateEmuLuaLibrary(Lua lua, Action<string> logOutputCallback)
: base(lua, logOutputCallback) { }
public override string Name { get { return "memorysavestate"; } }
private readonly Dictionary<Guid, byte[]> MemorySavestates = new Dictionary<Guid, byte[]>();
[LuaMethodAttributes(
"savecorestate",
"creates a core savestate and stores it in memory. Note: a core savestate is only the raw data from the core, and not extras such as movie input logs, or framebuffers. Returns a unique identifer for the savestate"
)]
public Guid SaveCoreStateToMemory()
{
if (Global.Emulator.HasSavestates())
{
var guid = Guid.NewGuid();
var bytes = Global.Emulator.AsStatable().SaveStateBinary();
MemorySavestates.Add(guid, bytes);
return guid;
}
else
{
Log("Savestates not supported on this core");
return Guid.Empty;
}
}
[LuaMethodAttributes(
"loadcorestate",
"loads an in memory state with the given identifier"
)]
public void LoadCoreStateFromMemory(string identifier)
{
var guid = new Guid(identifier);
if (Global.Emulator.HasSavestates())
{
try
{
var statableCore = Global.Emulator.AsStatable();
var state = MemorySavestates[guid];
using (MemoryStream ms = new MemoryStream(state))
using (BinaryReader br = new BinaryReader(ms))
{
statableCore.LoadStateBinary(br);
}
}
catch
{
Log("Unable to find the given savestate in memory");
}
}
else
{
Log("Savestates not supported on this core");
}
}
[LuaMethodAttributes(
"removestate",
"removes the savestate with the given identifier from memory"
)]
public void DeleteState(string identifier)
{
var guid = new Guid(identifier);
MemorySavestates.Remove(guid);
}
[LuaMethodAttributes(
"clearstatesfrommemory",
"clears all savestates stored in memory"
)]
public void ClearInMemoryStates()
{
MemorySavestates.Clear();
}
}
}

72
BizHawk.Client.Common/lua/EmuLuaLibrary.Movie.cs
View File

@ -14,6 +14,24 @@ namespace BizHawk.Client.Common
public override string Name { get { return "movie"; } }
[LuaMethodAttributes(
"startsfromsavestate",
"Returns whether or not the movie is a savestate-anchored movie"
)]
public bool StartsFromSavestate()
{
return Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie.StartsFromSavestate;
}
[LuaMethodAttributes(
"startsfromsaveram",
"Returns whether or not the movie is a saveram-anchored movie"
)]
public bool StartsFromSaveram()
{
return Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie.StartsFromSaveRam;
}
[LuaMethodAttributes(
"filename",
"Returns the file name including path of the currently loaded movie"
@ -200,5 +218,59 @@ namespace BizHawk.Client.Common
return 0.0;
}
[LuaMethodAttributes(
"getheader",
"If a movie is active, will return the movie header as a lua table"
)]
public LuaTable GetHeader()
{
var luaTable = Lua.NewTable();
if (Global.MovieSession.Movie.IsActive)
{
foreach (var kvp in Global.MovieSession.Movie.HeaderEntries)
{
luaTable[kvp.Key] = kvp.Value;
}
}
return luaTable;
}
[LuaMethodAttributes(
"getcomments",
"If a movie is active, will return the movie comments as a lua table"
)]
public LuaTable GetComments()
{
var luaTable = Lua.NewTable();
if (Global.MovieSession.Movie.IsActive)
{
for (int i = 0; i < Global.MovieSession.Movie.Comments.Count; i++)
{
luaTable[i] = Global.MovieSession.Movie.Comments[i];
}
}
return luaTable;
}
[LuaMethodAttributes(
"getsubtitles",
"If a movie is active, will return the movie subtitles as a lua table"
)]
public LuaTable GetSubtitles()
{
var luaTable = Lua.NewTable();
if (Global.MovieSession.Movie.IsActive)
{
for (int i = 0; i < Global.MovieSession.Movie.Subtitles.Count; i++)
{
luaTable[i] = Global.MovieSession.Movie.Subtitles[i].ToString();
}
}
return luaTable;
}
}
}

2
BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs
View File

@ -199,7 +199,7 @@ namespace BizHawk.Client.Common
for (int i = 0; i < splitStr.Length; i++)
{
table[i] = splitStr[i];
table[i + 1] = splitStr[i];
}
}

10
BizHawk.Client.Common/lua/LuaFunctionList.cs
View File

@ -40,7 +40,15 @@ namespace BizHawk.Client.Common
if (Global.Emulator.CanDebug())
{
Global.Emulator.AsDebuggable().MemoryCallbacks.RemoveAll(this.Select(x => x.Callback));
try
{
var cbSys = Global.Emulator.AsDebuggable().MemoryCallbacks;
cbSys.RemoveAll(this.Select(x => x.Callback));
}
catch
{
//swallow exceptions here. many cores havent implemented memorycallbacks, we ought to have more granular feature querying
}
}
Clear();

5
BizHawk.Client.Common/lua/LuaMemoryBase.cs
View File

@ -158,9 +158,10 @@ namespace BizHawk.Client.Common
var table = Lua.NewTable();
if (lastAddr < Domain.Size)
{
for (var i = addr; i <= lastAddr; i++)
for (var i = 0; i <length ; i++)
{
var v = Domain.PeekByte(i);
int a = addr + i;
var v = Domain.PeekByte(a);
table[i] = v;
}
}

1
BizHawk.Client.Common/movie/HeaderKeys.cs
View File

@ -11,6 +11,7 @@ namespace BizHawk.Client.Common
public const string AUTHOR = "Author";
public const string RERECORDS = "rerecordCount";
public const string STARTSFROMSAVESTATE = "StartsFromSavestate";
public const string STARTSFROMSAVERAM = "StartsFromSaveRam";
public const string SAVESTATEBINARYBASE64BLOB = "SavestateBinaryBase64Blob"; //this string will not contain base64: ; it's implicit (this is to avoid another big string op to dice off the base64: substring)
public const string FOURSCORE = "FourScore";
public const string SHA1 = "SHA1";

2
BizHawk.Client.Common/movie/MovieService.cs
View File

@ -19,7 +19,7 @@ namespace BizHawk.Client.Common
if (Path.GetExtension(path).EndsWith("bkm"))
{
var bkm = new BkmMovie(path);
bkm.Load();
bkm.Load(false);
// Hackery to fix how things used to work
if (bkm.SystemID == "GBC")

15
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -182,7 +182,7 @@ namespace BizHawk.Client.Common
public bool MovieLoad()
{
MovieControllerAdapter = Movie.LogGeneratorInstance().MovieControllerAdapter;
return Movie.Load();
return Movie.Load(false);
}
public void StopMovie(bool saveChanges = true)
@ -463,7 +463,8 @@ namespace BizHawk.Client.Common
{
if (!record) // The semantics of record is that we are starting a new movie, and even wiping a pre-existing movie with the same path, but non-record means we are loading an existing movie into playback mode
{
movie.Load();
movie.Load(false);
if (movie.SystemID != emulator.SystemId)
{
throw new MoviePlatformMismatchException(
@ -475,11 +476,11 @@ namespace BizHawk.Client.Common
}
// TODO: Delete this, this save is utterly useless.
//If a movie is already loaded, save it before starting a new movie
if (Movie.IsActive && !string.IsNullOrEmpty(Movie.Filename))
{
Movie.Save();
}
// Movie was saved immediately before calling QueeuNewMovie. (StartNewMovie)
//if (Movie.IsActive && !string.IsNullOrEmpty(Movie.Filename))
//{
// Movie.Save();
//}
// Note: this populates MovieControllerAdapter's Type with the approparite controller
// Don't set it to a movie instance of the adapter or you will lose the definition!

2
BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs
View File

@ -45,7 +45,7 @@ namespace BizHawk.Client.Common
return le
.Replace(".", " ")
.Replace("|", "")
.Replace(" 0, 0,", " ");
.Replace(" 0,", " "); //zero 04-aug-2015 - changed from a 2-dimensional type string to support emptying out the one-dimensional PSX disc select control
}
public bool IsEmpty

26
BizHawk.Client.Common/movie/bk2/Bk2Movie.HeaderApi.cs
View File

@ -76,6 +76,31 @@ namespace BizHawk.Client.Common
}
}
public bool StartsFromSaveRam
{
get
{
if (Header.ContainsKey(HeaderKeys.STARTSFROMSAVERAM))
{
return bool.Parse(Header[HeaderKeys.STARTSFROMSAVERAM]);
}
return false;
}
set
{
if (value)
{
Header.Add(HeaderKeys.STARTSFROMSAVERAM, "True");
}
else
{
Header.Remove(HeaderKeys.STARTSFROMSAVERAM);
}
}
}
public string GameName
{
get
@ -239,5 +264,6 @@ namespace BizHawk.Client.Common
public string TextSavestate { get; set; }
public byte[] BinarySavestate { get; set; }
public int[] SavestateFramebuffer { get; set; }
public byte[] SaveRam { get; set; }
}
}

18
BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
View File

@ -32,7 +32,7 @@ namespace BizHawk.Client.Common
Write(backupName);
}
public virtual bool Load()
public virtual bool Load(bool preload)
{
var file = new FileInfo(Filename);
if (!file.Exists)
@ -141,6 +141,15 @@ namespace BizHawk.Client.Common
SavestateFramebuffer[i] = br.ReadInt32();
});
}
else if (StartsFromSaveRam)
{
bl.GetLump(BinaryStateLump.MovieSaveRam, false,
delegate(BinaryReader br, long length)
{
SaveRam = br.ReadBytes((int)length);
});
}
}
Changes = false;
@ -149,7 +158,6 @@ namespace BizHawk.Client.Common
public bool PreLoadHeaderAndLength(HawkFile hawkFile)
{
// For now, preload simply loads everything
var file = new FileInfo(Filename);
if (!file.Exists)
{
@ -157,7 +165,7 @@ namespace BizHawk.Client.Common
}
Filename = file.FullName;
return Load();
return Load(true);
}
protected virtual void Write(string fn)
@ -193,6 +201,10 @@ namespace BizHawk.Client.Common
(BinaryWriter bw) => BizHawk.Common.IOExtensions.IOExtensions.Write(bw, SavestateFramebuffer));
}
}
else if (StartsFromSaveRam)
{
bs.PutLump(BinaryStateLump.MovieSaveRam, (BinaryWriter bw) => bw.Write(SaveRam));
}
}
Changes = false;

4
BizHawk.Client.Common/movie/bkm/BkmMovie.HeaderApi.cs
View File

@ -40,6 +40,9 @@ namespace BizHawk.Client.Common
set { Header.StartsFromSavestate = value; }
}
// Bkm doesn't support saveram anchored movies
public bool StartsFromSaveRam { get { return false; } set { } }
public string GameName
{
get { return Header.GameName; }
@ -91,5 +94,6 @@ namespace BizHawk.Client.Common
public string TextSavestate { get; set; }
public byte[] BinarySavestate { get; set; }
public int[] SavestateFramebuffer { get { return null; } set { } } // eat and ignore framebuffers
public byte[] SaveRam { get { return null; } set { } } // Bkm does not support Saveram anchored movies
}
}

2
BizHawk.Client.Common/movie/bkm/BkmMovie.IO.cs
View File

@ -58,7 +58,7 @@ namespace BizHawk.Client.Common
Write(backupName);
}
public bool Load()
public bool Load(bool preload)
{
var file = new FileInfo(Filename);

102
BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
View File

@ -1,10 +1,12 @@
using System;
using System.IO;
using System.Linq;
using System.Collections.Generic;
using BizHawk.Common.ReflectionExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Common.IEmulatorExtensions;
namespace BizHawk.Client.Common.MovieConversionExtensions
{
@ -33,6 +35,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
}
var tas = new TasMovie(newFilename, old.StartsFromSavestate);
tas.TasStateManager.MountWriteAccess();
for (var i = 0; i < old.InputLogLength; i++)
{
@ -67,6 +70,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
tas.TextSavestate = old.TextSavestate;
tas.BinarySavestate = old.BinarySavestate;
tas.SaveRam = old.SaveRam;
return tas;
}
@ -88,7 +92,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
}
bk2.HeaderEntries.Clear();
foreach(var kvp in old.HeaderEntries)
foreach (var kvp in old.HeaderEntries)
{
bk2.HeaderEntries[kvp.Key] = kvp.Value;
}
@ -96,19 +100,20 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
bk2.SyncSettingsJson = old.SyncSettingsJson;
bk2.Comments.Clear();
foreach(var comment in old.Comments)
foreach (var comment in old.Comments)
{
bk2.Comments.Add(comment);
}
bk2.Subtitles.Clear();
foreach(var sub in old.Subtitles)
foreach (var sub in old.Subtitles)
{
bk2.Subtitles.Add(sub);
}
bk2.TextSavestate = old.TextSavestate;
bk2.BinarySavestate = old.BinarySavestate;
bk2.SaveRam = old.SaveRam;
bk2.Save();
return bk2;
@ -136,16 +141,25 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
}
}
var tas = new TasMovie(newFilename, true);
TasMovie tas = new TasMovie(newFilename, true);
tas.BinarySavestate = savestate;
tas.TasStateManager.Clear();
tas.ClearLagLog();
var entries = old.GetLogEntries();
List<string> entries = old.GetLogEntries();
tas.CopyLog(entries.Skip(frame));
tas.CopyVerificationLog(old.VerificationLog);
tas.CopyVerificationLog(entries.Take(frame));
// States can't be easily moved over, because they contain the frame number.
// TODO? I'm not sure how this would be done.
tas.TasStateManager.MountWriteAccess();
old.TasStateManager.Clear();
// Lag Log
tas.TasLagLog.FromLagLog(old.TasLagLog);
tas.TasLagLog.StartFromFrame(frame);
tas.HeaderEntries.Clear();
foreach (var kvp in old.HeaderEntries)
{
@ -156,25 +170,83 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
tas.SyncSettingsJson = old.SyncSettingsJson;
tas.Comments.Clear();
foreach (var comment in old.Comments)
foreach (string comment in old.Comments)
{
tas.Comments.Add(comment);
}
tas.Subtitles.Clear();
foreach (var sub in old.Subtitles)
foreach (Subtitle sub in old.Subtitles)
{
tas.Subtitles.Add(sub);
}
foreach(var marker in old.Markers)
foreach (TasMovieMarker marker in old.Markers)
{
if (marker.Frame > 0)
if (marker.Frame > frame)
tas.Markers.Add(new TasMovieMarker(marker.Frame - frame, marker.Message));
}
tas.TasStateManager.Settings = old.TasStateManager.Settings;
tas.Save();
return tas;
}
public static TasMovie ConvertToSaveRamAnchoredMovie(this TasMovie old, byte[] saveRam)
{
string newFilename = old.Filename + "." + TasMovie.Extension;
if (File.Exists(newFilename))
{
int fileNum = 1;
bool fileConflict = true;
while (fileConflict)
{
tas.Markers.Add(marker);
if (File.Exists(newFilename))
{
newFilename = old.Filename + " (" + fileNum + ")" + "." + TasMovie.Extension;
fileNum++;
}
else
{
fileConflict = false;
}
}
}
TasMovie tas = new TasMovie(newFilename, true);
tas.SaveRam = saveRam;
tas.TasStateManager.Clear();
tas.ClearLagLog();
List<string> entries = old.GetLogEntries();
tas.CopyVerificationLog(old.VerificationLog);
tas.CopyVerificationLog(entries);
tas.HeaderEntries.Clear();
foreach (var kvp in old.HeaderEntries)
{
tas.HeaderEntries[kvp.Key] = kvp.Value;
}
tas.StartsFromSaveRam = true;
tas.StartsFromSavestate = false;
tas.SyncSettingsJson = old.SyncSettingsJson;
tas.Comments.Clear();
foreach (string comment in old.Comments)
{
tas.Comments.Add(comment);
}
tas.Subtitles.Clear();
foreach (Subtitle sub in old.Subtitles)
{
tas.Subtitles.Add(sub);
}
tas.TasStateManager.Settings = old.TasStateManager.Settings;
tas.Save();
@ -213,10 +285,10 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
movie.BoardName = Global.Emulator.BoardName;
}
if (Global.Emulator.HasPublicProperty("DisplayType"))
if (Global.Emulator.HasRegions())
{
var region = Global.Emulator.GetPropertyValue("DisplayType");
if ((DisplayType)region == DisplayType.PAL)
var region = Global.Emulator.AsRegionable().Region;
if (region == DisplayType.PAL)
{
movie.HeaderEntries.Add(HeaderKeys.PAL, "1");
}
@ -233,7 +305,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
movie.HeaderEntries.Add(key, firmware.Hash);
}
}
}
if (Global.Emulator is Gameboy && (Global.Emulator as Gameboy).IsCGBMode())

2
BizHawk.Client.Common/movie/import/MovieImport.cs
View File

@ -140,7 +140,7 @@ namespace BizHawk.Client.Common
break;
case ".BKM":
m.Filename = path;
m.Load();
m.Load(false);
break;
}
}

6
BizHawk.Client.Common/movie/interfaces/IMovie.cs
View File

@ -52,8 +52,12 @@ namespace BizHawk.Client.Common
byte[] BinarySavestate { get; set; }
int[] SavestateFramebuffer { get; set; }
// saveram anchor
byte[] SaveRam { get; set; }
ulong Rerecords { get; set; }
bool StartsFromSavestate { get; set; }
bool StartsFromSaveRam { get; set; }
string GameName { get; set; }
string SystemID { get; set; }
string Hash { get; set; }
@ -95,7 +99,7 @@ namespace BizHawk.Client.Common
/// Tells the movie to load the contents of Filename
/// </summary>
/// <returns>Return whether or not the file was successfully loaded</returns>
bool Load();
bool Load(bool preload);
/// <summary>
/// Instructs the movie to save the current contents to Filename

112
BizHawk.Client.Common/movie/tasproj/StateManagerState.cs Normal file
View File

@ -0,0 +1,112 @@
using System;
using System.IO;
namespace BizHawk.Client.Common
{
/// <summary>
/// Represents a savestate in the TasStateManager
/// </summary>
internal class StateManagerState : IDisposable
{
private static long _stateId = 0;
private TasStateManager _manager;
private byte[] _state;
private long _id;
public int Frame { get; set; }
public void Write(BinaryWriter w)
{
w.Write(Frame);
w.Write(_state.Length);
w.Write(_state);
}
public static StateManagerState Read(BinaryReader r, TasStateManager m)
{
int frame = r.ReadInt32();
byte[] data = r.ReadBytes(r.ReadInt32());
return new StateManagerState(m, data, frame);
}
public byte[] State
{
get
{
if (_state != null)
{
return _state;
}
return _manager.ndbdatabase.FetchAll(_id.ToString());
}
set
{
if (_state != null)
{
_state = value;
}
else
{
throw new Exception("Attempted to set a state to null.");
}
}
}
public int Length
{
get { return State.Length; }
}
public bool IsOnDisk
{
get { return _state == null; }
}
public StateManagerState(TasStateManager manager, byte[] state, int frame)
{
_manager = manager;
_state = state;
Frame = frame;
if (_stateId > long.MaxValue - 100)
{
throw new InvalidOperationException();
}
_id = System.Threading.Interlocked.Increment(ref _stateId);
}
public void MoveToDisk()
{
if (IsOnDisk)
{
return;
}
_manager.ndbdatabase.Store(_id.ToString(), _state, 0, _state.Length);
_state = null;
}
public void MoveToRAM()
{
if (!IsOnDisk)
{
return;
}
string key = _id.ToString();
_state = _manager.ndbdatabase.FetchAll(key);
_manager.ndbdatabase.Release(key);
}
public void Dispose()
{
if (!IsOnDisk)
return;
_manager.ndbdatabase.Release(_id.ToString());
}
}
}

192
BizHawk.Client.Common/movie/tasproj/TasBranch.cs Normal file
View File

@ -0,0 +1,192 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Newtonsoft.Json;
using BizHawk.Bizware.BizwareGL;
namespace BizHawk.Client.Common
{
public class TasBranch
{
public int Frame { get; set; }
public byte[] CoreData { get; set; }
public List<string> InputLog { get; set; }
public BitmapBuffer OSDFrameBuffer { get; set; }
public TasLagLog LagLog { get; set; }
public TasMovieChangeLog ChangeLog { get; set; }
public DateTime TimeStamp { get; set; }
public TasMovieMarkerList Markers { get; set; }
public Guid UniqueIdentifier { get; set; }
}
public class TasBranchCollection : List<TasBranch>
{
public new void Add(TasBranch item)
{
if (item.UniqueIdentifier == Guid.Empty)
{
var currentHashes = this.Select(b => b.UniqueIdentifier.GetHashCode()).ToList();
do item.UniqueIdentifier = Guid.NewGuid();
while (currentHashes.Contains(item.UniqueIdentifier.GetHashCode()));
}
base.Add(item);
}
public void Save(BinaryStateSaver bs)
{
var nheader = new IndexedStateLump(BinaryStateLump.BranchHeader);
var ncore = new IndexedStateLump(BinaryStateLump.BranchCoreData);
var ninput = new IndexedStateLump(BinaryStateLump.BranchInputLog);
var nframebuffer = new IndexedStateLump(BinaryStateLump.BranchFrameBuffer);
var nlaglog = new IndexedStateLump(BinaryStateLump.BranchLagLog);
var nmarkers = new IndexedStateLump(BinaryStateLump.BranchMarkers);
foreach (var b in this)
{
bs.PutLump(nheader, delegate(TextWriter tw)
{
// if this header needs more stuff in it, handle it sensibly
tw.WriteLine(JsonConvert.SerializeObject(new
{
Frame = b.Frame,
TimeStamp = b.TimeStamp,
UniqueIdentifier = b.UniqueIdentifier
}));
});
bs.PutLump(ncore, delegate(Stream s)
{
s.Write(b.CoreData, 0, b.CoreData.Length);
});
bs.PutLump(ninput, delegate(TextWriter tw)
{
foreach (var line in b.InputLog)
tw.WriteLine(line);
});
bs.PutLump(nframebuffer, delegate(Stream s)
{
var vp = new BitmapBufferVideoProvider(b.OSDFrameBuffer);
QuickBmpFile.Save(vp, s, b.OSDFrameBuffer.Width, b.OSDFrameBuffer.Height);
});
bs.PutLump(nlaglog, delegate(BinaryWriter bw)
{
b.LagLog.Save(bw);
});
bs.PutLump(nmarkers, delegate (TextWriter tw)
{
tw.WriteLine(b.Markers.ToString());
});
nheader.Increment();
ncore.Increment();
ninput.Increment();
nframebuffer.Increment();
nlaglog.Increment();
nmarkers.Increment();
}
}
public void Load(BinaryStateLoader bl, TasMovie movie)
{
var nheader = new IndexedStateLump(BinaryStateLump.BranchHeader);
var ncore = new IndexedStateLump(BinaryStateLump.BranchCoreData);
var ninput = new IndexedStateLump(BinaryStateLump.BranchInputLog);
var nframebuffer = new IndexedStateLump(BinaryStateLump.BranchFrameBuffer);
var nlaglog = new IndexedStateLump(BinaryStateLump.BranchLagLog);
var nmarkers = new IndexedStateLump(BinaryStateLump.BranchMarkers);
Clear();
while (true)
{
var b = new TasBranch();
if (!bl.GetLump(nheader, false, delegate(TextReader tr)
{
var header = (dynamic)JsonConvert.DeserializeObject(tr.ReadLine());
b.Frame = (int)header.Frame;
var timestamp = (dynamic)header.TimeStamp;
if (timestamp != null)
{
b.TimeStamp = (DateTime)timestamp;
}
else
{
b.TimeStamp = DateTime.Now;
}
var identifier = (dynamic)header.UniqueIdentifier;
if (identifier != null)
{
b.UniqueIdentifier = (Guid)identifier;
}
else
{
b.UniqueIdentifier = Guid.NewGuid();
}
}))
{
return;
}
bl.GetLump(ncore, true, delegate(Stream s, long length)
{
b.CoreData = new byte[length];
s.Read(b.CoreData, 0, b.CoreData.Length);
});
bl.GetLump(ninput, true, delegate(TextReader tr)
{
b.InputLog = new List<string>();
string line;
while ((line = tr.ReadLine()) != null)
b.InputLog.Add(line);
});
bl.GetLump(nframebuffer, true, delegate(Stream s, long length)
{
var vp = new QuickBmpFile.LoadedBMP();
QuickBmpFile.Load(vp, s);
b.OSDFrameBuffer = new BitmapBuffer(vp.BufferWidth, vp.BufferHeight, vp.VideoBuffer);
});
bl.GetLump(nlaglog, true, delegate(BinaryReader br)
{
b.LagLog = new TasLagLog();
b.LagLog.Load(br);
});
b.Markers = new TasMovieMarkerList(movie);
bl.GetLump(nmarkers, false, delegate (TextReader tr)
{
string line;
while ((line = tr.ReadLine()) != null)
{
if (!string.IsNullOrWhiteSpace(line))
{
b.Markers.Add(new TasMovieMarker(line));
}
}
});
Add(b);
nheader.Increment();
ncore.Increment();
ninput.Increment();
nframebuffer.Increment();
nlaglog.Increment();
nmarkers.Increment();
}
}
}
}

26
BizHawk.Client.Common/movie/tasproj/TasLagLog.cs
View File

@ -10,9 +10,9 @@ namespace BizHawk.Client.Common
public class TasLagLog
{
// TODO: Change this into a regular list.
private readonly List<bool> LagLog = new List<bool>();
private List<bool> LagLog = new List<bool>();
private readonly List<bool> WasLag = new List<bool>();
private List<bool> WasLag = new List<bool>();
public bool? this[int frame]
{
@ -155,6 +155,7 @@ namespace BizHawk.Client.Common
return null;
}
public int LastValidFrame
{
get
@ -164,5 +165,26 @@ namespace BizHawk.Client.Common
return LagLog.Count - 1;
}
}
public TasLagLog Clone()
{
var log = new TasLagLog();
log.LagLog = LagLog.ToList();
log.WasLag = WasLag.ToList();
return log;
}
public void FromLagLog(TasLagLog log)
{
LagLog = log.LagLog.ToList();
WasLag = log.WasLag.ToList();
}
public void StartFromFrame(int index)
{
LagLog.RemoveRange(0, index);
WasLag.RemoveRange(0, index);
}
}
}

17
BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs
View File

@ -164,12 +164,23 @@ namespace BizHawk.Client.Common
if (!batch.Where(a => a.GetType() != typeof(MovieActionMarker)).Any())
return Movie.InputLogLength;
return PreviousUndoFrame;
return PreviousRedoFrame;
}
public bool CanUndo { get { return UndoIndex > -1; } }
public bool CanRedo { get { return UndoIndex < History.Count - 1; } }
public string NextUndoStepName
{
get
{
if (Names.Count == 0)
return null;
else
return Names[UndoIndex];
}
}
public int PreviousUndoFrame
{
get
@ -180,7 +191,7 @@ namespace BizHawk.Client.Common
if (History[UndoIndex + 1].Count == 0)
return Movie.InputLogLength;
return History[UndoIndex + 1].Max(a => a.FirstFrame);
return History[UndoIndex + 1].Min(a => a.FirstFrame);
}
}
public int PreviousRedoFrame
@ -193,7 +204,7 @@ namespace BizHawk.Client.Common
if (History[UndoIndex].Count == 0)
return Movie.InputLogLength;
return History[UndoIndex].Max(a => a.FirstFrame);
return History[UndoIndex].Min(a => a.FirstFrame);
}
}

41
BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
View File

@ -78,6 +78,11 @@ namespace BizHawk.Client.Common
bs.PutLump(BinaryStateLump.Corestate, (BinaryWriter bw) => bw.Write(BinarySavestate));
}
}
else if (StartsFromSaveRam)
{
bs.PutLump(BinaryStateLump.MovieSaveRam, (BinaryWriter bw) => bw.Write(SaveRam));
}
ReportProgress(PROGRESS_STEP);
if (ClientSettingsForSave != null)
{
@ -90,13 +95,19 @@ namespace BizHawk.Client.Common
{
bs.PutLump(BinaryStateLump.VerificationLog, tw => tw.WriteLine(InputLogToString(VerificationLog)));
}
if (Branches.Any())
{
Branches.Save(bs);
}
ReportProgress(PROGRESS_STEP);
}
Changes = false;
}
public override bool Load()
public override bool Load(bool preload)
{
var file = new FileInfo(Filename);
if (!file.Exists)
@ -187,6 +198,14 @@ namespace BizHawk.Client.Common
TextSavestate = tr.ReadToEnd();
});
}
else if (StartsFromSaveRam)
{
bl.GetLump(BinaryStateLump.MovieSaveRam, false,
delegate(BinaryReader br, long length)
{
SaveRam = br.ReadBytes((int)length);
});
}
// TasMovie enhanced information
if (bl.HasLump(BinaryStateLump.LagLog))
@ -202,16 +221,20 @@ namespace BizHawk.Client.Common
StateManager.Settings.PopulateFromString(tr.ReadToEnd());
});
if (StateManager.Settings.SaveStateHistory)
if(!preload)
{
bl.GetLump(BinaryStateLump.StateHistory, false, delegate(BinaryReader br, long length)
if (StateManager.Settings.SaveStateHistory)
{
StateManager.Load(br);
});
bl.GetLump(BinaryStateLump.StateHistory, false, delegate(BinaryReader br, long length)
{
StateManager.Load(br);
});
}
// Movie should always have a state at frame 0.
if (!this.StartsFromSavestate)
StateManager.Capture();
}
// Movie should always have a state at frame 0.
if (!this.StartsFromSavestate)
StateManager.Capture();
bl.GetLump(BinaryStateLump.Markers, false, delegate(TextReader tr)
{
@ -263,6 +286,8 @@ namespace BizHawk.Client.Common
}
});
}
Branches.Load(bl, this);
}
Changes = false;

129
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -20,7 +20,9 @@ namespace BizHawk.Client.Common
private readonly TasStateManager StateManager;
private readonly TasLagLog LagLog = new TasLagLog();
private readonly Dictionary<int, IController> InputStateCache = new Dictionary<int, IController>();
private readonly List<string> VerificationLog = new List<string>(); // For movies that do not begin with power-on, this is the input required to get into the initial state
public readonly List<string> VerificationLog = new List<string>(); // For movies that do not begin with power-on, this is the input required to get into the initial state
public readonly TasBranchCollection Branches = new TasBranchCollection();
private BackgroundWorker _progressReportWorker = null;
public void NewBGWorker(BackgroundWorker newWorker)
@ -74,9 +76,44 @@ namespace BizHawk.Client.Common
BindMarkersToInput = true;
}
public TasLagLog TasLagLog { get { return LagLog; } }
public List<string> InputLog { get { return _log; } }
public TasMovieMarkerList Markers { get; set; }
public bool BindMarkersToInput { get; set; }
public bool UseInputCache { get; set; }
public int BranchCount { get { return Branches.Count; } }
public TasBranch GetBranch(int index)
{
if (index >= Branches.Count)
return null; // are we allowed?
else
return Branches[index];
}
public int BranchHashByIndex(int index)
{
if (index >= Branches.Count)
return -1;
else
return Branches[index].UniqueIdentifier.GetHashCode();
}
public int BranchIndexByHash(int hash)
{
TasBranch branch = Branches.Where(b => b.UniqueIdentifier.GetHashCode() == hash).SingleOrDefault();
if (branch == null)
return -1;
return Branches.IndexOf(branch);
}
public int BranchIndexByFrame(int frame)
{
TasBranch branch = Branches.Where(b => b.Frame == frame)
.OrderByDescending(b => b.TimeStamp).FirstOrDefault();
if (branch == null)
return -1;
return Branches.IndexOf(branch);
}
public override string PreferredExtension
{
@ -171,9 +208,13 @@ namespace BizHawk.Client.Common
private void InvalidateAfter(int frame)
{
LagLog.RemoveFrom(frame);
StateManager.Invalidate(frame + 1);
var anyInvalidated = StateManager.Invalidate(frame + 1);
Changes = true; // TODO check if this actually removed anything before flagging changes
base.Rerecords++;
if (anyInvalidated && Global.MovieSession.Movie.IsCountingRerecords)
{
base.Rerecords++;
}
}
/// <summary>
@ -279,8 +320,7 @@ namespace BizHawk.Client.Common
public void CopyVerificationLog(IEnumerable<string> log)
{
VerificationLog.Clear();
foreach (var entry in log)
foreach (string entry in log)
{
VerificationLog.Add(entry);
}
@ -450,5 +490,84 @@ namespace BizHawk.Client.Common
return true;
}
public void LoadBranch(TasBranch branch)
{
int? divergentPoint = DivergentPoint(_log, branch.InputLog);
_log = branch.InputLog.ToList();
//_changes = true;
LagLog.FromLagLog(branch.LagLog);
// if there are branch states, they will be loaded anyway
// but if there's none, or only *after* divergent point, don't invalidate the entire movie anymore
if (divergentPoint.HasValue)
StateManager.Invalidate(divergentPoint.Value);
else
StateManager.Invalidate(branch.InputLog.Count);
StateManager.LoadBranch(Branches.IndexOf(branch));
StateManager.SetState(branch.Frame, branch.CoreData);
//ChangeLog = branch.ChangeLog;
Markers = branch.Markers;
Changes = true;
}
// TODO: use LogGenerators rather than string comparisons
private int? DivergentPoint(List<string> currentLog, List<string> newLog)
{
int max = newLog.Count;
if (currentLog.Count < newLog.Count)
{
max = currentLog.Count;
}
for (int i = 0; i < max; i++)
{
if (newLog[i] != currentLog[i])
{
return i;
}
}
return null;
}
public void AddBranch(TasBranch branch)
{
Branches.Add(branch);
TasStateManager.AddBranch();
Changes = true;
}
public void RemoveBranch(TasBranch branch)
{
TasStateManager.RemoveBranch(Branches.IndexOf(branch));
Branches.Remove(branch);
Changes = true;
}
public void UpdateBranch(TasBranch old, TasBranch newBranch)
{
int index = Branches.IndexOf(old);
newBranch.UniqueIdentifier = old.UniqueIdentifier;
Branches[index] = newBranch;
TasStateManager.UpdateBranch(index);
Changes = true;
}
public void SwapBranches(int b1, int b2)
{
TasBranch branch = Branches[b1];
if (b2 >= Branches.Count)
b2 = Branches.Count - 1;
Branches.Remove(branch);
Branches.Insert(b2, branch);
Changes = true;
}
}
}

13
BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs
View File

@ -72,12 +72,21 @@ namespace BizHawk.Client.Common
public class TasMovieMarkerList : List<TasMovieMarker>
{
private readonly TasMovie _movie;
public TasMovieMarkerList(TasMovie movie)
{
_movie = movie;
}
public TasMovieMarkerList DeepClone()
{
TasMovieMarkerList ret = new TasMovieMarkerList(_movie);
for (int i = 0; i < this.Count; i++)
ret.Add(new TasMovieMarker(this[i].Frame, this[i].Message));
return ret;
}
public event NotifyCollectionChangedEventHandler CollectionChanged;
private void OnListChanged(NotifyCollectionChangedAction action)
@ -209,6 +218,8 @@ namespace BizHawk.Client.Common
{
if (this[i].Frame >= startFrame)
{
if (i == 0)
continue;
_movie.ChangeLog.AddMarkerChange(null, this[i].Frame, this[i].Message);
RemoveAt(i);
deletedCount++;

650
BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
View File

@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Text;
using System.Drawing;
using BizHawk.Common;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common.IEmulatorExtensions;
@ -14,7 +14,7 @@ namespace BizHawk.Client.Common
/// Captures savestates and manages the logic of adding, retrieving,
/// invalidating/clearing of states. Also does memory management and limiting of states
/// </summary>
public class TasStateManager
public class TasStateManager : IDisposable
{
// TODO: pass this in, and find a solution to a stale reference (this is instantiated BEFORE a new core instance is made, making this one stale if it is simply set in the constructor
private IStatable Core
@ -35,20 +35,27 @@ namespace BizHawk.Client.Common
}
}
private readonly SortedList<int, byte[]> States = new SortedList<int, byte[]>();
private List<StateManagerState> lowPriorityStates = new List<StateManagerState>();
internal NDBDatabase ndbdatabase;
private Guid guid = Guid.NewGuid();
private SortedList<int, StateManagerState> States = new SortedList<int, StateManagerState>();
private string statePath
{
get
{
return PathManager.MakeAbsolutePath(Global.Config.PathEntries["Global", "TAStudio states"].Path, null);
var basePath = PathManager.MakeAbsolutePath(Global.Config.PathEntries["Global", "TAStudio states"].Path, null);
return Path.Combine(basePath, guid.ToString());
}
}
private bool _isMountedForWrite;
private readonly TasMovie _movie;
private ulong _expectedStateSize = 0;
private int _minFrequency = VersionInfo.DeveloperBuild ? 2 : 1;
private const int _maxFrequency = 16;
private int StateFrequency
{
get
@ -70,7 +77,9 @@ namespace BizHawk.Client.Common
}
private int maxStates
{ get { return (int)(Settings.Cap / _expectedStateSize); } }
{
get { return (int)(Settings.Cap / _expectedStateSize) + (int)((ulong)Settings.DiskCapacitymb * 1024 * 1024 / _expectedStateSize); }
}
public TasStateManager(TasMovie movie)
{
@ -78,6 +87,30 @@ namespace BizHawk.Client.Common
Settings = new TasStateManagerSettings(Global.Config.DefaultTasProjSettings);
accessed = new List<StateManagerState>();
if (_movie.StartsFromSavestate)
SetState(0, _movie.BinarySavestate);
}
public void Dispose()
{
if (ndbdatabase != null)
ndbdatabase.Dispose();
//States and BranchStates don't need cleaning because they would only contain an ndbdatabase entry which was demolished by the above
}
/// <summary>
/// Mounts this instance for write access. Prior to that it's read-only
/// </summary>
public void MountWriteAccess()
{
if (_isMountedForWrite)
return;
_isMountedForWrite = true;
int limit = 0;
_expectedStateSize = (ulong)Core.SaveStateBinary().Length;
@ -87,13 +120,11 @@ namespace BizHawk.Client.Common
limit = maxStates;
}
States = new SortedList<int, byte[]>(limit);
if (Directory.Exists(statePath))
{
Directory.Delete(statePath, true); // To delete old files that may still exist.
}
Directory.CreateDirectory(statePath);
accessed = new List<int>();
States = new SortedList<int, StateManagerState>(limit);
if (_expectedStateSize > int.MaxValue)
throw new InvalidOperationException();
ndbdatabase = new NDBDatabase(statePath, Settings.DiskCapacitymb * 1024 * 1024, (int)_expectedStateSize);
}
public TasStateManagerSettings Settings { get; set; }
@ -107,22 +138,17 @@ namespace BizHawk.Client.Common
{
get
{
if (frame == 0 && _movie.StartsFromSavestate)
{
return new KeyValuePair<int, byte[]>(0, _movie.BinarySavestate);
}
if (States.ContainsKey(frame))
{
// if (States[frame] == null) // Get from file
StateAccessed(frame);
return new KeyValuePair<int, byte[]>(frame, States[frame]);
return new KeyValuePair<int, byte[]>(frame, States[frame].State);
}
return new KeyValuePair<int, byte[]>(-1, new byte[0]);
}
}
private List<int> accessed;
private List<StateManagerState> accessed;
public byte[] InitialState
{
@ -133,7 +159,7 @@ namespace BizHawk.Client.Common
return _movie.BinarySavestate;
}
return States[0];
return States[0].State;
}
}
@ -169,54 +195,116 @@ namespace BizHawk.Client.Common
if (shouldCapture)
{
SetState(frame, (byte[])Core.SaveStateBinary().Clone());
SetState(frame, (byte[])Core.SaveStateBinary().Clone(), skipRemoval: false);
}
}
private void MaybeRemoveState()
private void MaybeRemoveStates()
{
int shouldRemove = -1;
if (Used + DiskUsed > Settings.CapTotal)
shouldRemove = StateToRemove();
if (shouldRemove != -1)
// Loop, because removing a state that has a duplicate won't save any space
while (Used > Settings.Cap || DiskUsed > (ulong)Settings.DiskCapacitymb * 1024 * 1024)
{
RemoveState(States.ElementAt(shouldRemove).Key);
Point shouldRemove = StateToRemove();
RemoveState(shouldRemove.X, shouldRemove.Y);
}
if (Used > Settings.Cap)
{
int lastMemState = -1;
do { lastMemState++; } while (States[accessed[lastMemState]] == null);
MoveStateToDisk(accessed[lastMemState]);
do { lastMemState++; } while (States[accessed[lastMemState].Frame] == null);
MoveStateToDisk(accessed[lastMemState].Frame);
}
}
private int StateToRemove()
{
int markerSkips = maxStates / 3;
int shouldRemove = _movie.StartsFromSavestate ? -1 : 0;
/// <summary>
/// X is the frame of the state, Y is the branch (-1 for current).
/// </summary>
private Point StateToRemove()
{
// X is frame, Y is branch
Point shouldRemove = new Point(-1, -1);
if (BranchStates.Any() && Settings.EraseBranchStatesFirst)
{
var kvp = BranchStates.Count() > 1 ? BranchStates.ElementAt(1) : BranchStates.ElementAt(0);
shouldRemove.X = kvp.Key;
shouldRemove.Y = kvp.Value.Keys[0];
return shouldRemove;
}
int i = 0;
int markerSkips = maxStates / 2;
// lowPrioritySates (e.g. states with only lag frames between them)
do
{
shouldRemove++;
// No need to have two savestates with only lag frames between them.
for (int i = shouldRemove; i < States.Count - 1; i++)
{
if (AllLag(States.ElementAt(i).Key, States.ElementAt(i + 1).Key))
{
shouldRemove = i;
break;
}
}
if (lowPriorityStates.Count > i)
shouldRemove = findState(lowPriorityStates[i]);
else
break;
// Keep marker states
markerSkips--;
if (markerSkips < 0)
shouldRemove = _movie.StartsFromSavestate ? 0 : 1;
} while (_movie.Markers.IsMarker(States.ElementAt(shouldRemove).Key + 1) && markerSkips > -1);
shouldRemove.X = -1;
i++;
} while (StateIsMarker(shouldRemove.X, shouldRemove.Y) && markerSkips > -1 || shouldRemove.X == 0);
// by last accessed
markerSkips = maxStates / 2;
if (shouldRemove.X < 1)
{
i = 0;
do
{
if (accessed.Count > i)
shouldRemove = findState(accessed[i]);
else
break;
// Keep marker states
markerSkips--;
if (markerSkips < 0)
shouldRemove.X = -1;
i++;
} while (StateIsMarker(shouldRemove.X, shouldRemove.Y) && markerSkips > -1 || shouldRemove.X == 0);
}
if (shouldRemove.X < 1) // only found marker states above
{
if (BranchStates.Any() && !Settings.EraseBranchStatesFirst)
{
var kvp = BranchStates.Count() > 1 ? BranchStates.ElementAt(1) : BranchStates.ElementAt(0);
shouldRemove.X = kvp.Key;
shouldRemove.Y = kvp.Value.Keys[0];
}
else
{
StateManagerState s = States.Values[1];
shouldRemove.X = s.Frame;
shouldRemove.Y = -1;
}
}
return shouldRemove;
}
private bool StateIsMarker(int frame, int branch)
{
if (frame == -1)
return false;
if (branch == -1)
return _movie.Markers.IsMarker(States[frame].Frame + 1);
else
{
if (_movie.GetBranch(_movie.BranchIndexByHash(branch)).Markers == null)
return _movie.Markers.IsMarker(States[frame].Frame + 1);
else
return _movie.GetBranch(branch).Markers.Any(m => m.Frame + 1 == frame);
}
}
private bool AllLag(int from, int upTo)
{
if (upTo >= Global.Emulator.Frame)
@ -237,71 +325,94 @@ namespace BizHawk.Client.Common
private void MoveStateToDisk(int index)
{
// Save
string path = Path.Combine(statePath, index.ToString());
File.WriteAllBytes(path, States[index]);
DiskUsed += _expectedStateSize;
// Remove from RAM
Used -= (ulong)States[index].Length;
States[index] = null;
States[index].MoveToDisk();
}
private void MoveStateToMemory(int index)
{
// Load
string path = Path.Combine(statePath, index.ToString());
byte[] loadData = File.ReadAllBytes(path);
DiskUsed -= _expectedStateSize;
// States list
Used += (ulong)loadData.Length;
States[index] = loadData;
File.Delete(path);
States[index].MoveToRAM();
Used += (ulong)States[index].Length;
}
private void SetState(int frame, byte[] state)
internal void SetState(int frame, byte[] state, bool skipRemoval = true)
{
if (!skipRemoval) // skipRemoval: false only when capturing new states
MaybeRemoveStates(); // Remove before adding so this state won't be removed.
if (States.ContainsKey(frame))
{
States[frame] = state;
MaybeRemoveState(); // Also does moving to disk
if (stateHasDuplicate(frame, -1) != -2)
Used += (ulong)state.Length;
States[frame].State = state;
}
else
{
Used += (ulong)state.Length;
MaybeRemoveState(); // Remove before adding so this state won't be removed.
States.Add(frame, state);
States.Add(frame, new StateManagerState(this, state, frame));
}
StateAccessed(frame);
}
private void RemoveState(int index)
{
if (States[index] == null)
int i = States.IndexOfKey(frame);
if (i > 0 && AllLag(States.Keys[i - 1], States.Keys[i]))
{
DiskUsed -= _expectedStateSize; // Disk length?
string path = Path.Combine(statePath, index.ToString());
File.Delete(path);
lowPriorityStates.Add(States[frame]);
}
}
private void RemoveState(int frame, int branch = -1)
{
if (branch == -1)
accessed.Remove(States[frame]);
else if (accessed.Contains(BranchStates[frame][branch]) && !Settings.EraseBranchStatesFirst)
accessed.Remove(BranchStates[frame][branch]);
StateManagerState state;
bool hasDuplicate = stateHasDuplicate(frame, branch) != -2;
if (branch == -1)
{
state = States[frame];
if (States[frame].IsOnDisk)
States[frame].Dispose();
else
Used -= (ulong)States[frame].Length;
States.RemoveAt(States.IndexOfKey(frame));
}
else
Used -= (ulong)States[index].Length;
States.RemoveAt(States.IndexOfKey(index));
accessed.Remove(index);
}
private void StateAccessed(int index)
{
bool removed = accessed.Remove(index);
accessed.Add(index);
if (States[index] == null)
{
if (States[accessed[0]] != null)
MoveStateToDisk(accessed[0]);
MoveStateToMemory(index);
state = BranchStates[frame][branch];
if (BranchStates[frame][branch].IsOnDisk)
BranchStates[frame][branch].Dispose();
else
Used -= (ulong)BranchStates[frame][branch].Length;
BranchStates[frame].RemoveAt(BranchStates[frame].IndexOfKey(branch));
if (BranchStates[frame].Count == 0)
BranchStates.Remove(frame);
}
if (!removed && accessed.Count > (int)(Used / _expectedStateSize))
if (!hasDuplicate)
lowPriorityStates.Remove(state);
}
private void StateAccessed(int frame)
{
if (frame == 0 && _movie.StartsFromSavestate)
return;
StateManagerState state = States[frame];
bool removed = accessed.Remove(state);
accessed.Add(state);
if (States[frame].IsOnDisk)
{
if (!States[accessed[0].Frame].IsOnDisk)
MoveStateToDisk(accessed[0].Frame);
MoveStateToMemory(frame);
}
if (!removed && accessed.Count > maxStates)
accessed.RemoveAt(0);
}
@ -318,8 +429,10 @@ namespace BizHawk.Client.Common
/// <summary>
/// Clears out all savestates after the given frame number
/// </summary>
public void Invalidate(int frame)
public bool Invalidate(int frame)
{
bool anyInvalidated = false;
if (Any())
{
if (!_movie.StartsFromSavestate && frame == 0) // Never invalidate frame 0 on a non-savestate-anchored movie
@ -327,21 +440,18 @@ namespace BizHawk.Client.Common
frame = 1;
}
var statesToRemove = States
.Where(x => x.Key >= frame)
.ToList();
foreach (var state in statesToRemove)
{
if (state.Value == null)
DiskUsed -= _expectedStateSize; // Length??
else
Used -= (ulong)state.Value.Length;
accessed.Remove(state.Key);
States.Remove(state.Key);
}
List<KeyValuePair<int, StateManagerState>> statesToRemove =
States.Where(x => x.Key >= frame).ToList();
anyInvalidated = statesToRemove.Any();
foreach (KeyValuePair<int, StateManagerState> state in statesToRemove)
RemoveState(state.Key);
CallInvalidateCallback(frame);
}
return anyInvalidated;
}
/// <summary>
@ -353,52 +463,55 @@ namespace BizHawk.Client.Common
States.Clear();
accessed.Clear();
Used = 0;
DiskUsed = 0;
clearDiskStates();
}
public void ClearStateHistory()
{
if (States.Any())
{
KeyValuePair<int, byte[]> power = States.FirstOrDefault(s => s.Key == 0);
if (power.Value == null)
{
StateAccessed(power.Key);
power = States.FirstOrDefault(s => s.Key == 0);
}
StateManagerState power = States.Values.FirstOrDefault(s => s.Frame == 0);
StateAccessed(power.Frame);
States.Clear();
accessed.Clear();
if (power.Value.Length > 0)
{
SetState(0, power.Value);
Used = (ulong)power.Value.Length;
}
else
{
Used = 0;
DiskUsed = 0;
}
SetState(0, power.State);
Used = (ulong)power.State.Length;
clearDiskStates();
}
}
public void Save(BinaryWriter bw)
private void clearDiskStates()
{
List<int> noSave = ExcludeStates();
bw.Write(States.Count - noSave.Count);
for (int i = 0; i < States.Count; i++)
{
if (noSave.Contains(i))
continue;
StateAccessed(States.ElementAt(i).Key);
KeyValuePair<int, byte[]> kvp = States.ElementAt(i);
bw.Write(kvp.Key);
bw.Write(kvp.Value.Length);
bw.Write(kvp.Value);
}
if (ndbdatabase != null)
ndbdatabase.Clear();
}
/// <summary>
/// Deletes/moves states to follow the state storage size limits.
/// Used after changing the settings.
/// </summary>
public void LimitStateCount()
{
while (Used + DiskUsed > Settings.CapTotal)
{
Point s = StateToRemove();
RemoveState(s.X, s.Y);
}
int index = -1;
while (DiskUsed > (ulong)Settings.DiskCapacitymb * 1024uL * 1024uL)
{
do { index++; } while (!accessed[index].IsOnDisk);
accessed[index].MoveToRAM();
}
if (Used > Settings.Cap)
MaybeRemoveStates();
}
private List<int> ExcludeStates()
{
List<int> ret = new List<int>();
@ -412,7 +525,7 @@ namespace BizHawk.Client.Common
index++;
} while (_movie.Markers.IsMarker(States.ElementAt(index).Key + 1));
ret.Add(index);
if (States.ElementAt(index).Value == null)
if (States.ElementAt(index).Value.IsOnDisk)
saveUsed -= _expectedStateSize;
else
saveUsed -= (ulong)States.ElementAt(index).Value.Length;
@ -424,7 +537,7 @@ namespace BizHawk.Client.Common
{
index++;
ret.Add(index);
if (States.ElementAt(index).Value == null)
if (States.ElementAt(index).Value.IsOnDisk)
saveUsed -= _expectedStateSize;
else
saveUsed -= (ulong)States.ElementAt(index).Value.Length;
@ -433,6 +546,41 @@ namespace BizHawk.Client.Common
return ret;
}
public void Save(BinaryWriter bw)
{
List<int> noSave = ExcludeStates();
bw.Write(States.Count - noSave.Count);
for (int i = 0; i < States.Count; i++)
{
if (noSave.Contains(i))
continue;
StateAccessed(States.ElementAt(i).Key);
KeyValuePair<int, StateManagerState> kvp = States.ElementAt(i);
bw.Write(kvp.Key);
bw.Write(kvp.Value.Length);
bw.Write(kvp.Value.State);
}
bw.Write(currentBranch);
if (Settings.BranchStatesInTasproj)
{
bw.Write(BranchStates.Count);
foreach (var s in BranchStates)
{
bw.Write(s.Key);
bw.Write(s.Value.Count);
foreach (var t in s.Value)
{
bw.Write(t.Key);
t.Value.Write(bw);
}
}
}
}
public void Load(BinaryReader br)
{
States.Clear();
@ -444,11 +592,39 @@ namespace BizHawk.Client.Common
int frame = br.ReadInt32();
int len = br.ReadInt32();
byte[] data = br.ReadBytes(len);
// whether we should allow state removal check here is an interesting question
// nothing was edited yet, so it might make sense to show the project untouched first
SetState(frame, data);
//States.Add(frame, data);
//Used += len;
}
//}
try
{
currentBranch = br.ReadInt32();
if (Settings.BranchStatesInTasproj)
{
int c = br.ReadInt32();
BranchStates = new SortedList<int, SortedList<int, StateManagerState>>(c);
while (c > 0)
{
int key = br.ReadInt32();
int c2 = br.ReadInt32();
var list = new SortedList<int, StateManagerState>(c2);
while (c2 > 0)
{
int key2 = br.ReadInt32();
var state = StateManagerState.Read(br, this);
list.Add(key2, state);
c2--;
}
BranchStates.Add(key, list);
c--;
}
}
}
catch (EndOfStreamException) { }
}
public KeyValuePair<int, byte[]> GetStateClosestToFrame(int frame)
@ -465,15 +641,15 @@ namespace BizHawk.Client.Common
// 4 bytes - length of savestate
// 0 - n savestate
private ulong Used
{
get;
set;
}
private ulong Used { get; set; }
private ulong DiskUsed
{
get;
set;
get
{
if (ndbdatabase == null) return 0;
else return (ulong)ndbdatabase.Consumed;
}
}
public int StateCount
@ -519,5 +695,185 @@ namespace BizHawk.Client.Common
return 0;
}
}
#region "Branches"
private SortedList<int, SortedList<int, StateManagerState>> BranchStates = new SortedList<int, SortedList<int, StateManagerState>>();
private int currentBranch = -1;
/// <summary>
/// Checks if the state at frame in the given branch (-1 for current) has any duplicates.
/// </summary>
/// <returns>Index of the branch (-1 for current) of the first match. If no match, returns -2.</returns>
private int stateHasDuplicate(int frame, int branchHash)
{
StateManagerState stateToMatch;
// figure out what state we're checking
if (branchHash == -1)
stateToMatch = States[frame];
else
{
if (!BranchStates[frame].ContainsKey(branchHash))
return -2;
stateToMatch = BranchStates[frame][branchHash];
//if (States.ContainsKey(frame) && States[frame] == stateToMatch)
// return -1;
}
// there's no state for that frame at all
if (!BranchStates.ContainsKey(frame))
return -2;
// find the branches whose state for that frame is the same
SortedList<int, StateManagerState> stateList = BranchStates[frame];
for (int i = 0; i < _movie.BranchCount; i++)
{
if (i == _movie.BranchIndexByHash(branchHash))
continue;
if (stateList != null && stateList.ContainsKey(i) && stateList[i] == stateToMatch)
return i;
}
return -2;
}
private Point findState(StateManagerState s)
{
Point ret = new Point(0, -1);
ret.X = s.Frame;
if (!States.ContainsValue(s))
{
if (BranchStates.ContainsKey(s.Frame))
{
int index = BranchStates[s.Frame].Values.IndexOf(s);
ret.Y = BranchStates[s.Frame].Keys.ElementAt(index);
}
if (ret.Y == -1)
return new Point(-1, -2);
}
return ret;
}
public void AddBranch()
{
int branchHash = _movie.BranchHashByIndex(_movie.BranchCount - 1);
foreach (KeyValuePair<int, StateManagerState> kvp in States)
{
if (!BranchStates.ContainsKey(kvp.Key))
BranchStates.Add(kvp.Key, new SortedList<int, StateManagerState>());
SortedList<int, StateManagerState> stateList = BranchStates[kvp.Key];
if (stateList == null) // when does this happen?
{
stateList = new SortedList<int, StateManagerState>();
BranchStates[kvp.Key] = stateList;
}
stateList.Add(branchHash, kvp.Value);
Used += (ulong)stateList[branchHash].Length;
}
currentBranch = _movie.BranchCount;
}
public void RemoveBranch(int index)
{
int branchHash = _movie.BranchHashByIndex(index);
foreach (KeyValuePair<int, SortedList<int, StateManagerState>> kvp in BranchStates.ToList())
{
SortedList<int, StateManagerState> stateList = kvp.Value;
if (stateList == null)
continue;
if (stateHasDuplicate(kvp.Key, branchHash) == -2)
{
if (stateList.ContainsKey(branchHash))
{
if (stateList[branchHash].IsOnDisk)
{ }
else
Used -= (ulong)stateList[branchHash].Length;
}
}
stateList.Remove(branchHash);
if (stateList.Count == 0)
BranchStates.Remove(kvp.Key);
}
if (currentBranch > index)
currentBranch--;
else if (currentBranch == index)
currentBranch = -1;
}
public void UpdateBranch(int index)
{
int branchHash = _movie.BranchHashByIndex(index);
// RemoveBranch
foreach (KeyValuePair<int, SortedList<int, StateManagerState>> kvp in BranchStates.ToList())
{
SortedList<int, StateManagerState> stateList = kvp.Value;
if (stateList == null)
continue;
if (stateHasDuplicate(kvp.Key, branchHash) == -2)
{
if (stateList.ContainsKey(branchHash))
{
if (stateList[branchHash].IsOnDisk)
{ }
else
Used -= (ulong)stateList[branchHash].Length;
}
}
stateList.Remove(branchHash);
if (stateList.Count == 0)
BranchStates.Remove(kvp.Key);
}
// AddBranch
foreach (KeyValuePair<int, StateManagerState> kvp in States)
{
if (!BranchStates.ContainsKey(kvp.Key))
BranchStates.Add(kvp.Key, new SortedList<int, StateManagerState>());
SortedList<int, StateManagerState> stateList = BranchStates[kvp.Key];
if (stateList == null)
{
stateList = new SortedList<int, StateManagerState>();
BranchStates[kvp.Key] = stateList;
}
stateList.Add(branchHash, kvp.Value);
Used += (ulong)stateList[branchHash].Length;
}
currentBranch = index;
}
public void LoadBranch(int index)
{
int branchHash = _movie.BranchHashByIndex(index);
//Invalidate(0); // Not a good way of doing it?
foreach (KeyValuePair<int, SortedList<int, StateManagerState>> kvp in BranchStates)
{
if (kvp.Key == 0 && States.ContainsKey(0))
continue; // TODO: It might be a better idea to just not put state 0 in BranchStates.
if (kvp.Value.ContainsKey(branchHash))
SetState(kvp.Key, kvp.Value[branchHash].State);
}
currentBranch = index;
}
#endregion
}
}

32
BizHawk.Client.Common/movie/tasproj/TasStateManagerSettings.cs
View File

@ -13,6 +13,8 @@ namespace BizHawk.Client.Common
DiskSaveCapacitymb = 512;
Capacitymb = 512;
DiskCapacitymb = 512;
BranchStatesInTasproj = false;
EraseBranchStatesFirst = true;
}
public TasStateManagerSettings(TasStateManagerSettings settings)
@ -20,6 +22,8 @@ namespace BizHawk.Client.Common
DiskSaveCapacitymb = settings.DiskSaveCapacitymb;
Capacitymb = settings.Capacitymb;
DiskCapacitymb = settings.DiskCapacitymb;
BranchStatesInTasproj = settings.BranchStatesInTasproj;
EraseBranchStatesFirst = settings.EraseBranchStatesFirst;
}
/// <summary>
@ -50,6 +54,20 @@ namespace BizHawk.Client.Common
[Description("The size limit of the state history buffer on the disk. When this limit is reached it will start removing previous savestates")]
public int DiskCapacitymb { get; set; }
/// <summary>
/// Put branch states to .tasproj
/// </summary>
[DisplayName("Put branch states to .tasproj")]
[Description("Put branch states to .tasproj")]
public bool BranchStatesInTasproj { get; set; }
/// <summary>
/// Erase branch states before greenzone states when capacity is met
/// </summary>
[DisplayName("Erase branch states first")]
[Description("Erase branch states before greenzone states when capacity is met")]
public bool EraseBranchStatesFirst { get; set; }
/// <summary>
/// The total state capacity in bytes.
/// </summary>
@ -77,6 +95,8 @@ namespace BizHawk.Client.Common
sb.AppendLine(DiskSaveCapacitymb.ToString());
sb.AppendLine(Capacitymb.ToString());
sb.AppendLine(DiskCapacitymb.ToString());
sb.AppendLine(BranchStatesInTasproj.ToString());
sb.AppendLine(EraseBranchStatesFirst.ToString());
return sb.ToString();
}
@ -88,6 +108,7 @@ namespace BizHawk.Client.Common
string[] lines = settings.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
Capacitymb = int.Parse(lines[1]);
int refCapacity;
if (!int.TryParse(lines[0], out refCapacity))
{
if (bool.Parse(lines[0]))
@ -97,10 +118,21 @@ namespace BizHawk.Client.Common
}
else
DiskSaveCapacitymb = refCapacity;
if (lines.Length > 2)
DiskCapacitymb = int.Parse(lines[2]);
else
DiskCapacitymb = 512;
if (lines.Length > 3)
BranchStatesInTasproj = bool.Parse(lines[3]);
else
BranchStatesInTasproj = false;
if (lines.Length > 4)
EraseBranchStatesFirst = bool.Parse(lines[4]);
else
EraseBranchStatesFirst = true;
}
}
}

12
BizHawk.Client.Common/tools/CheatList.cs
View File

@ -164,6 +164,18 @@ namespace BizHawk.Client.Common
Changes = true;
}
public bool Exchange(Cheat oldCheat, Cheat newCheat)
{
int index = _cheatList.IndexOf(oldCheat);
if (index == -1)
return false;
_cheatList[index] = newCheat;
Changes = true;
return true;
}
public bool Remove(Cheat c)
{
var result = _cheatList.Remove(c);

4
BizHawk.Client.DiscoHawk/DiscoHawk.cs
View File

@ -366,7 +366,7 @@ namespace BizHawk.Client.DiscoHawk
if (!item.Exists)
sw.Write("(---missing---)");
else
sw.Write("({0:X2} - {1})", (byte)item.Control, item.LBATimestamp);
sw.Write("({0:X2} - {1})", (byte)item.Control, item.LBA);
};
@ -399,7 +399,7 @@ namespace BizHawk.Client.DiscoHawk
{
if (src_toc.TOCItems[t].Exists != dst_toc.TOCItems[t].Exists
|| src_toc.TOCItems[t].Control != dst_toc.TOCItems[t].Control
|| src_toc.TOCItems[t].LBATimestamp.Sector != dst_toc.TOCItems[t].LBATimestamp.Sector
|| src_toc.TOCItems[t].LBA != dst_toc.TOCItems[t].LBA
)
{
sw.WriteLine("Mismatch in TOCItem");

12
BizHawk.Client.DiscoHawk/MainDiscoForm.cs
View File

@ -47,7 +47,15 @@ namespace BizHawk.Client.DiscoHawk
this.Cursor = Cursors.WaitCursor;
foreach (var file in files)
{
var disc = Disc.LoadAutomagic(file);
var job = new DiscMountJob { IN_FromPath = file };
job.Run();
var disc = job.OUT_Disc;
if (job.OUT_ErrorLevel)
{
System.Windows.Forms.MessageBox.Show(job.OUT_Log, "Error loading disc");
break;
}
string baseName = Path.GetFileNameWithoutExtension(file);
baseName += "_hawked";
string outfile = Path.Combine(Path.GetDirectoryName(file), baseName) + ".ccd";
@ -57,7 +65,7 @@ namespace BizHawk.Client.DiscoHawk
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "oops! error");
MessageBox.Show(ex.ToString(), "Error loading disc");
throw;
}
}

2
BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
View File

@ -82,7 +82,7 @@ namespace BizHawk.Client.EmuHawk
{
ffmpeg = new Process();
#if WINDOWS
ffmpeg.StartInfo.FileName = System.IO.Path.Combine(PathManager.GetBasePathAbsolute(), "dll", "ffmpeg.exe");
ffmpeg.StartInfo.FileName = System.IO.Path.Combine(PathManager.GetDllDirectory(), "dll", "ffmpeg.exe");
#else
ffmpeg.StartInfo.FileName = "ffmpeg"; // expecting native version to be in path
#endif

89
BizHawk.Client.EmuHawk/AboutBox.Designer.cs generated
View File

@ -35,7 +35,6 @@
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.HR = new BizHawk.Client.EmuHawk.HorizontalLine();
this.label5 = new System.Windows.Forms.Label();
this.mom2 = new System.Windows.Forms.PictureBox();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
@ -43,9 +42,14 @@
this.pictureBox4 = new System.Windows.Forms.PictureBox();
this.pictureBox3 = new System.Windows.Forms.PictureBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.pictureBox5 = new BizHawk.Client.EmuHawk.MyViewportPanel();
this.CloseBtn = new System.Windows.Forms.Button();
this.btnBizBox = new System.Windows.Forms.Button();
this.tbBranch = new System.Windows.Forms.TextBox();
this.tbCommit = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.pictureBox5 = new BizHawk.Client.EmuHawk.MyViewportPanel();
this.HR = new BizHawk.Client.EmuHawk.HorizontalLine();
((System.ComponentModel.ISupportInitialize)(this.mom2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mom1)).BeginInit();
@ -100,15 +104,6 @@
this.label4.TabIndex = 5;
this.label4.Text = "(LEVAR BURTON\r\nCAMEO)";
//
// HR
//
this.HR.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.HR.Location = new System.Drawing.Point(349, 213);
this.HR.Name = "HR";
this.HR.Size = new System.Drawing.Size(158, 2);
this.HR.TabIndex = 4;
this.HR.Text = "COPYRITE 2001";
//
// label5
//
this.label5.AutoSize = true;
@ -178,17 +173,9 @@
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
//
// pictureBox5
//
this.pictureBox5.Enabled = false;
this.pictureBox5.Location = new System.Drawing.Point(71, 223);
this.pictureBox5.Name = "pictureBox5";
this.pictureBox5.Size = new System.Drawing.Size(376, 48);
this.pictureBox5.TabIndex = 15;
this.pictureBox5.TabStop = false;
//
// CloseBtn
//
this.CloseBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.CloseBtn.Location = new System.Drawing.Point(424, 462);
this.CloseBtn.Name = "CloseBtn";
this.CloseBtn.Size = new System.Drawing.Size(75, 23);
@ -200,6 +187,7 @@
//
// btnBizBox
//
this.btnBizBox.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnBizBox.Location = new System.Drawing.Point(-4, -3);
this.btnBizBox.Name = "btnBizBox";
this.btnBizBox.Size = new System.Drawing.Size(75, 23);
@ -208,12 +196,69 @@
this.btnBizBox.UseVisualStyleBackColor = true;
this.btnBizBox.Click += new System.EventHandler(this.btnBizBox_Click);
//
// tbBranch
//
this.tbBranch.Location = new System.Drawing.Point(49, 476);
this.tbBranch.Name = "tbBranch";
this.tbBranch.ReadOnly = true;
this.tbBranch.Size = new System.Drawing.Size(100, 20);
this.tbBranch.TabIndex = 20;
//
// tbCommit
//
this.tbCommit.Location = new System.Drawing.Point(203, 476);
this.tbCommit.Name = "tbCommit";
this.tbCommit.ReadOnly = true;
this.tbCommit.Size = new System.Drawing.Size(100, 20);
this.tbCommit.TabIndex = 20;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(2, 479);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(44, 13);
this.label6.TabIndex = 21;
this.label6.Text = "Branch:";
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(155, 479);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(44, 13);
this.label7.TabIndex = 22;
this.label7.Text = "Commit:";
//
// pictureBox5
//
this.pictureBox5.Enabled = false;
this.pictureBox5.Location = new System.Drawing.Point(71, 223);
this.pictureBox5.Name = "pictureBox5";
this.pictureBox5.Size = new System.Drawing.Size(376, 48);
this.pictureBox5.TabIndex = 15;
this.pictureBox5.TabStop = false;
//
// HR
//
this.HR.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.HR.Location = new System.Drawing.Point(349, 213);
this.HR.Name = "HR";
this.HR.Size = new System.Drawing.Size(158, 2);
this.HR.TabIndex = 4;
this.HR.Text = "COPYRITE 2001";
//
// AboutBox
//
this.AcceptButton = this.CloseBtn;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CloseBtn;
this.ClientSize = new System.Drawing.Size(519, 497);
this.Controls.Add(this.label7);
this.Controls.Add(this.label6);
this.Controls.Add(this.tbCommit);
this.Controls.Add(this.tbBranch);
this.Controls.Add(this.btnBizBox);
this.Controls.Add(this.CloseBtn);
this.Controls.Add(this.pictureBox5);
@ -268,5 +313,9 @@
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Button CloseBtn;
private System.Windows.Forms.Button btnBizBox;
private System.Windows.Forms.TextBox tbBranch;
private System.Windows.Forms.TextBox tbCommit;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label7;
}
}

7
BizHawk.Client.EmuHawk/AboutBox.cs
View File

@ -37,6 +37,9 @@ namespace BizHawk.Client.EmuHawk
pictureBox2.BringToFront();
pictureBox1.BringToFront();
pictureBox5.Visible = false;
tbBranch.Text = SubWCRev.GIT_BRANCH;
tbCommit.Text = SubWCRev.GIT_SHORTHASH;
}
protected override void OnClosed(EventArgs e)
@ -160,9 +163,9 @@ namespace BizHawk.Client.EmuHawk
private void AboutBox_Load(object sender, EventArgs e)
{
#if DEBUG
Text = "BizHawk Developer Build (DEBUG MODE) GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH;
Text = "BizHawk Developer Build (DEBUG MODE) GIT " + SubWCRev.GIT_BRANCH + "#" + SubWCRev.GIT_SHORTHASH;
#else
Text = "BizHawk Developer Build (RELEASE MODE) GIT " + SubWCRev.GIT_BRANCH + "-"+SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH;
Text = "BizHawk Developer Build (RELEASE MODE) GIT " + SubWCRev.GIT_BRANCH + "#" + SubWCRev.GIT_SHORTHASH;
#endif
if (DateTime.Now.Month == 12)
if (DateTime.Now.Day > 17 && DateTime.Now.Day <= 25)

51
BizHawk.Client.EmuHawk/BizBox.Designer.cs generated
View File

@ -36,7 +36,6 @@
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.VersionLabel = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
@ -44,6 +43,9 @@
this.label37 = new System.Windows.Forms.Label();
this.CoreInfoPanel = new System.Windows.Forms.Panel();
this.textBox1 = new System.Windows.Forms.TextBox();
this.VersionLabel = new System.Windows.Forms.Label();
this.btnCopyHash = new System.Windows.Forms.Button();
this.linkLabel2 = new System.Windows.Forms.LinkLabel();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
@ -119,14 +121,6 @@
this.label4.TabIndex = 6;
this.label4.Text = "A multi-Platform Emulator";
//
// VersionLabel
//
this.VersionLabel.AutoSize = true;
this.VersionLabel.Location = new System.Drawing.Point(198, 52);
this.VersionLabel.Name = "VersionLabel";
this.VersionLabel.Size = new System.Drawing.Size(0, 13);
this.VersionLabel.TabIndex = 7;
//
// label5
//
this.label5.AutoSize = true;
@ -196,6 +190,39 @@
this.textBox1.TabIndex = 16;
this.textBox1.Text = "jabo_direct3d8_patched.dll is distributed with the special permission of the auth" +
"or.";
//
// VersionLabel
//
this.VersionLabel.AutoSize = true;
this.VersionLabel.Location = new System.Drawing.Point(198, 52);
this.VersionLabel.Name = "VersionLabel";
this.VersionLabel.Size = new System.Drawing.Size(0, 13);
this.VersionLabel.TabIndex = 7;
//
// btnCopyHash
//
this.btnCopyHash.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCopyHash.AutoSize = true;
this.btnCopyHash.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.btnCopyHash.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate;
this.btnCopyHash.Location = new System.Drawing.Point(12, 505);
this.btnCopyHash.Name = "btnCopyHash";
this.btnCopyHash.Size = new System.Drawing.Size(22, 22);
this.btnCopyHash.TabIndex = 18;
this.btnCopyHash.UseVisualStyleBackColor = true;
this.btnCopyHash.Click += new System.EventHandler(this.btnCopyHash_Click);
//
// linkLabel2
//
this.linkLabel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.linkLabel2.AutoSize = true;
this.linkLabel2.Location = new System.Drawing.Point(40, 509);
this.linkLabel2.Name = "linkLabel2";
this.linkLabel2.Size = new System.Drawing.Size(100, 13);
this.linkLabel2.TabIndex = 19;
this.linkLabel2.TabStop = true;
this.linkLabel2.Text = "Commit #XXXXXXX";
this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
//
// BizBox
//
@ -204,6 +231,8 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.OK;
this.ClientSize = new System.Drawing.Size(448, 536);
this.Controls.Add(this.linkLabel2);
this.Controls.Add(this.btnCopyHash);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.CoreInfoPanel);
this.Controls.Add(this.label37);
@ -240,7 +269,6 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label VersionLabel;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label7;
@ -248,5 +276,8 @@
private System.Windows.Forms.Label label37;
private System.Windows.Forms.Panel CoreInfoPanel;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Label VersionLabel;
private System.Windows.Forms.Button btnCopyHash;
private System.Windows.Forms.LinkLabel linkLabel2;
}
}

16
BizHawk.Client.EmuHawk/BizBox.cs
View File

@ -28,11 +28,11 @@ namespace BizHawk.Client.EmuHawk
{
if (VersionInfo.DeveloperBuild)
{
Text = " BizHawk (GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH + ")";
Text = " BizHawk (GIT " + SubWCRev.GIT_BRANCH + "#" + SubWCRev.GIT_SHORTHASH + ")";
}
else
{
Text = "Version " + VersionInfo.MAINVERSION + " (GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH + ")";
Text = "Version " + VersionInfo.MAINVERSION + " (GIT " + SubWCRev.GIT_BRANCH + "#" + SubWCRev.GIT_SHORTHASH + ")";
}
VersionLabel.Text = "Version " + VersionInfo.MAINVERSION + " " + VersionInfo.RELEASEDATE;
@ -55,6 +55,18 @@ namespace BizHawk.Client.EmuHawk
});
}
linkLabel2.Text = "Commit # " + SubWCRev.GIT_SHORTHASH;
}
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
System.Diagnostics.Process.Start("https://github.com/TASVideos/BizHawk/commit/" + SubWCRev.GIT_SHORTHASH);
}
private void btnCopyHash_Click(object sender, EventArgs e)
{
System.Windows.Forms.Clipboard.SetText(SubWCRev.GIT_SHORTHASH);
}
}
}

60
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -131,7 +131,6 @@
</Compile>
<Compile Include="AVOut\AviWriter.cs" />
<Compile Include="AVOut\AVSync.cs" />
<Compile Include="AVOut\BitmapBufferVideoProvder.cs" />
<Compile Include="AVOut\BmpVideoProvder.cs" />
<Compile Include="AVOut\FFmpegWriter.cs" />
<Compile Include="AVOut\FFmpegWriterForm.cs">
@ -413,11 +412,11 @@
<Compile Include="config\ProfileConfig.Designer.cs">
<DependentUpon>ProfileConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\PSX\PSXControllerConfig.cs">
<Compile Include="config\PSX\PSXControllerConfigNew.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\PSX\PSXControllerConfig.Designer.cs">
<DependentUpon>PSXControllerConfig.cs</DependentUpon>
<Compile Include="config\PSX\PSXControllerConfigNew.Designer.cs">
<DependentUpon>PSXControllerConfigNew.cs</DependentUpon>
</Compile>
<Compile Include="config\PSX\PSXHashDiscs.cs">
<SubType>Form</SubType>
@ -477,6 +476,13 @@
<Compile Include="CustomControls\InputConfigBase.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="CustomControls\InputRoll.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="CustomControls\InputRoll.Drawing.cs">
<DependentUpon>InputRoll.cs</DependentUpon>
<SubType>Component</SubType>
</Compile>
<Compile Include="CustomControls\MenuButton.cs">
<SubType>Component</SubType>
</Compile>
@ -542,6 +548,7 @@
<Compile Include="Input\GamePad360.cs" />
<Compile Include="Input\Input.cs" />
<Compile Include="IControlMainform.cs" />
<Compile Include="Input\IPCKeyInput.cs" />
<Compile Include="JumpLists.cs" />
<Compile Include="LogConsole.cs" />
<Compile Include="LogWindow.cs">
@ -640,6 +647,18 @@
<Compile Include="tools\AutoHawk.Designer.cs">
<DependentUpon>AutoHawk.cs</DependentUpon>
</Compile>
<Compile Include="tools\BasicBot\BasicBot.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="tools\BasicBot\BasicBot.Designer.cs">
<DependentUpon>BasicBot.cs</DependentUpon>
</Compile>
<Compile Include="tools\BasicBot\BotControlsRow.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\BasicBot\BotControlsRow.Designer.cs">
<DependentUpon>BotControlsRow.cs</DependentUpon>
</Compile>
<Compile Include="tools\BatchRun.cs">
<SubType>Form</SubType>
</Compile>
@ -961,15 +980,18 @@
<Compile Include="tools\TAStudio\HeaderEditor.Designer.cs">
<DependentUpon>HeaderEditor.cs</DependentUpon>
</Compile>
<Compile Include="tools\TAStudio\InputRoll.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\TAStudio\PatternsForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="tools\TAStudio\PatternsForm.Designer.cs">
<DependentUpon>PatternsForm.cs</DependentUpon>
</Compile>
<Compile Include="tools\TAStudio\ScreenshotPopupControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\TAStudio\ScreenshotPopupControl.Designer.cs">
<DependentUpon>ScreenshotPopupControl.cs</DependentUpon>
</Compile>
<Compile Include="tools\TAStudio\TAStudio.Callbacks.cs">
<DependentUpon>TAStudio.cs</DependentUpon>
<SubType>Form</SubType>
@ -1244,8 +1266,8 @@
<EmbeddedResource Include="config\ProfileConfig.resx">
<DependentUpon>ProfileConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\PSX\PSXControllerConfig.resx">
<DependentUpon>PSXControllerConfig.cs</DependentUpon>
<EmbeddedResource Include="config\PSX\PSXControllerConfigNew.resx">
<DependentUpon>PSXControllerConfigNew.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\PSX\PSXHashDiscs.resx">
<DependentUpon>PSXHashDiscs.cs</DependentUpon>
@ -1308,6 +1330,12 @@
<EmbeddedResource Include="tools\AutoHawk.resx">
<DependentUpon>AutoHawk.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\BasicBot\BasicBot.resx">
<DependentUpon>BasicBot.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\BasicBot\BotControlsRow.resx">
<DependentUpon>BotControlsRow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\BatchRun.resx">
<DependentUpon>BatchRun.cs</DependentUpon>
</EmbeddedResource>
@ -1450,6 +1478,9 @@
<EmbeddedResource Include="tools\TAStudio\PlaybackBox.resx">
<DependentUpon>PlaybackBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\TAStudio\ScreenshotPopupControl.resx">
<DependentUpon>ScreenshotPopupControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\TAStudio\TAStudio.resx">
<DependentUpon>TAStudio.cs</DependentUpon>
</EmbeddedResource>
@ -1622,6 +1653,12 @@
<None Include="config\ControllerImages\GENController.png" />
</ItemGroup>
<ItemGroup>
<None Include="images\tastudio\icon_anchor_lag.png" />
<None Include="images\tastudio\icon_anchor.png" />
<None Include="images\tastudio\icon_marker.png" />
<None Include="images\tastudio\anchor_marker.png" />
<None Include="images\tastudio\anchor_lag.png" />
<None Include="images\tastudio\anchor.png" />
<None Include="Resources\HawkInLove.png" />
<None Include="images\Circle.png" />
<None Include="images\Cross.png" />
@ -1795,9 +1832,6 @@
<None Include="images\tastudio\ts_h_arrow_green_blue.png" />
<None Include="images\tastudio\ts_h_arrow_green.png" />
<None Include="images\tastudio\ts_h_arrow_blue.png" />
<None Include="images\tastudio\te_green_blue_arrow.bmp" />
<None Include="images\tastudio\te_green_arrow.bmp" />
<None Include="images\tastudio\te_arrow.bmp" />
<None Include="images\noconnect_16x16.png" />
<None Include="images\snes9x.png" />
<None Include="images\YellowUp.png" />
@ -1811,7 +1845,6 @@
<None Include="images\meteor.png" />
<None Include="images\yabause.png" />
<None Include="images\QuickNes.png" />
<None Include="images\QuickNES_128.ico" />
<None Include="images\sms-icon.png" />
<None Include="images\pcb.png" />
<None Include="images\tvIcon.png" />
@ -1928,6 +1961,7 @@
<None Include="images\add.png" />
<None Include="images\HawkInLove.png" />
<None Include="images\ControllerImages\AppleIIKeyboard.png" />
<None Include="images\BlankCursor.cur" />
<Content Include="images\logo.ico" />
<None Include="images\Paste.png" />
<None Include="images\reboot.png" />

624
BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs Normal file
View File

@ -0,0 +1,624 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
namespace BizHawk.Client.EmuHawk
{
public partial class InputRoll
{
protected override void OnPaint(PaintEventArgs e)
{
using (var LCK = Gdi.LockGraphics(e.Graphics))
{
Gdi.StartOffScreenBitmap(Width, Height);
// White Background
Gdi.SetBrush(Color.White);
Gdi.SetSolidPen(Color.White);
Gdi.FillRectangle(0, 0, Width, Height);
// Lag frame calculations
SetLagFramesArray();
var visibleColumns = _columns.VisibleColumns.ToList();
if (visibleColumns.Any())
{
DrawColumnBg(e, visibleColumns);
DrawColumnText(e, visibleColumns);
}
//Background
DrawBg(e, visibleColumns);
//Foreground
DrawData(e, visibleColumns);
DrawColumnDrag(e);
DrawCellDrag(e);
Gdi.CopyToScreen();
Gdi.EndOffScreenBitmap();
}
}
protected override void OnPaintBackground(PaintEventArgs pevent)
{
// Do nothing, and this should never be called
}
private void DrawColumnDrag(PaintEventArgs e)
{
if (_columnDown != null && _currentX.HasValue && _currentY.HasValue && IsHoveringOnColumnCell)
{
int x1 = _currentX.Value - (_columnDown.Width.Value / 2);
int y1 = _currentY.Value - (CellHeight / 2);
int x2 = x1 + _columnDown.Width.Value;
int y2 = y1 + CellHeight;
Gdi.SetSolidPen(_backColor);
Gdi.DrawRectangle(x1, y1, x2, y2);
Gdi.PrepDrawString(NormalFont, _foreColor);
Gdi.DrawString(_columnDown.Text, new Point(x1 + CellWidthPadding, y1 + CellHeightPadding));
}
}
private void DrawCellDrag(PaintEventArgs e)
{
if (DraggingCell != null)
{
var text = "";
int offsetX = 0;
int offsetY = 0;
if (QueryItemText != null)
{
QueryItemText(DraggingCell.RowIndex.Value, DraggingCell.Column, out text, ref offsetX, ref offsetY);
}
Color bgColor = _backColor;
if (QueryItemBkColor != null)
{
QueryItemBkColor(DraggingCell.RowIndex.Value, DraggingCell.Column, ref bgColor);
}
int x1 = _currentX.Value - (DraggingCell.Column.Width.Value / 2);
int y1 = _currentY.Value - (CellHeight / 2);
int x2 = x1 + DraggingCell.Column.Width.Value;
int y2 = y1 + CellHeight;
Gdi.SetBrush(bgColor);
Gdi.FillRectangle(x1, y1, x2 - x1, y2 - y1);
Gdi.PrepDrawString(NormalFont, _foreColor);
Gdi.DrawString(text, new Point(x1 + CellWidthPadding + offsetX, y1 + CellHeightPadding + offsetY));
}
}
private void DrawColumnText(PaintEventArgs e, List<RollColumn> visibleColumns)
{
if (HorizontalOrientation)
{
int start = -VBar.Value;
Gdi.PrepDrawString(RotatedFont, _foreColor);
foreach (var column in visibleColumns)
{
var point = new Point(CellWidthPadding, start + CellHeightPadding);
if (IsHoveringOnColumnCell && column == CurrentCell.Column)
{
Gdi.PrepDrawString(NormalFont, SystemColors.HighlightText);
Gdi.DrawString(column.Text, point);
Gdi.PrepDrawString(NormalFont, _foreColor);
}
else
{
Gdi.DrawString(column.Text, point);
}
start += CellHeight;
}
}
else
{
//zeromus test
//Gdi.PrepDrawString(NormalFont, _foreColor);
Gdi.PrepDrawString(RotatedFont, _foreColor);
foreach (var column in visibleColumns)
{
var point = new Point(column.Left.Value + 2 * CellWidthPadding - HBar.Value, CellHeightPadding); // TODO: fix this CellPadding issue (2 * CellPadding vs just CellPadding)
if (IsHoveringOnColumnCell && column == CurrentCell.Column)
{
//zeromus test
//Gdi.PrepDrawString(NormalFont, SystemColors.HighlightText);
Gdi.PrepDrawString(RotatedFont, SystemColors.HighlightText);
Gdi.DrawString(column.Text, point);
//zeromus test
//Gdi.PrepDrawString(NormalFont, _foreColor);
Gdi.PrepDrawString(RotatedFont, _foreColor);
}
else
{
Gdi.DrawString(column.Text, point);
}
}
}
}
private void DrawData(PaintEventArgs e, List<RollColumn> visibleColumns)
{
if (QueryItemText != null)
{
if (HorizontalOrientation)
{
int startRow = FirstVisibleRow;
int range = Math.Min(LastVisibleRow, RowCount - 1) - startRow + 1;
Gdi.PrepDrawString(NormalFont, _foreColor);
for (int i = 0, f = 0; f < range; i++, f++)
{
f += lagFrames[i];
int LastVisible = LastVisibleColumnIndex;
for (int j = FirstVisibleColumn; j <= LastVisible; j++)
{
Bitmap image = null;
int x = 0;
int y = 0;
int bitmapOffsetX = 0;
int bitmapOffsetY = 0;
if (QueryItemIcon != null)
{
QueryItemIcon(f + startRow, visibleColumns[j], ref image, ref bitmapOffsetX, ref bitmapOffsetY);
}
if (image != null)
{
x = RowsToPixels(i) + CellWidthPadding + bitmapOffsetX;
y = (j * CellHeight) + (CellHeightPadding * 2) + bitmapOffsetY;
Gdi.DrawBitmap(image, new Point(x, y), true);
}
string text;
int strOffsetX = 0;
int strOffsetY = 0;
QueryItemText(f + startRow, visibleColumns[j], out text, ref strOffsetX, ref strOffsetY);
// Center Text
x = RowsToPixels(i) + (CellWidth - text.Length * _charSize.Width) / 2;
y = (j * CellHeight) + CellHeightPadding - VBar.Value;
var point = new Point(x + strOffsetX, y + strOffsetY);
var rePrep = false;
if (SelectedItems.Contains(new Cell { Column = visibleColumns[j], RowIndex = i + startRow }))
{
Gdi.PrepDrawString(NormalFont, SystemColors.HighlightText);
rePrep = true;
}
if (!string.IsNullOrWhiteSpace(text))
{
Gdi.DrawString(text, point);
}
if (rePrep)
{
Gdi.PrepDrawString(NormalFont, _foreColor);
}
}
}
}
else
{
int startRow = FirstVisibleRow;
int range = Math.Min(LastVisibleRow, RowCount - 1) - startRow + 1;
Gdi.PrepDrawString(NormalFont, _foreColor);
int xPadding = CellWidthPadding + 1 - HBar.Value;
for (int i = 0, f = 0; f < range; i++, f++) // Vertical
{
f += lagFrames[i];
int LastVisible = LastVisibleColumnIndex;
for (int j = FirstVisibleColumn; j <= LastVisible; j++) // Horizontal
{
RollColumn col = visibleColumns[j];
string text;
int strOffsetX = 0;
int strOffsetY = 0;
Point point = new Point(col.Left.Value + xPadding, RowsToPixels(i) + CellHeightPadding);
Bitmap image = null;
int bitmapOffsetX = 0;
int bitmapOffsetY = 0;
if (QueryItemIcon != null)
{
QueryItemIcon(f + startRow, visibleColumns[j], ref image, ref bitmapOffsetX, ref bitmapOffsetY);
}
if (image != null)
{
Gdi.DrawBitmap(image, new Point(point.X + bitmapOffsetX, point.Y + bitmapOffsetY + CellHeightPadding), true);
}
QueryItemText(f + startRow, visibleColumns[j], out text, ref strOffsetX, ref strOffsetY);
bool rePrep = false;
if (SelectedItems.Contains(new Cell { Column = visibleColumns[j], RowIndex = f + startRow }))
{
Gdi.PrepDrawString(NormalFont, SystemColors.HighlightText);
rePrep = true;
}
if (!string.IsNullOrWhiteSpace(text))
{
Gdi.DrawString(text, new Point(point.X + strOffsetX, point.Y + strOffsetY));
}
if (rePrep)
{
Gdi.PrepDrawString(NormalFont, _foreColor);
}
}
}
}
}
}
private void DrawColumnBg(PaintEventArgs e, List<RollColumn> visibleColumns)
{
Gdi.SetBrush(SystemColors.ControlLight);
Gdi.SetSolidPen(Color.Black);
if (HorizontalOrientation)
{
Gdi.FillRectangle(0, 0, ColumnWidth + 1, DrawHeight + 1);
Gdi.Line(0, 0, 0, visibleColumns.Count * CellHeight + 1);
Gdi.Line(ColumnWidth, 0, ColumnWidth, visibleColumns.Count * CellHeight + 1);
int start = -VBar.Value;
foreach (var column in visibleColumns)
{
Gdi.Line(1, start, ColumnWidth, start);
start += CellHeight;
}
if (visibleColumns.Any())
{
Gdi.Line(1, start, ColumnWidth, start);
}
}
else
{
int bottomEdge = RowsToPixels(0);
// Gray column box and black line underneath
Gdi.FillRectangle(0, 0, Width + 1, bottomEdge + 1);
Gdi.Line(0, 0, TotalColWidth.Value + 1, 0);
Gdi.Line(0, bottomEdge, TotalColWidth.Value + 1, bottomEdge);
// Vertical black seperators
for (int i = 0; i < visibleColumns.Count; i++)
{
int pos = visibleColumns[i].Left.Value - HBar.Value;
Gdi.Line(pos, 0, pos, bottomEdge);
}
// Draw right most line
if (visibleColumns.Any())
{
int right = TotalColWidth.Value - HBar.Value;
Gdi.Line(right, 0, right, bottomEdge);
}
}
// Emphasis
foreach (var column in visibleColumns.Where(c => c.Emphasis))
{
Gdi.SetBrush(SystemColors.ActiveBorder);
if (HorizontalOrientation)
{
Gdi.FillRectangle(1, visibleColumns.IndexOf(column) * CellHeight + 1, ColumnWidth - 1, ColumnHeight - 1);
}
else
{
Gdi.FillRectangle(column.Left.Value + 1 - HBar.Value, 1, column.Width.Value - 1, ColumnHeight - 1);
}
}
// If the user is hovering over a column
if (IsHoveringOnColumnCell)
{
if (HorizontalOrientation)
{
for (int i = 0; i < visibleColumns.Count; i++)
{
if (visibleColumns[i] != CurrentCell.Column)
{
continue;
}
if (CurrentCell.Column.Emphasis)
{
Gdi.SetBrush(Add(SystemColors.Highlight, 0x00222222));
}
else
{
Gdi.SetBrush(SystemColors.Highlight);
}
Gdi.FillRectangle(1, i * CellHeight + 1, ColumnWidth - 1, ColumnHeight - 1);
}
}
else
{
//TODO multiple selected columns
for (int i = 0; i < visibleColumns.Count; i++)
{
if (visibleColumns[i] == CurrentCell.Column)
{
//Left of column is to the right of the viewable area or right of column is to the left of the viewable area
if (visibleColumns[i].Left.Value - HBar.Value > Width || visibleColumns[i].Right.Value - HBar.Value < 0)
{
continue;
}
int left = visibleColumns[i].Left.Value - HBar.Value;
int width = visibleColumns[i].Right.Value - HBar.Value - left;
if (CurrentCell.Column.Emphasis)
{
Gdi.SetBrush(Add(SystemColors.Highlight, 0x00550000));
}
else
{
Gdi.SetBrush(SystemColors.Highlight);
}
Gdi.FillRectangle(left + 1, 1, width - 1, ColumnHeight - 1);
}
}
}
}
}
// TODO refactor this and DoBackGroundCallback functions.
/// <summary>
/// Draw Gridlines and background colors using QueryItemBkColor.
/// </summary>
/// <param name="e"></param>
private void DrawBg(PaintEventArgs e, List<RollColumn> visibleColumns)
{
if (UseCustomBackground && QueryItemBkColor != null)
{
DoBackGroundCallback(e, visibleColumns);
}
if (GridLines)
{
Gdi.SetSolidPen(SystemColors.ControlLight);
if (HorizontalOrientation)
{
// Columns
for (int i = 1; i < VisibleRows + 1; i++)
{
int x = RowsToPixels(i);
Gdi.Line(x, 1, x, DrawHeight);
}
// Rows
for (int i = 0; i < visibleColumns.Count + 1; i++)
{
Gdi.Line(RowsToPixels(0) + 1, i * CellHeight - VBar.Value, DrawWidth, i * CellHeight - VBar.Value);
}
}
else
{
// Columns
int y = ColumnHeight + 1;
int? totalColWidth = TotalColWidth;
foreach (var column in visibleColumns)
{
int x = column.Left.Value - HBar.Value;
Gdi.Line(x, y, x, Height - 1);
}
if (visibleColumns.Any())
{
Gdi.Line(totalColWidth.Value - HBar.Value, y, totalColWidth.Value - HBar.Value, Height - 1);
}
// Rows
for (int i = 1; i < VisibleRows + 1; i++)
{
Gdi.Line(0, RowsToPixels(i), Width + 1, RowsToPixels(i));
}
}
}
if (SelectedItems.Any())
{
DoSelectionBG(e, visibleColumns);
}
}
private void DoSelectionBG(PaintEventArgs e, List<RollColumn> visibleColumns)
{
// SuuperW: This allows user to see other colors in selected frames.
Color rowColor = Color.White;
int _lastVisibleRow = LastVisibleRow;
int lastRow = -1;
foreach (Cell cell in SelectedItems)
{
if (cell.RowIndex > _lastVisibleRow || cell.RowIndex < FirstVisibleRow)
continue;
Cell relativeCell = new Cell
{
RowIndex = cell.RowIndex - FirstVisibleRow,
Column = cell.Column,
};
relativeCell.RowIndex -= CountLagFramesAbsolute(relativeCell.RowIndex.Value);
if (QueryRowBkColor != null && lastRow != cell.RowIndex.Value)
{
QueryRowBkColor(cell.RowIndex.Value, ref rowColor);
lastRow = cell.RowIndex.Value;
}
Color cellColor = rowColor;
QueryItemBkColor(cell.RowIndex.Value, cell.Column, ref cellColor);
// Alpha layering for cell before selection
float alpha = (float)cellColor.A / 255;
if (cellColor.A != 255 && cellColor.A != 0)
{
cellColor = Color.FromArgb(rowColor.R - (int)((rowColor.R - cellColor.R) * alpha),
rowColor.G - (int)((rowColor.G - cellColor.G) * alpha),
rowColor.B - (int)((rowColor.B - cellColor.B) * alpha));
}
// Alpha layering for selection
alpha = 0.33f;
cellColor = Color.FromArgb(cellColor.R - (int)((cellColor.R - SystemColors.Highlight.R) * alpha),
cellColor.G - (int)((cellColor.G - SystemColors.Highlight.G) * alpha),
cellColor.B - (int)((cellColor.B - SystemColors.Highlight.B) * alpha));
DrawCellBG(cellColor, relativeCell, visibleColumns);
}
}
/// <summary>
/// Given a cell with rowindex inbetween 0 and VisibleRows, it draws the background color specified. Do not call with absolute rowindices.
/// </summary>
private void DrawCellBG(Color color, Cell cell, List<RollColumn> visibleColumns)
{
int x, y, w, h;
if (HorizontalOrientation)
{
x = RowsToPixels(cell.RowIndex.Value) + 1;
w = CellWidth - 1;
y = (CellHeight * visibleColumns.IndexOf(cell.Column)) + 1 - VBar.Value; // We can't draw without row and column, so assume they exist and fail catastrophically if they don't
h = CellHeight - 1;
if (x < ColumnWidth) { return; }
}
else
{
w = cell.Column.Width.Value - 1;
x = cell.Column.Left.Value - HBar.Value + 1;
y = RowsToPixels(cell.RowIndex.Value) + 1; // We can't draw without row and column, so assume they exist and fail catastrophically if they don't
h = CellHeight - 1;
if (y < ColumnHeight)
{
return;
}
}
if (x > DrawWidth || y > DrawHeight)
{
return;
} // Don't draw if off screen.
Gdi.SetBrush(color);
Gdi.FillRectangle(x, y, w, h);
}
/// <summary>
/// Calls QueryItemBkColor callback for all visible cells and fills in the background of those cells.
/// </summary>
/// <param name="e"></param>
private void DoBackGroundCallback(PaintEventArgs e, List<RollColumn> visibleColumns)
{
int startIndex = FirstVisibleRow;
int range = Math.Min(LastVisibleRow, RowCount - 1) - startIndex + 1;
int lastVisible = LastVisibleColumnIndex;
int firstVisibleColumn = FirstVisibleColumn;
if (HorizontalOrientation)
{
for (int i = 0, f = 0; f < range; i++, f++)
{
f += lagFrames[i];
Color rowColor = Color.White;
if (QueryRowBkColor != null)
{
QueryRowBkColor(f + startIndex, ref rowColor);
}
for (int j = firstVisibleColumn; j <= lastVisible; j++)
{
Color itemColor = Color.White;
QueryItemBkColor(f + startIndex, visibleColumns[j], ref itemColor);
if (itemColor == Color.White)
{
itemColor = rowColor;
}
else if (itemColor.A != 255 && itemColor.A != 0)
{
float alpha = (float)itemColor.A / 255;
itemColor = Color.FromArgb(rowColor.R - (int)((rowColor.R - itemColor.R) * alpha),
rowColor.G - (int)((rowColor.G - itemColor.G) * alpha),
rowColor.B - (int)((rowColor.B - itemColor.B) * alpha));
}
if (itemColor != Color.White) // An easy optimization, don't draw unless the user specified something other than the default
{
var cell = new Cell
{
Column = visibleColumns[j],
RowIndex = i
};
DrawCellBG(itemColor, cell, visibleColumns);
}
}
}
}
else
{
for (int i = 0, f = 0; f < range; i++, f++) // Vertical
{
f += lagFrames[i];
Color rowColor = Color.White;
if (QueryRowBkColor != null)
{
QueryRowBkColor(f + startIndex, ref rowColor);
}
for (int j = FirstVisibleColumn; j <= lastVisible; j++) // Horizontal
{
Color itemColor = Color.White;
QueryItemBkColor(f + startIndex, visibleColumns[j], ref itemColor);
if (itemColor == Color.White)
{
itemColor = rowColor;
}
else if (itemColor.A != 255 && itemColor.A != 0)
{
float alpha = (float)itemColor.A / 255;
itemColor = Color.FromArgb(rowColor.R - (int)((rowColor.R - itemColor.R) * alpha),
rowColor.G - (int)((rowColor.G - itemColor.G) * alpha),
rowColor.B - (int)((rowColor.B - itemColor.B) * alpha));
}
if (itemColor != Color.White) // An easy optimization, don't draw unless the user specified something other than the default
{
var cell = new Cell
{
Column = visibleColumns[j],
RowIndex = i
};
DrawCellBG(itemColor, cell, visibleColumns);
}
}
}
}
}
}
}

888
BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs → BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
View File

File diff suppressed because it is too large Load Diff

141
BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
View File

@ -63,19 +63,22 @@ namespace BizHawk.Client.EmuHawk
using (var tex = typeof(Program).Assembly.GetManifestResourceStream("BizHawk.Client.EmuHawk.Resources.courier16px_0.png"))
TheOneFont = new StringRenderer(GL, xml, tex);
if (GL is BizHawk.Bizware.BizwareGL.Drivers.OpenTK.IGL_TK)
if (GL is BizHawk.Bizware.BizwareGL.Drivers.OpenTK.IGL_TK || GL is BizHawk.Bizware.BizwareGL.Drivers.SlimDX.IGL_SlimDX9)
{
var fiHq2x = new FileInfo(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "Shaders/BizHawk/hq2x.cgp"));
if (fiHq2x.Exists)
using (var stream = fiHq2x.OpenRead())
ShaderChain_hq2x = new Filters.RetroShaderChain(GL, new Filters.RetroShaderPreset(stream), Path.Combine(PathManager.GetExeDirectoryAbsolute(), "Shaders/BizHawk"));
var fiScanlines = new FileInfo(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "Shaders/BizHawk/BizScanlines.cgp"));
if (fiScanlines.Exists)
using (var stream = fiScanlines.OpenRead())
ShaderChain_scanlines = new Filters.RetroShaderChain(GL, new Filters.RetroShaderPreset(stream), Path.Combine(PathManager.GetExeDirectoryAbsolute(), "Shaders/BizHawk"));
var fiBicubic = new FileInfo(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "Shaders/BizHawk/bicubic-fast.cgp"));
//var fiHq2x = new FileInfo(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "Shaders/BizHawk/hq2x.cgp"));
//if (fiHq2x.Exists)
// using (var stream = fiHq2x.OpenRead())
// ShaderChain_hq2x = new Filters.RetroShaderChain(GL, new Filters.RetroShaderPreset(stream), Path.Combine(PathManager.GetExeDirectoryAbsolute(), "Shaders/BizHawk"));
//var fiScanlines = new FileInfo(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "Shaders/BizHawk/BizScanlines.cgp"));
//if (fiScanlines.Exists)
// using (var stream = fiScanlines.OpenRead())
// ShaderChain_scanlines = new Filters.RetroShaderChain(GL, new Filters.RetroShaderPreset(stream), Path.Combine(PathManager.GetExeDirectoryAbsolute(), "Shaders/BizHawk"));
string bicubic_path = "Shaders/BizHawk/bicubic-fast.cgp";
if(GL is BizHawk.Bizware.BizwareGL.Drivers.SlimDX.IGL_SlimDX9)
bicubic_path = "Shaders/BizHawk/bicubic-normal.cgp";
var fiBicubic = new FileInfo(Path.Combine(PathManager.GetExeDirectoryAbsolute(), bicubic_path));
if (fiBicubic.Exists)
using (var stream = fiBicubic.OpenRead())
using (var stream = fiBicubic.Open(FileMode.Open, FileAccess.Read, FileShare.Read))
ShaderChain_bicubic = new Filters.RetroShaderChain(GL, new Filters.RetroShaderPreset(stream), Path.Combine(PathManager.GetExeDirectoryAbsolute(), "Shaders/BizHawk"));
}
@ -143,6 +146,28 @@ namespace BizHawk.Client.EmuHawk
}
}
System.Windows.Forms.Padding CalculateCompleteContentPadding(bool user, bool source)
{
var padding = new System.Windows.Forms.Padding();
if(user)
padding += GameExtraPadding;
//an experimental feature
if(source)
if (Global.Emulator is BizHawk.Emulation.Cores.Sony.PSX.Octoshock)
{
var psx = Global.Emulator as BizHawk.Emulation.Cores.Sony.PSX.Octoshock;
var core_padding = psx.VideoProvider_Padding;
padding.Left += core_padding.Width / 2;
padding.Right += core_padding.Width - core_padding.Width / 2;
padding.Top += core_padding.Height / 2;
padding.Bottom += core_padding.Height - core_padding.Height / 2;
}
return padding;
}
FilterProgram BuildDefaultChain(Size chain_insize, Size chain_outsize, bool includeOSD)
{
//select user special FX shader chain
@ -183,18 +208,23 @@ namespace BizHawk.Client.EmuHawk
chain.AddFilter(fInput, "input");
//if a non-zero padding is required, add a filter to allow for that
if (GameExtraPadding.Vertical != 0 || GameExtraPadding.Horizontal != 0)
//note, we have two sources of padding right now.. one can come from the videoprovider and one from the user.
//we're combining these now and just using black, for sake of being lean, despite the discussion below:
//keep in mind, the videoprovider design in principle might call for another color.
//we havent really been using this very hard, but users will probably want black there (they could fill it to another color if needed tho)
var padding = CalculateCompleteContentPadding(true,true);
if (padding.Vertical != 0 || padding.Horizontal != 0)
{
//TODO - add another filter just for this, its cumebrsome to use final presentation... I think. but maybe theres enough similarities to justify it.
//TODO - add another filter just for this, its cumbersome to use final presentation... I think. but maybe theres enough similarities to justify it.
Size size = chain_insize;
size.Width += GameExtraPadding.Horizontal;
size.Height += GameExtraPadding.Vertical;
size.Width += padding.Horizontal;
size.Height += padding.Vertical;
Filters.FinalPresentation fPadding = new Filters.FinalPresentation(size);
chain.AddFilter(fPadding, "padding");
fPadding.GuiRenderer = Renderer;
fPadding.GL = GL;
fPadding.Config_PadOnly = true;
fPadding.Padding = GameExtraPadding;
fPadding.Padding = padding;
}
//add lua layer 'emu'
@ -214,10 +244,11 @@ namespace BizHawk.Client.EmuHawk
Filters.FinalPresentation.eFilterOption finalFilter = Filters.FinalPresentation.eFilterOption.None;
if (Global.Config.DispFinalFilter == 1) finalFilter = Filters.FinalPresentation.eFilterOption.Bilinear;
if (Global.Config.DispFinalFilter == 2) finalFilter = Filters.FinalPresentation.eFilterOption.Bicubic;
//if bicubic is selected and unavailable, dont use it
if (ShaderChain_bicubic != null && !ShaderChain_bicubic.Available && fPresent.FilterOption == Filters.FinalPresentation.eFilterOption.Bicubic)
//if bicubic is selected and unavailable, dont use it. use bilinear instead I guess
if (finalFilter == Filters.FinalPresentation.eFilterOption.Bicubic)
{
finalFilter = Filters.FinalPresentation.eFilterOption.None;
if (ShaderChain_bicubic == null || !ShaderChain_bicubic.Available)
finalFilter = Filters.FinalPresentation.eFilterOption.Bilinear;
}
fPresent.FilterOption = finalFilter;
@ -232,7 +263,7 @@ namespace BizHawk.Client.EmuHawk
AppendLuaLayer(chain, "native");
//and OSD goes on top of that
//TODO - things break if this isnt present (the final presentation filter gets messed up)
//TODO - things break if this isnt present (the final presentation filter gets messed up when used with prescaling)
//so, always include it (we'll handle this flag in the callback to do no rendering)
//if (includeOSD)
chain.AddFilter(fOSD, "osd");
@ -306,12 +337,14 @@ namespace BizHawk.Client.EmuHawk
/// </summary>
public void UpdateSource(IVideoProvider videoProvider)
{
bool displayNothing = Global.Config.DispSpeedupFeatures == 0;
var job = new JobInfo
{
videoProvider = videoProvider,
simulate = false,
simulate = displayNothing,
chain_outsize = GraphicsControl.Size,
includeOSD = true
includeOSD = true,
};
UpdateSourceInternal(job);
}
@ -367,6 +400,14 @@ namespace BizHawk.Client.EmuHawk
virtualHeight = Global.Config.DispCustomUserARHeight;
}
var padding = CalculateCompleteContentPadding(true, false);
virtualWidth += padding.Horizontal;
virtualHeight += padding.Vertical;
padding = CalculateCompleteContentPadding(true, true);
bufferWidth += padding.Horizontal;
bufferHeight += padding.Vertical;
//Console.WriteLine("DISPZOOM " + zoom); //test
//old stuff
@ -482,11 +523,17 @@ namespace BizHawk.Client.EmuHawk
FilterProgram UpdateSourceInternal(JobInfo job)
{
GlobalWin.GLManager.Activate(CR_GraphicsControl);
//no drawing actually happens. it's important not to begin drawing on a control
if (!job.simulate)
{
GlobalWin.GLManager.Activate(CR_GraphicsControl);
}
IVideoProvider videoProvider = job.videoProvider;
bool simulate = job.simulate;
Size chain_outsize = job.chain_outsize;
//simulate = true;
int vw = videoProvider.BufferWidth;
int vh = videoProvider.BufferHeight;
@ -505,21 +552,27 @@ namespace BizHawk.Client.EmuHawk
}
}
var padding = CalculateCompleteContentPadding(true,false);
vw += padding.Horizontal;
vh += padding.Vertical;
int[] videoBuffer = videoProvider.GetVideoBuffer();
TESTEROO:
int bufferWidth = videoProvider.BufferWidth;
int bufferHeight = videoProvider.BufferHeight;
bool isGlTextureId = videoBuffer.Length == 1;
//TODO - need to do some work here for GDI+ to repair gl texture ID importing
BitmapBuffer bb = null;
Texture2d videoTexture = null;
if (!simulate)
{
//special codepath for GDI+
//TODO - make for gdi+ only. maybe other codepath for d3d
if (!(GL is BizHawk.Bizware.BizwareGL.Drivers.OpenTK.IGL_TK))
if (isGlTextureId)
{
//FYI: this is a million years from happening on n64, since it's all geriatric non-FBO code
//is it workable for saturn?
videoTexture = GL.WrapGLTexture2d(new IntPtr(videoBuffer[0]), bufferWidth, bufferHeight);
}
else
{
//wrap the videoprovider data in a BitmapBuffer (no point to refactoring that many IVideoProviders)
bb = new BitmapBuffer(bufferWidth, bufferHeight, videoBuffer);
@ -527,30 +580,9 @@ TESTEROO:
//now, acquire the data sent from the videoProvider into a texture
videoTexture = VideoTextureFrugalizer.Get(bb);
GL.SetTextureWrapMode(videoTexture, true);
}
else
{
if (isGlTextureId)
{
videoTexture = GL.WrapGLTexture2d(new IntPtr(videoBuffer[0]), bufferWidth, bufferHeight);
}
else
{
//wrap the videoprovider data in a BitmapBuffer (no point to refactoring that many IVideoProviders)
bb = new BitmapBuffer(bufferWidth, bufferHeight, videoBuffer);
//now, acquire the data sent from the videoProvider into a texture
videoTexture = VideoTextureFrugalizer.Get(bb);
GL.SetTextureWrapMode(videoTexture, true);
}
//TEST (to be removed once we have an actual example of bring in a texture ID from opengl emu core):
if (!isGlTextureId)
{
videoBuffer = new int[1] { videoTexture.Id.ToInt32() };
goto TESTEROO;
}
//lets not use this. lets define BizwareGL to make clamp by default (TBD: check opengl)
//GL.SetTextureWrapMode(videoTexture, true);
}
}
@ -604,6 +636,8 @@ TESTEROO:
//do i need to check this on an intel video card to see if running excessively is a problem? (it used to be in the FinalTarget command below, shouldnt be a problem)
//GraphicsControl.Begin();
GlobalWin.GL.BeginScene();
//run filter chain
Texture2d texCurr = null;
RenderTarget rtCurr = null;
@ -650,6 +684,8 @@ TESTEROO:
}
}
GL.EndScene();
if (job.offscreen)
{
job.offscreenBB = rtCurr.Texture2d.Resolve();
@ -687,6 +723,7 @@ TESTEROO:
NeedsToPaint = false; //??
}
}
bool? LastVsyncSetting;

4
BizHawk.Client.EmuHawk/DisplayManager/Filters/Gui.cs
View File

@ -217,7 +217,7 @@ namespace BizHawk.Client.EmuHawk.Filters
//TODO - redundant fix
LL = new LetterboxingLogic();
LL.vx += Padding.Left;
LL.vy += Padding.Right;
LL.vy += Padding.Top;
LL.vw = size.Width;
LL.vh = size.Height;
}
@ -250,7 +250,7 @@ namespace BizHawk.Client.EmuHawk.Filters
//TODO - redundant fix
LL = new LetterboxingLogic();
LL.vx += Padding.Left;
LL.vy += Padding.Right;
LL.vy += Padding.Top;
LL.vw = InputSize.Width;
LL.vh = InputSize.Height;
}

5
BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
View File

@ -159,6 +159,11 @@ namespace BizHawk.Client.EmuHawk
public void DrawMessages(IBlitter g)
{
if (!Global.Config.DisplayMessages)
{
return;
}
messages.RemoveAll(m => DateTime.Now > m.ExpireAt);
int line = 1;
if (Global.Config.StackOSDMessages)

12
BizHawk.Client.EmuHawk/GlobalWin.cs
View File

@ -7,9 +7,19 @@ namespace BizHawk.Client.EmuHawk
{
public static MainForm MainForm;
public static ToolManager Tools;
/// <summary>
/// the IGL to be used for rendering
/// </summary>
public static IGL GL;
public static Bizware.BizwareGL.Drivers.OpenTK.IGL_TK IGL_GL;
public static GLManager.ContextRef CR_GL;
/// <summary>
/// The IGL_TK to be used for specifically opengl operations (accessing textures from opengl-based cores)
/// </summary>
public static Bizware.BizwareGL.Drivers.OpenTK.IGL_TK IGL_GL;
public static Sound Sound;
public static OSDManager OSD = new OSDManager();
public static DisplayManager DisplayManager;

134
BizHawk.Client.EmuHawk/Input/GamePad360.cs
View File

@ -1,7 +1,11 @@
using System;
using System.Runtime.InteropServices;
using System.Collections.Generic;
using SlimDX.XInput;
#pragma warning disable 169
#pragma warning disable 414
namespace BizHawk.Client.EmuHawk
{
public class GamePad360
@ -12,27 +16,72 @@ namespace BizHawk.Client.EmuHawk
static bool IsAvailable;
[DllImport("kernel32", SetLastError = true, EntryPoint = "GetProcAddress")]
static extern IntPtr GetProcAddressOrdinal(IntPtr hModule, IntPtr procName);
delegate uint XInputGetStateExProcDelegate(uint dwUserIndex, out XINPUT_STATE state);
static bool HasGetInputStateEx;
static IntPtr LibraryHandle;
static XInputGetStateExProcDelegate XInputGetStateExProc;
struct XINPUT_GAMEPAD
{
public ushort wButtons;
public byte bLeftTrigger;
public byte bRightTrigger;
public short sThumbLX;
public short sThumbLY;
public short sThumbRX;
public short sThumbRY;
}
struct XINPUT_STATE
{
public uint dwPacketNumber;
public XINPUT_GAMEPAD Gamepad;
}
public static void Initialize()
{
IsAvailable = false;
try
{
//some users wont even have xinput installed. in order to avoid spurious exceptions and possible instability, check for the library first
IntPtr lib = Win32.LoadLibrary("xinput1_3.dll");
if (lib != IntPtr.Zero)
HasGetInputStateEx = true;
LibraryHandle = Win32.LoadLibrary("xinput1_3.dll");
if(LibraryHandle == IntPtr.Zero)
LibraryHandle = Win32.LoadLibrary("xinput1_4.dll");
if(LibraryHandle == IntPtr.Zero)
{
Win32.FreeLibrary(lib);
LibraryHandle = Win32.LoadLibrary("xinput9_1_0.dll");
HasGetInputStateEx = false;
}
if (LibraryHandle != IntPtr.Zero)
{
if (HasGetInputStateEx)
{
IntPtr proc = GetProcAddressOrdinal(LibraryHandle, new IntPtr(100));
XInputGetStateExProc = (XInputGetStateExProcDelegate)Marshal.GetDelegateForFunctionPointer(proc, typeof(XInputGetStateExProcDelegate));
}
//don't remove this code. it's important to catch errors on systems with broken xinput installs.
//(probably, checking for the library was adequate, but lets not get rid of this anyway)
var test = new SlimDX.XInput.Controller(UserIndex.One).IsConnected;
IsAvailable = true;
}
}
catch { }
if (!IsAvailable) return;
//now, at this point, slimdx may be using one xinput, and we may be using another
//i'm not sure how slimdx picks its dll to bind to.
//i'm not sure how troublesome this will be
//maybe we should get rid of slimdx for this altogether
var c1 = new Controller(UserIndex.One);
var c2 = new Controller(UserIndex.Two);
var c3 = new Controller(UserIndex.Three);
@ -54,7 +103,7 @@ namespace BizHawk.Client.EmuHawk
// ********************************** Instance Members **********************************
readonly Controller controller;
State state;
XINPUT_STATE state;
GamePad360(Controller c)
{
@ -68,17 +117,33 @@ namespace BizHawk.Client.EmuHawk
if (controller.IsConnected == false)
return;
state = controller.GetState();
if (XInputGetStateExProc != null)
{
state = new XINPUT_STATE();
XInputGetStateExProc(0, out state);
}
else
{
var slimstate = controller.GetState();
state.dwPacketNumber = slimstate.PacketNumber;
state.Gamepad.wButtons = (ushort)slimstate.Gamepad.Buttons;
state.Gamepad.sThumbLX = slimstate.Gamepad.LeftThumbX;
state.Gamepad.sThumbLY = slimstate.Gamepad.LeftThumbY;
state.Gamepad.sThumbRX = slimstate.Gamepad.RightThumbX;
state.Gamepad.sThumbRY = slimstate.Gamepad.RightThumbY;
state.Gamepad.bLeftTrigger = slimstate.Gamepad.LeftTrigger;
state.Gamepad.bRightTrigger = slimstate.Gamepad.RightTrigger;
}
}
public IEnumerable<Tuple<string, float>> GetFloats()
{
var g = state.Gamepad;
const float f = 3.2768f;
yield return new Tuple<string, float>("LeftThumbX", g.LeftThumbX / f);
yield return new Tuple<string, float>("LeftThumbY", g.LeftThumbY / f);
yield return new Tuple<string, float>("RightThumbX", g.RightThumbX / f);
yield return new Tuple<string, float>("RightThumbY", g.RightThumbY / f);
yield return new Tuple<string, float>("LeftThumbX", g.sThumbLX / f);
yield return new Tuple<string, float>("LeftThumbY", g.sThumbLY / f);
yield return new Tuple<string, float>("RightThumbX", g.sThumbRX / f);
yield return new Tuple<string, float>("RightThumbY", g.sThumbRY / f);
yield break;
}
@ -93,35 +158,36 @@ namespace BizHawk.Client.EmuHawk
const int dzn = -9000;
const int dzt = 40;
AddItem("A", () => (state.Gamepad.Buttons & GamepadButtonFlags.A) != 0);
AddItem("B", () => (state.Gamepad.Buttons & GamepadButtonFlags.B) != 0);
AddItem("X", () => (state.Gamepad.Buttons & GamepadButtonFlags.X) != 0);
AddItem("Y", () => (state.Gamepad.Buttons & GamepadButtonFlags.Y) != 0);
AddItem("A", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.A) != 0);
AddItem("B", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.B) != 0);
AddItem("X", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.X) != 0);
AddItem("Y", () => (state.Gamepad.wButtons & unchecked((ushort)GamepadButtonFlags.Y)) != 0);
AddItem("Guide", () => (state.Gamepad.wButtons & 1024) != 0);
AddItem("Start", () => (state.Gamepad.Buttons & GamepadButtonFlags.Start) != 0);
AddItem("Back", () => (state.Gamepad.Buttons & GamepadButtonFlags.Back) != 0);
AddItem("LeftThumb", () => (state.Gamepad.Buttons & GamepadButtonFlags.LeftThumb) != 0);
AddItem("RightThumb", () => (state.Gamepad.Buttons & GamepadButtonFlags.RightThumb) != 0);
AddItem("LeftShoulder", () => (state.Gamepad.Buttons & GamepadButtonFlags.LeftShoulder) != 0);
AddItem("RightShoulder", () => (state.Gamepad.Buttons & GamepadButtonFlags.RightShoulder) != 0);
AddItem("Start", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.Start) != 0);
AddItem("Back", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.Back) != 0);
AddItem("LeftThumb", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.LeftThumb) != 0);
AddItem("RightThumb", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.RightThumb) != 0);
AddItem("LeftShoulder", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.LeftShoulder) != 0);
AddItem("RightShoulder", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.RightShoulder) != 0);
AddItem("DpadUp", () => (state.Gamepad.Buttons & GamepadButtonFlags.DPadUp) != 0);
AddItem("DpadDown", () => (state.Gamepad.Buttons & GamepadButtonFlags.DPadDown) != 0);
AddItem("DpadLeft", () => (state.Gamepad.Buttons & GamepadButtonFlags.DPadLeft) != 0);
AddItem("DpadRight", () => (state.Gamepad.Buttons & GamepadButtonFlags.DPadRight) != 0);
AddItem("DpadUp", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.DPadUp) != 0);
AddItem("DpadDown", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.DPadDown) != 0);
AddItem("DpadLeft", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.DPadLeft) != 0);
AddItem("DpadRight", () => (state.Gamepad.wButtons & (ushort)GamepadButtonFlags.DPadRight) != 0);
AddItem("LStickUp", () => state.Gamepad.LeftThumbY >= dzp);
AddItem("LStickDown", () => state.Gamepad.LeftThumbY <= dzn);
AddItem("LStickLeft", () => state.Gamepad.LeftThumbX <= dzn);
AddItem("LStickRight", () => state.Gamepad.LeftThumbX >= dzp);
AddItem("LStickUp", () => state.Gamepad.sThumbLY >= dzp);
AddItem("LStickDown", () => state.Gamepad.sThumbLY <= dzn);
AddItem("LStickLeft", () => state.Gamepad.sThumbLX <= dzn);
AddItem("LStickRight", () => state.Gamepad.sThumbLX >= dzp);
AddItem("RStickUp", () => state.Gamepad.RightThumbY >= dzp);
AddItem("RStickDown", () => state.Gamepad.RightThumbY <= dzn);
AddItem("RStickLeft", () => state.Gamepad.RightThumbX <= dzn);
AddItem("RStickRight", () => state.Gamepad.RightThumbX >= dzp);
AddItem("RStickUp", () => state.Gamepad.sThumbLY >= dzp);
AddItem("RStickDown", () => state.Gamepad.sThumbLY <= dzn);
AddItem("RStickLeft", () => state.Gamepad.sThumbLX <= dzn);
AddItem("RStickRight", () => state.Gamepad.sThumbLX >= dzp);
AddItem("LeftTrigger", () => state.Gamepad.LeftTrigger > dzt);
AddItem("RightTrigger", () => state.Gamepad.RightTrigger > dzt);
AddItem("LeftTrigger", () => state.Gamepad.bLeftTrigger > dzt);
AddItem("RightTrigger", () => state.Gamepad.bRightTrigger > dzt);
}
void AddItem(string name, Func<bool> pressed)

67
BizHawk.Client.EmuHawk/Input/IPCKeyInput.cs Normal file
View File

@ -0,0 +1,67 @@
using System.Collections.Generic;
using System.IO;
using System;
using System.Threading;
using System.IO.Pipes;
using SlimDX;
using SlimDX.DirectInput;
//this is not a very safe or pretty protocol, I'm not proud of it
namespace BizHawk.Client.EmuHawk
{
public static class IPCKeyInput
{
public static void Initialize()
{
var t = new Thread(IPCThread);
t.IsBackground = true;
t.Start();
}
static List<KeyInput.KeyEvent> PendingEventList = new List<KeyInput.KeyEvent>();
static List<KeyInput.KeyEvent> EventList = new List<KeyInput.KeyEvent>();
static void IPCThread()
{
string pipeName = string.Format("bizhawk-pid-{0}-IPCKeyInput", System.Diagnostics.Process.GetCurrentProcess().Id);
for (; ; )
{
using (NamedPipeServerStream pipe = new NamedPipeServerStream(pipeName, PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous, 1024, 1024))
{
try
{
pipe.WaitForConnection();
BinaryReader br = new BinaryReader(pipe);
for (; ; )
{
int e = br.ReadInt32();
bool pressed = (e & 0x80000000) != 0;
lock (PendingEventList)
PendingEventList.Add(new KeyInput.KeyEvent { Key = (Key)(e & 0x7FFFFFFF), Pressed = pressed });
}
}
catch { }
}
}
}
public static IEnumerable<KeyInput.KeyEvent> Update()
{
EventList.Clear();
lock (PendingEventList)
{
EventList.AddRange(PendingEventList);
PendingEventList.Clear();
}
return EventList;
}
}
}

12
BizHawk.Client.EmuHawk/Input/Input.cs
View File

@ -128,6 +128,7 @@ namespace BizHawk.Client.EmuHawk
{
#if WINDOWS
KeyInput.Initialize();
IPCKeyInput.Initialize();
GamePad.Initialize();
GamePad360.Initialize();
#endif
@ -319,7 +320,7 @@ namespace BizHawk.Client.EmuHawk
{
for (; ; )
{
var keyEvents = KeyInput.Update();
var keyEvents = KeyInput.Update().Concat(IPCKeyInput.Update());
GamePad.UpdateAll();
GamePad360.UpdateAll();
@ -511,5 +512,14 @@ namespace BizHawk.Client.EmuHawk
//to get triggered in the main form
public bool EnableIgnoreModifiers = false;
//sets a key as unpressed for the binding system
public void BindUnpress(System.Windows.Forms.Keys key)
{
//only validated for Return
string keystr = key.ToString();
UnpressState[keystr] = true;
LastState[keystr] = true;
}
}
}

73
BizHawk.Client.EmuHawk/Input/Keyboard.cs
View File

@ -12,7 +12,7 @@ namespace BizHawk.Client.EmuHawk
public static void Initialize()
{
if (dinput == null)
if (dinput == null)
dinput = new DirectInput();
if (keyboard == null || keyboard.Disposed)
@ -45,7 +45,7 @@ namespace BizHawk.Client.EmuHawk
foreach (var k in e.PressedKeys)
EventList.Add(new KeyEvent { Key = k, Pressed = true });
foreach (var k in e.ReleasedKeys)
EventList.Add(new KeyEvent { Key = k, Pressed = false });
EventList.Add(new KeyEvent { Key = k, Pressed = false });
}
}
@ -58,74 +58,5 @@ namespace BizHawk.Client.EmuHawk
public bool Pressed;
}
public static bool IsPressed(Key key)
{
if (state.IsPressed(key))
return true;
if (key == Key.LeftShift && state.IsPressed(Key.RightShift))
return true;
if (key == Key.LeftControl && state.IsPressed(Key.RightControl))
return true;
if (key == Key.LeftAlt && state.IsPressed(Key.RightAlt))
return true;
return false;
}
public static bool ShiftModifier
{
get
{
if (state.IsPressed(Key.LeftShift)) return true;
if (state.IsPressed(Key.RightShift)) return true;
return false;
}
}
public static bool CtrlModifier
{
get
{
if (state.IsPressed(Key.LeftControl)) return true;
if (state.IsPressed(Key.RightControl)) return true;
return false;
}
}
public static bool AltModifier
{
get
{
if (state.IsPressed(Key.LeftAlt)) return true;
if (state.IsPressed(Key.RightAlt)) return true;
return false;
}
}
public static Input.ModifierKey GetModifierKeysAsKeys()
{
Input.ModifierKey ret = Input.ModifierKey.None;
if (ShiftModifier) ret |= Input.ModifierKey.Shift;
if (CtrlModifier) ret |= Input.ModifierKey.Control;
if (AltModifier) ret |= Input.ModifierKey.Alt;
return ret;
}
}
internal static class KeyExtensions
{
public static bool IsModifier(this Key key)
{
if (key == Key.LeftShift) return true;
if (key == Key.RightShift) return true;
if (key == Key.LeftControl) return true;
if (key == Key.RightControl) return true;
if (key == Key.LeftAlt) return true;
if (key == Key.RightAlt) return true;
return false;
}
}
}

886
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

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

@ -576,7 +576,7 @@ namespace BizHawk.Client.EmuHawk
{
using (var bb = GlobalWin.DisplayManager.RenderOffscreen(Global.Emulator.VideoProvider(), Global.Config.Screenshot_CaptureOSD))
{
bb.Normalize(true);
bb.DiscardAlpha();
using (var img = bb.ToSysdrawingBitmap())
Clipboard.SetImage(img);
}
@ -597,6 +597,11 @@ namespace BizHawk.Client.EmuHawk
}
}
public void CloseEmulator()
{
_exit = true;
}
#endregion
#region Emulation Menu
@ -671,6 +676,8 @@ namespace BizHawk.Client.EmuHawk
DisplayLogWindowMenuItem.Checked = Global.Config.ShowLogWindow;
DisplayLagCounterMenuItem.Enabled = Global.Emulator.CanPollInput();
DisplayMessagesMenuItem.Checked = Global.Config.DisplayMessages;
}
private void WindowSizeSubMenu_DropDownOpened(object sender, EventArgs e)
@ -810,6 +817,8 @@ namespace BizHawk.Client.EmuHawk
Speed100MenuItem.Image = (Global.Config.SpeedPercentAlternate == 100) ? Properties.Resources.FastForward : null;
Speed150MenuItem.Checked = Global.Config.SpeedPercent == 150;
Speed150MenuItem.Image = (Global.Config.SpeedPercentAlternate == 150) ? Properties.Resources.FastForward : null;
Speed400MenuItem.Checked = Global.Config.SpeedPercent == 400;
Speed400MenuItem.Image = (Global.Config.SpeedPercentAlternate == 400) ? Properties.Resources.FastForward : null;
Speed200MenuItem.Checked = Global.Config.SpeedPercent == 200;
Speed200MenuItem.Image = (Global.Config.SpeedPercentAlternate == 200) ? Properties.Resources.FastForward : null;
Speed75MenuItem.Checked = Global.Config.SpeedPercent == 75;
@ -822,7 +831,10 @@ namespace BizHawk.Client.EmuHawk
Speed100MenuItem.Enabled =
Speed150MenuItem.Enabled =
Speed200MenuItem.Enabled =
Speed400MenuItem.Enabled =
Global.Config.ClockThrottle;
miUnthrottled.Checked = _unthrottled;
}
private void KeyPriorityMenuItem_DropDownOpened(object sender, EventArgs e)
@ -965,7 +977,7 @@ namespace BizHawk.Client.EmuHawk
}
}
LimitFrameRateMessage();
ThrottleMessage();
}
private void AudioThrottleMenuItem_Click(object sender, EventArgs e)
@ -982,6 +994,8 @@ namespace BizHawk.Client.EmuHawk
PresentationPanel.Resized = true;
}
}
ThrottleMessage();
}
private void VsyncThrottleMenuItem_Click(object sender, EventArgs e)
@ -999,7 +1013,13 @@ namespace BizHawk.Client.EmuHawk
}
}
VsyncMessage();
if (!Global.Config.VSync)
{
Global.Config.VSync = true;
VsyncMessage();
}
ThrottleMessage();
}
private void VsyncEnabledMenuItem_Click(object sender, EventArgs e)
@ -1009,6 +1029,8 @@ namespace BizHawk.Client.EmuHawk
{
PresentationPanel.Resized = true;
}
VsyncMessage();
}
private void MinimizeSkippingMenuItem_Click(object sender, EventArgs e)
@ -1032,6 +1054,7 @@ namespace BizHawk.Client.EmuHawk
private void Speed100MenuItem_Click(object sender, EventArgs e) { ClickSpeedItem(100); }
private void Speed150MenuItem_Click(object sender, EventArgs e) { ClickSpeedItem(150); }
private void Speed200MenuItem_Click(object sender, EventArgs e) { ClickSpeedItem(200); }
private void Speed400MenuItem_Click(object sender, EventArgs e) { ClickSpeedItem(400); }
private void BothHkAndControllerMenuItem_Click(object sender, EventArgs e)
{
@ -1099,6 +1122,12 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.OSD.AddMessage("Config file loaded");
}
private void miUnthrottled_Click(object sender, EventArgs e)
{
_unthrottled ^= true;
ThrottleMessage();
}
#endregion
#region Tools
@ -1129,6 +1158,13 @@ namespace BizHawk.Client.EmuHawk
AutoHawkMenuItem.Enabled = GlobalWin.Tools.IsAvailable<AutoHawk>();
AutoHawkMenuItem.Visible = VersionInfo.DeveloperBuild;
BasicBotMenuItem.Enabled = GlobalWin.Tools.IsAvailable<BasicBot>();
}
private void AutoHawkMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<AutoHawk>();
}
private void ToolBoxMenuItem_Click(object sender, EventArgs e)
@ -1195,6 +1231,18 @@ namespace BizHawk.Client.EmuHawk
#region NES
private void quickNESToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NES_InQuickNES = true;
FlagNeedsReboot();
}
private void nesHawkToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NES_InQuickNES = false;
FlagNeedsReboot();
}
private void NESSubMenu_DropDownOpened(object sender, EventArgs e)
{
FDSControlsMenuItem.Enabled = Global.Emulator.BoardName == "FDS";
@ -1206,6 +1254,8 @@ namespace BizHawk.Client.EmuHawk
&& !Global.MovieSession.Movie.IsActive;
barcodeReaderToolStripMenuItem.Enabled = ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, typeof(BarcodeEntry));
musicRipperToolStripMenuItem.Enabled = GlobalWin.Tools.IsAvailable<NESMusicRipper>();
}
private void FdsControlsMenuItem_DropDownOpened(object sender, EventArgs e)
@ -1656,10 +1706,39 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<GBAGPUView>();
}
private void GBAmGBAMenuItem_Click(object sender, EventArgs e)
{
Global.Config.GBA_UsemGBA = true;
FlagNeedsReboot();
}
private void GBAVBANextMenuItem_Click(object sender, EventArgs e)
{
Global.Config.GBA_UsemGBA = false;
FlagNeedsReboot();
}
private void GBACoreSelectionSubMenu_DropDownOpened(object sender, EventArgs e)
{
GBAmGBAMenuItem.Checked = Global.Config.GBA_UsemGBA == true;
GBAVBANextMenuItem.Checked = Global.Config.GBA_UsemGBA == false;
}
private void gBAWithMGBAToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.GBA_UsemGBA ^= true;
FlagNeedsReboot();
}
#endregion
#region PSX
private void PSXHashDiscsToolStripMenuItem_Click(object sender, EventArgs e)
{
new PSXHashDiscs().ShowDialog();
}
private void PSXSubMenu_DropDownOpened(object sender, EventArgs e)
{
PSXControllerSettingsMenuItem.Enabled = !Global.MovieSession.Movie.IsActive;
@ -1667,7 +1746,7 @@ namespace BizHawk.Client.EmuHawk
private void PSXControllerSettingsMenuItem_Click(object sender, EventArgs e)
{
new PSXControllerConfig().ShowDialog();
new PSXControllerConfigNew().ShowDialog();
}
#endregion
@ -1942,6 +2021,10 @@ namespace BizHawk.Client.EmuHawk
#region Apple II
private void settingsToolStripMenuItem1_Click_1(object sender, EventArgs e)
{
GenericCoreConfig.DoDialog(this, "Apple II Settings");
}
private void AppleSubMenu_DropDownOpened(object sender, EventArgs e)
{
@ -2129,11 +2212,16 @@ namespace BizHawk.Client.EmuHawk
private void DisplayConfigMenuItem_Click(object sender, EventArgs e)
{
var result = new config.DisplayConfigLite().ShowDialog();
var window = new config.DisplayConfigLite();
var result = window.ShowDialog();
if (result == DialogResult.OK)
{
FrameBufferResized();
SynchChrome();
if (window.NeedReset)
{
GlobalWin.OSD.AddMessage("Restart program for changed settings");
}
}
}
@ -2363,13 +2451,26 @@ namespace BizHawk.Client.EmuHawk
}
}
private void timerMouseIdle_Tick(object sender, EventArgs e)
{
if (_inFullscreen && Global.Config.DispChrome_Fullscreen_AutohideMouse)
AutohideCursor(true);
}
private void MainForm_Enter(object sender, EventArgs e)
{
GlobalWin.DisplayManager.NeedsToPaint = true;
AutohideCursor(false);
}
public void MainForm_MouseMove(object sender, MouseEventArgs e)
{
AutohideCursor(false);
}
public void MainForm_MouseClick(object sender, MouseEventArgs e)
{
AutohideCursor(false);
if (Global.Config.ShowContextMenu && e.Button == MouseButtons.Right)
{
MainFormContextMenu.Show(

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

@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk
break;
case "Toggle Throttle":
_unthrottled ^= true;
GlobalWin.OSD.AddMessage("Unthrottled: " + _unthrottled);
ThrottleMessage();
break;
case "Soft Reset":
SoftReset();

13
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -30,6 +30,9 @@ namespace BizHawk.Client.EmuHawk
try
{
var tasmovie = (movie as TasMovie);
if (tasmovie != null)
tasmovie.TasStateManager.MountWriteAccess();
Global.MovieSession.QueueNewMovie(movie, record, Global.Emulator);
}
catch (MoviePlatformMismatchException ex)
@ -82,6 +85,10 @@ namespace BizHawk.Client.EmuHawk
}
Global.Emulator.ResetCounters();
}
else if (Global.Emulator.HasSaveRam() && movie.StartsFromSaveRam)
{
Global.Emulator.AsSaveRam().StoreSaveRam(movie.SaveRam);
}
Global.MovieSession.RunQueuedMovie(record);
@ -90,6 +97,12 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Restart<VirtualpadTool>();
GlobalWin.DisplayManager.NeedsToPaint = true;
if (Global.MovieSession.Movie.Hash != Global.Game.Hash)
{
GlobalWin.OSD.AddMessage("Warning: Movie hash does not match the ROM");
}
return true;
}

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

@ -211,6 +211,7 @@ namespace BizHawk.Client.EmuHawk
Database.LoadDatabase(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "gamedb.txt"));
//TODO GL - a lot of disorganized wiring-up here
CGC.CGCBinPath = Path.Combine(PathManager.GetDllDirectory(), "cgc.exe");
PresentationPanel = new PresentationPanel();
GlobalWin.DisplayManager = new DisplayManager(PresentationPanel);
Controls.Add(PresentationPanel);
@ -326,11 +327,14 @@ namespace BizHawk.Client.EmuHawk
if (cmdMovie != null)
{
_supressSyncSettingsWarning = true; // We dont' want to be nagged if we are attempting to automate
if (Global.Game == null)
{
OpenRom();
}
else
// If user picked a game, then do the commandline logic
if (!Global.Game.IsNullInstance)
{
var movie = MovieService.Get(cmdMovie);
Global.MovieSession.ReadOnly = true;
@ -341,8 +345,33 @@ namespace BizHawk.Client.EmuHawk
_autoDumpLength = movie.InputLogLength;
}
StartNewMovie(movie, false);
Global.Config.RecentMovies.Add(cmdMovie);
// Copy pasta from drag & drop
string errorMsg;
string warningMsg;
if (MovieImport.IsValidMovieExtension(Path.GetExtension(cmdMovie)))
{
var imported = MovieImport.ImportFile(cmdMovie, out errorMsg, out warningMsg);
if (!string.IsNullOrEmpty(errorMsg))
{
MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
else
{
// fix movie extension to something palatable for these purposes.
// for instance, something which doesnt clobber movies you already may have had.
// i'm evenly torn between this, and a file in %TEMP%, but since we dont really have a way to clean up this tempfile, i choose this:
StartNewMovie(imported, false);
}
GlobalWin.OSD.AddMessage(warningMsg);
}
else
{
StartNewMovie(movie, false);
Global.Config.RecentMovies.Add(cmdMovie);
}
_supressSyncSettingsWarning = false;
}
}
else if (Global.Config.RecentMovies.AutoLoad && !Global.Config.RecentMovies.Empty)
@ -417,6 +446,8 @@ namespace BizHawk.Client.EmuHawk
};
}
private bool _supressSyncSettingsWarning = false;
public void ProgramRunLoop()
{
CheckMessages();
@ -815,6 +846,18 @@ namespace BizHawk.Client.EmuHawk
}
}
public byte[] CurrentFrameBuffer(bool captureOSD)
{
using (var bb = captureOSD ? CaptureOSD() : MakeScreenshotImage())
{
using (var img = bb.ToSysdrawingBitmap())
{
ImageConverter converter = new ImageConverter();
return (byte[])converter.ConvertTo(img, typeof(byte[]));
}
}
}
public void TakeScreenshotToClipboard()
{
using (var bb = Global.Config.Screenshot_CaptureOSD ? CaptureOSD() : MakeScreenshotImage())
@ -828,9 +871,27 @@ namespace BizHawk.Client.EmuHawk
public void TakeScreenshot()
{
TakeScreenshot(
String.Format(PathManager.ScreenshotPrefix(Global.Game) + ".{0:yyyy-MM-dd HH.mm.ss}.png", DateTime.Now)
);
string fmt = "{0}.{1:yyyy-MM-dd HH.mm.ss}{2}.png";
string prefix = PathManager.ScreenshotPrefix(Global.Game);
var ts = DateTime.Now;
string fname_bare = string.Format(fmt, prefix, ts, "");
string fname = string.Format(fmt, prefix, ts, " (0)");
//if this file already exists,
//1. move the original file to a numbered one (to keep a good filesystem sort ordering)
if (File.Exists(fname_bare))
File.Move(fname_bare, fname);
else fname = fname_bare;
//2. create next one sequentially named
int seq = 0;
while (File.Exists(fname))
{
var sequence = string.Format(" ({0})", seq++);
fname = string.Format(fmt, prefix, ts, sequence);
}
TakeScreenshot(fname);
}
public void TakeScreenshot(string path)
@ -907,8 +968,6 @@ namespace BizHawk.Client.EmuHawk
public void SynchChrome()
{
//PANTS
if (_inFullscreen)
{
//TODO - maybe apply a hack tracked during fullscreen here to override it
@ -928,11 +987,12 @@ namespace BizHawk.Client.EmuHawk
else if (Global.Config.DispChrome_FrameWindowed == 2)
FormBorderStyle = System.Windows.Forms.FormBorderStyle.Sizable;
}
}
public void ToggleFullscreen(bool allowSuppress=false)
{
AutohideCursor(false);
//prohibit this operation if the current controls include LMouse
if (allowSuppress)
{
@ -1020,6 +1080,28 @@ namespace BizHawk.Client.EmuHawk
}
}
public void Unthrottle()
{
_unthrottled = true;
}
public void Throttle()
{
_unthrottled = false;
}
void ThrottleMessage()
{
string ttype = ":(none)";
if (Global.Config.SoundThrottle) { ttype = ":Sound"; }
if (Global.Config.VSyncThrottle) { ttype = string.Format(":Vsync{0}", Global.Config.VSync?"[ena]":"[dis]"); }
if (Global.Config.ClockThrottle) { ttype = ":Clock"; }
string xtype = _unthrottled ? "Unthrottled" : "Throttled";
string msg = string.Format("{0}{1} ", xtype, ttype);
GlobalWin.OSD.AddMessage(msg);
}
public void FrameSkipMessage()
{
GlobalWin.OSD.AddMessage("Frameskipping set to " + Global.Config.FrameSkip);
@ -1216,6 +1298,8 @@ namespace BizHawk.Client.EmuHawk
private bool _wasPaused;
private bool _didMenuPause;
private Cursor _blankCursor;
private bool _cursorHidden;
private bool _inFullscreen;
private Point _windowedLocation;
@ -1263,6 +1347,12 @@ namespace BizHawk.Client.EmuHawk
str = str + string.Format("({0}x{1}) - ", size.Width, size.Height);
}
//we need to display FPS somewhere, in this case
if (Global.Config.DispSpeedupFeatures == 0)
{
str = str + string.Format("({0} fps) -", _runloopLastFps);
}
if (Global.Emulator.IsNull())
{
str = str + "BizHawk" + (VersionInfo.DeveloperBuild ? " (interim) " : string.Empty);
@ -1720,6 +1810,27 @@ namespace BizHawk.Client.EmuHawk
}
}
void AutohideCursor(bool hide)
{
if (hide && !_cursorHidden)
{
if (_blankCursor == null)
{
var ms = new System.IO.MemoryStream(BizHawk.Client.EmuHawk.Properties.Resources.BlankCursor);
_blankCursor = new Cursor(ms);
}
PresentationPanel.Control.Cursor = _blankCursor;
_cursorHidden = true;
}
else if (!hide && _cursorHidden)
{
PresentationPanel.Control.Cursor = Cursors.Default;
timerMouseIdle.Stop();
timerMouseIdle.Start();
_cursorHidden = false;
}
}
private static unsafe BitmapBuffer MakeScreenshotImage()
{
var bb = new BitmapBuffer(Global.Emulator.VideoProvider().BufferWidth, Global.Emulator.VideoProvider().BufferHeight, Global.Emulator.VideoProvider().GetVideoBuffer());
@ -1786,9 +1897,12 @@ namespace BizHawk.Client.EmuHawk
LoadState(ofd.FileName, Path.GetFileName(ofd.FileName));
}
private static void SaveSlotSelectedMessage()
private void SaveSlotSelectedMessage()
{
GlobalWin.OSD.AddMessage("Slot " + Global.Config.SaveSlot + " selected.");
int slot = Global.Config.SaveSlot;
string emptypart = _stateSlots.HasSlot(slot) ? "" : " (empty)";
string message = string.Format("Slot {0}{1} selected.", slot, emptypart);
GlobalWin.OSD.AddMessage(message);
}
private void Render()
@ -1797,7 +1911,7 @@ namespace BizHawk.Client.EmuHawk
var video = Global.Emulator.VideoProvider();
//bool change = false;
Size currVideoSize = new Size(video.BufferWidth,video.BufferHeight);
Size currVirtualSize = new Size(video.VirtualWidth,video.VirtualWidth);
Size currVirtualSize = new Size(video.VirtualWidth,video.VirtualHeight);
if (currVideoSize != _lastVideoSize || currVirtualSize != _lastVirtualSize)
{
_lastVideoSize = currVideoSize;
@ -1851,10 +1965,10 @@ namespace BizHawk.Client.EmuHawk
if (VersionInfo.DeveloperBuild)
{
return FormatFilter(
"Rom Files", "*.nes;*.fds;*.sms;*.gg;*.sg;*.pce;*.sgx;*.bin;*.smd;*.rom;*.a26;*.a78;*.lnx;*.m3u;*.cue;*.ccd;*.exe;*.gb;*.gbc;*.gba;*.gen;*.md;*.col;.int;*.smc;*.sfc;*.prg;*.d64;*.g64;*.crt;*.sgb;*.xml;*.z64;*.v64;*.n64;*.ws;*.wsc;*.dsk;*.do;*.po;%ARCH%",
"Music Files", "*.psf;*.sid;*.nsf",
"Rom Files", "*.nes;*.fds;*unf;*.sms;*.gg;*.sg;*.pce;*.sgx;*.bin;*.smd;*.rom;*.a26;*.a78;*.lnx;*.m3u;*.cue;*.ccd;*.exe;*.gb;*.gbc;*.gba;*.gen;*.md;*.col;.int;*.smc;*.sfc;*.prg;*.d64;*.g64;*.crt;*.sgb;*.xml;*.z64;*.v64;*.n64;*.ws;*.wsc;*.dsk;*.do;*.po;*.psf;*.minipsf;*.nsf;%ARCH%",
"Music Files", "*.psf;*.minipsf;*.sid;*.nsf",
"Disc Images", "*.cue;*.ccd;*.m3u",
"NES", "*.nes;*.fds;*.nsf;%ARCH%",
"NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%",
"Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
"Master System", "*.sms;*.gg;*.sg;%ARCH%",
"PC Engine", "*.pce;*.sgx;*.cue;*.ccd;%ARCH%",
@ -1869,8 +1983,9 @@ namespace BizHawk.Client.EmuHawk
"Gameboy Advance", "*.gba;%ARCH%",
"Colecovision", "*.col;%ARCH%",
"Intellivision (very experimental)", "*.int;*.bin;*.rom;%ARCH%",
"PlayStation", "*.cue;*.ccd;*.m3u",
"PSX Executables (experimental)", "*.exe",
"PSF Playstation Sound File (not supported)", "*.psf",
"PSF Playstation Sound File", "*.psf;*.minipsf",
"Commodore 64 (experimental)", "*.prg; *.d64, *.g64; *.crt;%ARCH%",
"SID Commodore 64 Music File", "*.sid;%ARCH%",
"Nintendo 64", "*.z64;*.v64;*.n64",
@ -1880,10 +1995,12 @@ namespace BizHawk.Client.EmuHawk
}
return FormatFilter(
"Rom Files", "*.nes;*.fds;*.sms;*.gg;*.sg;*.gb;*.gbc;*.gba;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.smc;*.sfc;*.a26;*.a78;*.lnx;*.col;*.rom;*.cue;*.ccd;*.sgb;*.z64;*.v64;*.n64;*.ws;*.wsc;*.xml;*.dsk;*.do;*.po;%ARCH%",
"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.gb;*.gbc;*.gba;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.smc;*.sfc;*.a26;*.a78;*.lnx;*.col;*.rom;*.m3u;*.cue;*.ccd;*.sgb;*.z64;*.v64;*.n64;*.ws;*.wsc;*.xml;*.dsk;*.do;*.po;*.psf;*.minipsf;*.nsf;%ARCH%",
"Disc Images", "*.cue;*.ccd;*.m3u",
"NES", "*.nes;*.fds;*.nsf;%ARCH%",
"NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%",
"Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
"PlayStation", "*.cue;*.ccd;*.m3u",
"PSF Playstation Sound File", "*.psf;*.minipsf",
"Nintendo 64", "*.z64;*.v64;*.n64",
"Gameboy", "*.gb;*.gbc;*.sgb;%ARCH%",
"Gameboy Advance", "*.gba;%ARCH%",
@ -1938,7 +2055,7 @@ namespace BizHawk.Client.EmuHawk
e.Settings = Global.Config.GetCoreSyncSettings(e.Core);
// adelikat: only show this nag if the core actually has sync settings, not all cores do
if (e.Settings != null)
if (e.Settings != null && !_supressSyncSettingsWarning)
{
MessageBox.Show(
"No sync settings found, using currently configured settings for this core.",
@ -1983,7 +2100,7 @@ namespace BizHawk.Client.EmuHawk
{
GlobalWin.OSD.AddMessage("Attempt to change sync-relevant settings while recording BLOCKED.");
}
else if (settable.HasSyncSettings && settable.PutSyncSettings(o))
else if (settable.HasSyncSettings && settable.PutSyncSettings(o))
{
FlagNeedsReboot();
}
@ -2181,7 +2298,7 @@ namespace BizHawk.Client.EmuHawk
public BitmapBuffer CaptureOSD()
{
var bb = GlobalWin.DisplayManager.RenderOffscreen(Global.Emulator.VideoProvider(), true);
bb.Normalize(true);
bb.DiscardAlpha();
return bb;
}
@ -2517,7 +2634,7 @@ namespace BizHawk.Client.EmuHawk
});
}
public void LoadState(string path, string userFriendlyStateName, bool fromLua = false) // Move to client.common
public void LoadState(string path, string userFriendlyStateName, bool fromLua = false, bool supressOSD = false) // Move to client.common
{
if (!Global.Emulator.HasSavestates())
{
@ -2540,7 +2657,11 @@ namespace BizHawk.Client.EmuHawk
UpdateToolsAfter(fromLua);
UpdateToolsLoadstate();
Global.AutoFireController.ClearStarts();
GlobalWin.OSD.AddMessage("Loaded state: " + userFriendlyStateName);
if (!supressOSD)
{
GlobalWin.OSD.AddMessage("Loaded state: " + userFriendlyStateName);
}
if (GlobalWin.Tools.Has<LuaConsole>())
{
@ -2555,7 +2676,7 @@ namespace BizHawk.Client.EmuHawk
Global.MovieSession.Movie.IsCountingRerecords = wasCountingRerecords;
}
public void LoadQuickSave(string quickSlotName, bool fromLua = false)
public void LoadQuickSave(string quickSlotName, bool fromLua = false, bool supressOSD = false)
{
if (!Global.Emulator.HasSavestates())
{
@ -2566,10 +2687,11 @@ namespace BizHawk.Client.EmuHawk
if (File.Exists(path) == false)
{
GlobalWin.OSD.AddMessage("Unable to load " + quickSlotName + ".State");
return;
}
LoadState(path, quickSlotName, fromLua);
LoadState(path, quickSlotName, fromLua, supressOSD);
}
public void SaveState(string path, string userFriendlyStateName, bool fromLua)
@ -2789,6 +2911,10 @@ namespace BizHawk.Client.EmuHawk
}
GlobalWin.OSD.FPS = fps_string;
//need to refresh window caption in this case
if (Global.Config.DispSpeedupFeatures == 0)
SetWindowText();
}
CaptureRewind(suppressCaptureRewind);
@ -2806,6 +2932,10 @@ namespace BizHawk.Client.EmuHawk
coreskipaudio = IsTurboing && _currAviWriter == null;
//why not skip audio if the user doesnt want sound
if (!Global.Config.SoundEnabled)
coreskipaudio = true;
{
bool render = !_throttle.skipnextframe || _currAviWriter != null;
bool renderSound = !coreskipaudio;
@ -3734,6 +3864,16 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<CoreFeatureAnalysis>();
}
private void BasicBotMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<BasicBot>();
}
private void DisplayMessagesMenuItem_Click(object sender, EventArgs e)
{
Global.Config.DisplayMessages ^= true;
}
private void HelpSubMenu_DropDownOpened(object sender, EventArgs e)
{
FeaturesMenuItem.Visible = VersionInfo.DeveloperBuild;
@ -3750,55 +3890,7 @@ namespace BizHawk.Client.EmuHawk
nesHawkToolStripMenuItem.Checked = Global.Config.NES_InQuickNES == false;
}
private void quickNESToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NES_InQuickNES = true;
FlagNeedsReboot();
}
private void nesHawkToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NES_InQuickNES = false;
FlagNeedsReboot();
}
private void GBAmGBAMenuItem_Click(object sender, EventArgs e)
{
Global.Config.GBA_UsemGBA = true;
FlagNeedsReboot();
}
private void GBAVBANextMenuItem_Click(object sender, EventArgs e)
{
Global.Config.GBA_UsemGBA = false;
FlagNeedsReboot();
}
private void GBACoreSelectionSubMenu_DropDownOpened(object sender, EventArgs e)
{
GBAmGBAMenuItem.Checked = Global.Config.GBA_UsemGBA == true;
GBAVBANextMenuItem.Checked = Global.Config.GBA_UsemGBA == false;
}
private void gBAWithMGBAToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.GBA_UsemGBA ^= true;
FlagNeedsReboot();
}
private void AutoHawkMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<AutoHawk>();
}
private void settingsToolStripMenuItem1_Click_1(object sender, EventArgs e)
{
GenericCoreConfig.DoDialog(this, "Apple II Settings");
}
private void PSXHashDiscsToolStripMenuItem_Click(object sender, EventArgs e)
{
new PSXHashDiscs().ShowDialog();
}
}
}

5
BizHawk.Client.EmuHawk/MainForm.resx
View File

@ -567,7 +567,10 @@
BBW3kfECg6SiSi9TP3UAAAAASUVORK5CYII=
</value>
</data>
<metadata name="timerMouseIdle.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>399, 13</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>89</value>
<value>65</value>
</metadata>
</root>

6
BizHawk.Client.EmuHawk/PresentationPanel.cs
View File

@ -34,6 +34,7 @@ namespace BizHawk.Client.EmuHawk
//http://stackoverflow.com/questions/547172/pass-through-mouse-events-to-parent-control (HTTRANSPARENT)
GraphicsControl.MouseDoubleClick += (o, e) => HandleFullscreenToggle(o, e);
GraphicsControl.MouseClick += (o, e) => GlobalWin.MainForm.MainForm_MouseClick(o, e);
GraphicsControl.MouseMove += (o, e) => GlobalWin.MainForm.MainForm_MouseMove(o, e);
}
bool IsDisposed = false;
@ -57,7 +58,10 @@ namespace BizHawk.Client.EmuHawk
{
//allow suppression of the toggle.. but if shift is pressed, always do the toggle
bool allowSuppress = Control.ModifierKeys != Keys.Shift;
GlobalWin.MainForm.ToggleFullscreen(allowSuppress);
if (Global.Config.DispChrome_AllowDoubleClickFullscreen || !allowSuppress)
{
GlobalWin.MainForm.ToggleFullscreen(allowSuppress);
}
}
}

52
BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.0
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -180,6 +180,16 @@ namespace BizHawk.Client.EmuHawk.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] BlankCursor {
get {
object obj = ResourceManager.GetObject("BlankCursor", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -690,6 +700,36 @@ namespace BizHawk.Client.EmuHawk.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap icon_anchor {
get {
object obj = ResourceManager.GetObject("icon_anchor", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap icon_anchor_lag {
get {
object obj = ResourceManager.GetObject("icon_anchor_lag", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap icon_marker {
get {
object obj = ResourceManager.GetObject("icon_marker", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -720,6 +760,16 @@ namespace BizHawk.Client.EmuHawk.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap kitchensink {
get {
object obj = ResourceManager.GetObject("kitchensink", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

1803
BizHawk.Client.EmuHawk/Properties/Resources.resx
View File

File diff suppressed because it is too large Load Diff

74
BizHawk.Client.EmuHawk/Throttle.cs
View File

@ -49,6 +49,41 @@ namespace BizHawk.Client.EmuHawk
public void Step(bool allowSleep, int forceFrameSkip)
{
//TODO - figure out what allowSleep is supposed to be used for
//TODO - figure out what forceFrameSkip is supposed to be used for
bool extraThrottle = false;
//if we're paused, none of this should happen. just clean out our state and dont skip
//notably, if we're frame-advancing, we should be paused.
if (signal_paused && !signal_continuousframeAdvancing)
{
//Console.WriteLine("THE THING: {0} {1}", signal_paused ,signal_continuousframeAdvancing);
skipnextframe = false;
framesskipped = 0;
framestoskip = 0;
return;
}
//heres some ideas for how to begin cleaning this up
////at this point, its assumed that we're running.
////this could be a free run, an unthrottled run, or a 'continuous frame advance' (aka continuous) run
////free run: affected by frameskips and throttles
////unthrottled run: affected by frameskips only
////continuous run: affected by frameskips and throttles
////so continuous and free are the same?
//bool continuous_run = signal_continuousframeAdvancing;
//bool unthrottled_run = signal_unthrottle;
//bool free_run = !continuous_run && !unthrottled_run;
//bool do_throttle, do_skip;
//if (continuous_run || free_run)
// do_throttle = do_skip = true;
//else if (unthrottled_run)
// do_skip = true;
//else throw new InvalidOperationException();
int skipRate = (forceFrameSkip < 0) ? cfg_frameskiprate : forceFrameSkip;
int ffSkipRate = (forceFrameSkip < 0) ? 3 : forceFrameSkip;
@ -58,12 +93,22 @@ namespace BizHawk.Client.EmuHawk
framestoskip = 0; // otherwise switches to lower frameskip rates will lag behind
}
if (!skipnextframe || forceFrameSkip == 0 || signal_frameAdvance || (signal_continuousframeAdvancing && !signal_unthrottle))
if (!skipnextframe || forceFrameSkip == 0 || (signal_continuousframeAdvancing && !signal_unthrottle))
{
framesskipped = 0;
if (framestoskip > 0)
skipnextframe = true;
if (signal_continuousframeAdvancing)
{
//dont ever skip frames when continuous frame advancing. it's meant for precision work.
//but we DO need to throttle
if(Global.Config.ClockThrottle)
extraThrottle = true;
}
else
{
if (framestoskip > 0)
skipnextframe = true;
}
}
else
{
@ -72,11 +117,9 @@ namespace BizHawk.Client.EmuHawk
if (framestoskip < 1)
skipnextframe = false;
else
skipnextframe = true;
skipnextframe = true;
framesskipped++;
//NDS_SkipNextFrame();
}
if (signal_unthrottle)
@ -89,14 +132,14 @@ namespace BizHawk.Client.EmuHawk
if (framestoskip < 1)
framestoskip += ffSkipRate;
}
else if ((signal_paused || /*autoframeskipenab && frameskiprate ||*/ cfg_frameLimit || signal_overrideSecondaryThrottle) && allowSleep)
else if ((extraThrottle || signal_paused || /*autoframeskipenab && frameskiprate ||*/ cfg_frameLimit || signal_overrideSecondaryThrottle) && allowSleep)
{
SpeedThrottle(signal_paused);
}
if (cfg_autoframeskipenab && cfg_frameskiprate != 0)
{
if (!signal_frameAdvance && !signal_continuousframeAdvancing)
if (!signal_continuousframeAdvancing)
{
AutoFrameSkip_NextFrame();
if (framestoskip < 1)
@ -108,21 +151,6 @@ namespace BizHawk.Client.EmuHawk
if (framestoskip < 1)
framestoskip += skipRate;
}
if (signal_frameAdvance && allowSleep)
{
//this logic has been replaced by some logic in steprunloop_core.
//really, it should be moved back here somehow later.
//frameAdvance = false;
//emu_halt();
//SPU_Pause(1);
}
//if (execute && emu_paused && !frameAdvance)
//{
// // safety net against running out of control in case this ever happens.
// Unpause(); Pause();
//}
}
static ulong GetCurTime()

232
BizHawk.Client.EmuHawk/config/DisplayConfigLite.Designer.cs generated
View File

@ -60,6 +60,9 @@
this.label5 = new System.Windows.Forms.Label();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tpAR = new System.Windows.Forms.TabPage();
this.label11 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.nudPrescale = new System.Windows.Forms.NumericUpDown();
this.tpDispMethod = new System.Windows.Forms.TabPage();
this.label6 = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox();
@ -68,10 +71,16 @@
this.label7 = new System.Windows.Forms.Label();
this.rbGDIPlus = new System.Windows.Forms.RadioButton();
this.tpMisc = new System.Windows.Forms.TabPage();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.rbDisplayAbsoluteZero = new System.Windows.Forms.RadioButton();
this.rbDisplayMinimal = new System.Windows.Forms.RadioButton();
this.rbDisplayFull = new System.Windows.Forms.RadioButton();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.cbAllowDoubleclickFullscreen = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.cbFSAutohideMouse = new System.Windows.Forms.CheckBox();
this.label1 = new System.Windows.Forms.Label();
this.checkFullscreenHacks = new System.Windows.Forms.CheckBox();
this.cbFullscreenHacks = new System.Windows.Forms.CheckBox();
this.cbStatusBarFullscreen = new System.Windows.Forms.CheckBox();
this.cbMenuFullscreen = new System.Windows.Forms.CheckBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
@ -81,23 +90,22 @@
this.cbMenuWindowed = new System.Windows.Forms.CheckBox();
this.trackbarFrameSizeWindowed = new BizHawk.Client.EmuHawk.TransparentTrackBar();
this.cbCaptionWindowed = new System.Windows.Forms.CheckBox();
this.nudPrescale = new System.Windows.Forms.NumericUpDown();
this.label10 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tbScanlineIntensity)).BeginInit();
this.grpFinalFilter.SuspendLayout();
this.grpARSelection.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tpAR.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nudPrescale)).BeginInit();
this.tpDispMethod.SuspendLayout();
this.groupBox3.SuspendLayout();
this.tpMisc.SuspendLayout();
this.groupBox5.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.trackbarFrameSizeWindowed)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudPrescale)).BeginInit();
this.SuspendLayout();
//
// btnCancel
@ -376,17 +384,17 @@
//
// label2
//
this.label2.Location = new System.Drawing.Point(4, 28);
this.label2.Location = new System.Drawing.Point(3, 125);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(398, 45);
this.label2.Size = new System.Drawing.Size(398, 27);
this.label2.TabIndex = 17;
this.label2.Text = "Some people think the whitenoise is a great idea, and some people don\'t. Enabling" +
" this displays an Oxoo instead.";
this.label2.Text = "Some people think the white noise is a great idea, and some people don\'t. Disabli" +
"ng this displays black instead.";
//
// checkSnowyNullEmulator
//
this.checkSnowyNullEmulator.AutoSize = true;
this.checkSnowyNullEmulator.Location = new System.Drawing.Point(3, 3);
this.checkSnowyNullEmulator.Location = new System.Drawing.Point(3, 105);
this.checkSnowyNullEmulator.Name = "checkSnowyNullEmulator";
this.checkSnowyNullEmulator.Size = new System.Drawing.Size(159, 17);
this.checkSnowyNullEmulator.TabIndex = 16;
@ -446,6 +454,46 @@
this.tpAR.TabIndex = 0;
this.tpAR.Text = "Scaling & Filtering";
this.tpAR.UseVisualStyleBackColor = true;
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(307, 117);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(14, 13);
this.label11.TabIndex = 16;
this.label11.Text = "X";
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(208, 116);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(51, 13);
this.label10.TabIndex = 15;
this.label10.Text = "Prescale:";
//
// nudPrescale
//
this.nudPrescale.Location = new System.Drawing.Point(260, 113);
this.nudPrescale.Maximum = new decimal(new int[] {
16,
0,
0,
0});
this.nudPrescale.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.nudPrescale.Name = "nudPrescale";
this.nudPrescale.Size = new System.Drawing.Size(45, 20);
this.nudPrescale.TabIndex = 14;
this.nudPrescale.Value = new decimal(new int[] {
1,
0,
0,
0});
//
// tpDispMethod
//
@ -482,17 +530,17 @@
//
// label8
//
this.label8.Location = new System.Drawing.Point(24, 30);
this.label8.Location = new System.Drawing.Point(21, 30);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(359, 47);
this.label8.TabIndex = 20;
this.label8.Text = " • Not working yet\r\n • Best compatibility\r\n • No support for custom shaders\r\n";
this.label8.Text = " • Best compatibility\r\n • May have trouble with OpenGL-based cores (Saturn,N64)\r\n" +
"";
//
// rbD3D9
//
this.rbD3D9.AutoSize = true;
this.rbD3D9.Checked = true;
this.rbD3D9.Enabled = false;
this.rbD3D9.Location = new System.Drawing.Point(6, 10);
this.rbD3D9.Name = "rbD3D9";
this.rbD3D9.Size = new System.Drawing.Size(73, 17);
@ -507,8 +555,8 @@
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(359, 47);
this.label7.TabIndex = 18;
this.label7.Text = " • Mainly for compatibility purposes\r\n • Missing some features\r\n • Works better o" +
"ver Remote Desktop, etc.\r\n";
this.label7.Text = " • Slow; Mainly for compatibility purposes\r\n • Missing many features\r\n • Works be" +
"tter over Remote Desktop, etc.\r\n";
//
// rbGDIPlus
//
@ -524,6 +572,7 @@
//
// tpMisc
//
this.tpMisc.Controls.Add(this.groupBox5);
this.tpMisc.Controls.Add(this.label2);
this.tpMisc.Controls.Add(this.checkSnowyNullEmulator);
this.tpMisc.Location = new System.Drawing.Point(4, 22);
@ -533,8 +582,55 @@
this.tpMisc.Text = "Misc";
this.tpMisc.UseVisualStyleBackColor = true;
//
// groupBox5
//
this.groupBox5.Controls.Add(this.rbDisplayAbsoluteZero);
this.groupBox5.Controls.Add(this.rbDisplayMinimal);
this.groupBox5.Controls.Add(this.rbDisplayFull);
this.groupBox5.Location = new System.Drawing.Point(3, 3);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(371, 96);
this.groupBox5.TabIndex = 20;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Display Features (for speeding up replays)";
//
// rbDisplayAbsoluteZero
//
this.rbDisplayAbsoluteZero.AutoSize = true;
this.rbDisplayAbsoluteZero.Location = new System.Drawing.Point(7, 66);
this.rbDisplayAbsoluteZero.Name = "rbDisplayAbsoluteZero";
this.rbDisplayAbsoluteZero.Size = new System.Drawing.Size(174, 17);
this.rbDisplayAbsoluteZero.TabIndex = 2;
this.rbDisplayAbsoluteZero.TabStop = true;
this.rbDisplayAbsoluteZero.Text = "Absolute Zero - Display Nothing";
this.rbDisplayAbsoluteZero.UseVisualStyleBackColor = true;
//
// rbDisplayMinimal
//
this.rbDisplayMinimal.AutoSize = true;
this.rbDisplayMinimal.Enabled = false;
this.rbDisplayMinimal.Location = new System.Drawing.Point(7, 43);
this.rbDisplayMinimal.Name = "rbDisplayMinimal";
this.rbDisplayMinimal.Size = new System.Drawing.Size(185, 17);
this.rbDisplayMinimal.TabIndex = 1;
this.rbDisplayMinimal.TabStop = true;
this.rbDisplayMinimal.Text = "Minimal - Display HUD Only (TBD)";
this.rbDisplayMinimal.UseVisualStyleBackColor = true;
//
// rbDisplayFull
//
this.rbDisplayFull.AutoSize = true;
this.rbDisplayFull.Location = new System.Drawing.Point(7, 20);
this.rbDisplayFull.Name = "rbDisplayFull";
this.rbDisplayFull.Size = new System.Drawing.Size(137, 17);
this.rbDisplayFull.TabIndex = 0;
this.rbDisplayFull.TabStop = true;
this.rbDisplayFull.Text = "Full - Display Everything";
this.rbDisplayFull.UseVisualStyleBackColor = true;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.cbAllowDoubleclickFullscreen);
this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Controls.Add(this.groupBox2);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
@ -545,19 +641,40 @@
this.tabPage1.Text = "Window";
this.tabPage1.UseVisualStyleBackColor = true;
//
// cbAllowDoubleclickFullscreen
//
this.cbAllowDoubleclickFullscreen.AutoSize = true;
this.cbAllowDoubleclickFullscreen.Location = new System.Drawing.Point(12, 223);
this.cbAllowDoubleclickFullscreen.Name = "cbAllowDoubleclickFullscreen";
this.cbAllowDoubleclickFullscreen.Size = new System.Drawing.Size(347, 17);
this.cbAllowDoubleclickFullscreen.TabIndex = 27;
this.cbAllowDoubleclickFullscreen.Text = "Allow Double-Click Fullscreen (hold shift to force fullscreen to toggle)";
this.cbAllowDoubleclickFullscreen.UseVisualStyleBackColor = true;
//
// groupBox4
//
this.groupBox4.Controls.Add(this.cbFSAutohideMouse);
this.groupBox4.Controls.Add(this.label1);
this.groupBox4.Controls.Add(this.checkFullscreenHacks);
this.groupBox4.Controls.Add(this.cbFullscreenHacks);
this.groupBox4.Controls.Add(this.cbStatusBarFullscreen);
this.groupBox4.Controls.Add(this.cbMenuFullscreen);
this.groupBox4.Location = new System.Drawing.Point(143, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(266, 212);
this.groupBox4.Size = new System.Drawing.Size(266, 211);
this.groupBox4.TabIndex = 27;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Fullscreen";
//
// cbFSAutohideMouse
//
this.cbFSAutohideMouse.AutoSize = true;
this.cbFSAutohideMouse.Location = new System.Drawing.Point(87, 19);
this.cbFSAutohideMouse.Name = "cbFSAutohideMouse";
this.cbFSAutohideMouse.Size = new System.Drawing.Size(141, 17);
this.cbFSAutohideMouse.TabIndex = 28;
this.cbFSAutohideMouse.Text = "Auto-Hide Mouse Cursor";
this.cbFSAutohideMouse.UseVisualStyleBackColor = true;
//
// label1
//
this.label1.Location = new System.Drawing.Point(7, 88);
@ -566,15 +683,15 @@
this.label1.TabIndex = 27;
this.label1.Text = resources.GetString("label1.Text");
//
// checkFullscreenHacks
// cbFullscreenHacks
//
this.checkFullscreenHacks.AutoSize = true;
this.checkFullscreenHacks.Location = new System.Drawing.Point(6, 65);
this.checkFullscreenHacks.Name = "checkFullscreenHacks";
this.checkFullscreenHacks.Size = new System.Drawing.Size(191, 17);
this.checkFullscreenHacks.TabIndex = 26;
this.checkFullscreenHacks.Text = "Enable Windows Fullscreen Hacks";
this.checkFullscreenHacks.UseVisualStyleBackColor = true;
this.cbFullscreenHacks.AutoSize = true;
this.cbFullscreenHacks.Location = new System.Drawing.Point(6, 65);
this.cbFullscreenHacks.Name = "cbFullscreenHacks";
this.cbFullscreenHacks.Size = new System.Drawing.Size(191, 17);
this.cbFullscreenHacks.TabIndex = 26;
this.cbFullscreenHacks.Text = "Enable Windows Fullscreen Hacks";
this.cbFullscreenHacks.UseVisualStyleBackColor = true;
//
// cbStatusBarFullscreen
//
@ -606,7 +723,7 @@
this.groupBox2.Controls.Add(this.cbCaptionWindowed);
this.groupBox2.Location = new System.Drawing.Point(6, 6);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(131, 212);
this.groupBox2.Size = new System.Drawing.Size(131, 211);
this.groupBox2.TabIndex = 26;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Windowed";
@ -670,45 +787,16 @@
this.cbCaptionWindowed.Text = "Caption";
this.cbCaptionWindowed.UseVisualStyleBackColor = true;
//
// nudPrescale
// linkLabel1
//
this.nudPrescale.Location = new System.Drawing.Point(260, 113);
this.nudPrescale.Maximum = new decimal(new int[] {
16,
0,
0,
0});
this.nudPrescale.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.nudPrescale.Name = "nudPrescale";
this.nudPrescale.Size = new System.Drawing.Size(45, 20);
this.nudPrescale.TabIndex = 14;
this.nudPrescale.Value = new decimal(new int[] {
1,
0,
0,
0});
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(208, 116);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(51, 13);
this.label10.TabIndex = 15;
this.label10.Text = "Prescale:";
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(307, 117);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(14, 13);
this.label11.TabIndex = 16;
this.label11.Text = "X";
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(12, 404);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(79, 13);
this.linkLabel1.TabIndex = 18;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "Documentation";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// DisplayConfigLite
//
@ -717,6 +805,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(451, 439);
this.Controls.Add(this.linkLabel1);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOk);
@ -734,19 +823,23 @@
this.tabControl1.ResumeLayout(false);
this.tpAR.ResumeLayout(false);
this.tpAR.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nudPrescale)).EndInit();
this.tpDispMethod.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.tpMisc.ResumeLayout(false);
this.tpMisc.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.trackbarFrameSizeWindowed)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudPrescale)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
@ -803,9 +896,16 @@
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Label lblFrameTypeWindowed;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox checkFullscreenHacks;
private System.Windows.Forms.CheckBox cbFullscreenHacks;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.NumericUpDown nudPrescale;
private System.Windows.Forms.CheckBox cbFSAutohideMouse;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.RadioButton rbDisplayAbsoluteZero;
private System.Windows.Forms.RadioButton rbDisplayMinimal;
private System.Windows.Forms.RadioButton rbDisplayFull;
private System.Windows.Forms.CheckBox cbAllowDoubleclickFullscreen;
private System.Windows.Forms.LinkLabel linkLabel1;
}
}

29
BizHawk.Client.EmuHawk/config/DisplayConfigLite.cs
View File

@ -14,7 +14,10 @@ namespace BizHawk.Client.EmuHawk.config
{
public partial class DisplayConfigLite : Form
{
public bool NeedReset;
string PathSelection;
public DisplayConfigLite()
{
InitializeComponent();
@ -34,7 +37,11 @@ namespace BizHawk.Client.EmuHawk.config
tbScanlineIntensity.Value = Global.Config.TargetScanlineFilterIntensity;
checkLetterbox.Checked = Global.Config.DispFixAspectRatio;
checkPadInteger.Checked = Global.Config.DispFixScaleInteger;
checkFullscreenHacks.Checked = Global.Config.DispFullscreenHacks;
cbFullscreenHacks.Checked = Global.Config.DispFullscreenHacks;
if (Global.Config.DispSpeedupFeatures == 2) rbDisplayFull.Checked = true;
if (Global.Config.DispSpeedupFeatures == 1) rbDisplayMinimal.Checked = true;
if (Global.Config.DispSpeedupFeatures == 0) rbDisplayAbsoluteZero.Checked = true;
rbOpenGL.Checked = Global.Config.DispMethod == Config.EDispMethod.OpenGL;
rbGDIPlus.Checked = Global.Config.DispMethod == Config.EDispMethod.GdiPlus;
@ -46,8 +53,11 @@ namespace BizHawk.Client.EmuHawk.config
cbStatusBarFullscreen.Checked = Global.Config.DispChrome_StatusBarFullscreen;
cbMenuFullscreen.Checked = Global.Config.DispChrome_MenuFullscreen;
trackbarFrameSizeWindowed.Value = Global.Config.DispChrome_FrameWindowed;
cbFSAutohideMouse.Checked = Global.Config.DispChrome_Fullscreen_AutohideMouse;
SyncTrackbar();
cbAllowDoubleclickFullscreen.Checked = Global.Config.DispChrome_AllowDoubleClickFullscreen;
nudPrescale.Value = Global.Config.DispPrescale;
// null emulator config hack
@ -96,7 +106,7 @@ namespace BizHawk.Client.EmuHawk.config
Global.Config.TargetScanlineFilterIntensity = tbScanlineIntensity.Value;
Global.Config.DispFixAspectRatio = checkLetterbox.Checked;
Global.Config.DispFixScaleInteger = checkPadInteger.Checked;
Global.Config.DispFullscreenHacks = checkFullscreenHacks.Checked;
Global.Config.DispFullscreenHacks = cbFullscreenHacks.Checked;
Global.Config.DispChrome_StatusBarWindowed = cbStatusBarWindowed.Checked;
Global.Config.DispChrome_CaptionWindowed = cbCaptionWindowed.Checked;
@ -104,6 +114,12 @@ namespace BizHawk.Client.EmuHawk.config
Global.Config.DispChrome_StatusBarFullscreen = cbStatusBarFullscreen.Checked;
Global.Config.DispChrome_MenuFullscreen = cbMenuFullscreen.Checked;
Global.Config.DispChrome_FrameWindowed = trackbarFrameSizeWindowed.Value;
Global.Config.DispChrome_Fullscreen_AutohideMouse = cbFSAutohideMouse.Checked;
Global.Config.DispChrome_AllowDoubleClickFullscreen = cbAllowDoubleclickFullscreen.Checked;
if (rbDisplayFull.Checked) Global.Config.DispSpeedupFeatures = 2;
if (rbDisplayMinimal.Checked) Global.Config.DispSpeedupFeatures = 1;
if (rbDisplayAbsoluteZero.Checked) Global.Config.DispSpeedupFeatures = 0;
// HACK:: null emulator's settings don't persist to config normally
{
@ -129,6 +145,7 @@ namespace BizHawk.Client.EmuHawk.config
int.TryParse(txtCustomARWidth.Text, out Global.Config.DispCustomUserARWidth);
int.TryParse(txtCustomARHeight.Text, out Global.Config.DispCustomUserARHeight);
var oldDisplayMethod = Global.Config.DispMethod;
if(rbOpenGL.Checked)
Global.Config.DispMethod = Config.EDispMethod.OpenGL;
if(rbGDIPlus.Checked)
@ -136,6 +153,9 @@ namespace BizHawk.Client.EmuHawk.config
if(rbD3D9.Checked)
Global.Config.DispMethod = Config.EDispMethod.SlimDX9;
if (oldDisplayMethod != Global.Config.DispMethod)
NeedReset = true;
Global.Config.DispUserFilterPath = PathSelection;
GlobalWin.DisplayManager.RefreshUserShader();
@ -210,5 +230,10 @@ namespace BizHawk.Client.EmuHawk.config
lblFrameTypeWindowed.Text = "Thick";
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
System.Diagnostics.Process.Start("http://tasvideos.org/Bizhawk/DisplayConfig.html");
}
}
}

81
BizHawk.Client.EmuHawk/config/GuiOptions.Designer.cs generated
View File

@ -47,6 +47,7 @@
this.StartPausedCheckbox = new System.Windows.Forms.CheckBox();
this.PauseWhenMenuActivatedCheckbox = new System.Windows.Forms.CheckBox();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.LuaDuringTurboCheckbox = new System.Windows.Forms.CheckBox();
this.label12 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.FrameAdvSkipLagCheckbox = new System.Windows.Forms.CheckBox();
@ -56,10 +57,11 @@
this.label4 = new System.Windows.Forms.Label();
this.LogWindowAsConsoleCheckbox = new System.Windows.Forms.CheckBox();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.LuaDuringTurboCheckbox = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage3.SuspendLayout();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// OkBtn
@ -100,10 +102,7 @@
//
// tabPage1
//
this.tabPage1.Controls.Add(this.StartFullScreenCheckbox);
this.tabPage1.Controls.Add(this.label14);
this.tabPage1.Controls.Add(this.label3);
this.tabPage1.Controls.Add(this.SingleInstanceModeCheckbox);
this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Controls.Add(this.NeverAskSaveCheckbox);
this.tabPage1.Controls.Add(this.label2);
this.tabPage1.Controls.Add(this.AcceptBackgroundInputCheckbox);
@ -111,7 +110,6 @@
this.tabPage1.Controls.Add(this.RunInBackgroundCheckbox);
this.tabPage1.Controls.Add(this.SaveWindowPositionCheckbox);
this.tabPage1.Controls.Add(this.EnableContextMenuCheckbox);
this.tabPage1.Controls.Add(this.StartPausedCheckbox);
this.tabPage1.Controls.Add(this.PauseWhenMenuActivatedCheckbox);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
@ -124,7 +122,7 @@
// StartFullScreenCheckbox
//
this.StartFullScreenCheckbox.AutoSize = true;
this.StartFullScreenCheckbox.Location = new System.Drawing.Point(98, 63);
this.StartFullScreenCheckbox.Location = new System.Drawing.Point(6, 42);
this.StartFullScreenCheckbox.Name = "StartFullScreenCheckbox";
this.StartFullScreenCheckbox.Size = new System.Drawing.Size(110, 17);
this.StartFullScreenCheckbox.TabIndex = 3;
@ -134,25 +132,25 @@
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(26, 246);
this.label14.Location = new System.Drawing.Point(26, 99);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(303, 13);
this.label14.Size = new System.Drawing.Size(306, 13);
this.label14.TabIndex = 12;
this.label14.Text = "Note: Requires closing and reopening EmuHawk to take effect";
this.label14.Text = "Note: Requires closing and reopening EmuHawk to take effect.";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(26, 232);
this.label3.Location = new System.Drawing.Point(26, 85);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(272, 13);
this.label3.Size = new System.Drawing.Size(275, 13);
this.label3.TabIndex = 11;
this.label3.Text = "Enable to force only one instance of EmuHawk at a time";
this.label3.Text = "Enable to force only one instance of EmuHawk at a time.";
//
// SingleInstanceModeCheckbox
//
this.SingleInstanceModeCheckbox.AutoSize = true;
this.SingleInstanceModeCheckbox.Location = new System.Drawing.Point(6, 212);
this.SingleInstanceModeCheckbox.Location = new System.Drawing.Point(6, 65);
this.SingleInstanceModeCheckbox.Name = "SingleInstanceModeCheckbox";
this.SingleInstanceModeCheckbox.Size = new System.Drawing.Size(127, 17);
this.SingleInstanceModeCheckbox.TabIndex = 10;
@ -162,7 +160,7 @@
// NeverAskSaveCheckbox
//
this.NeverAskSaveCheckbox.AutoSize = true;
this.NeverAskSaveCheckbox.Location = new System.Drawing.Point(6, 109);
this.NeverAskSaveCheckbox.Location = new System.Drawing.Point(6, 72);
this.NeverAskSaveCheckbox.Name = "NeverAskSaveCheckbox";
this.NeverAskSaveCheckbox.Size = new System.Drawing.Size(184, 17);
this.NeverAskSaveCheckbox.TabIndex = 5;
@ -172,7 +170,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(26, 192);
this.label2.Location = new System.Drawing.Point(26, 155);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(349, 13);
this.label2.TabIndex = 9;
@ -181,7 +179,7 @@
// AcceptBackgroundInputCheckbox
//
this.AcceptBackgroundInputCheckbox.AutoSize = true;
this.AcceptBackgroundInputCheckbox.Location = new System.Drawing.Point(6, 172);
this.AcceptBackgroundInputCheckbox.Location = new System.Drawing.Point(6, 135);
this.AcceptBackgroundInputCheckbox.Name = "AcceptBackgroundInputCheckbox";
this.AcceptBackgroundInputCheckbox.Size = new System.Drawing.Size(146, 17);
this.AcceptBackgroundInputCheckbox.TabIndex = 8;
@ -191,7 +189,7 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(26, 152);
this.label1.Location = new System.Drawing.Point(26, 115);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(315, 13);
this.label1.TabIndex = 7;
@ -200,7 +198,7 @@
// RunInBackgroundCheckbox
//
this.RunInBackgroundCheckbox.AutoSize = true;
this.RunInBackgroundCheckbox.Location = new System.Drawing.Point(6, 132);
this.RunInBackgroundCheckbox.Location = new System.Drawing.Point(6, 95);
this.RunInBackgroundCheckbox.Name = "RunInBackgroundCheckbox";
this.RunInBackgroundCheckbox.Size = new System.Drawing.Size(117, 17);
this.RunInBackgroundCheckbox.TabIndex = 6;
@ -210,7 +208,7 @@
// SaveWindowPositionCheckbox
//
this.SaveWindowPositionCheckbox.AutoSize = true;
this.SaveWindowPositionCheckbox.Location = new System.Drawing.Point(6, 86);
this.SaveWindowPositionCheckbox.Location = new System.Drawing.Point(6, 49);
this.SaveWindowPositionCheckbox.Name = "SaveWindowPositionCheckbox";
this.SaveWindowPositionCheckbox.Size = new System.Drawing.Size(133, 17);
this.SaveWindowPositionCheckbox.TabIndex = 4;
@ -220,7 +218,7 @@
// EnableContextMenuCheckbox
//
this.EnableContextMenuCheckbox.AutoSize = true;
this.EnableContextMenuCheckbox.Location = new System.Drawing.Point(6, 40);
this.EnableContextMenuCheckbox.Location = new System.Drawing.Point(6, 26);
this.EnableContextMenuCheckbox.Name = "EnableContextMenuCheckbox";
this.EnableContextMenuCheckbox.Size = new System.Drawing.Size(128, 17);
this.EnableContextMenuCheckbox.TabIndex = 1;
@ -230,7 +228,7 @@
// StartPausedCheckbox
//
this.StartPausedCheckbox.AutoSize = true;
this.StartPausedCheckbox.Location = new System.Drawing.Point(6, 63);
this.StartPausedCheckbox.Location = new System.Drawing.Point(6, 19);
this.StartPausedCheckbox.Name = "StartPausedCheckbox";
this.StartPausedCheckbox.Size = new System.Drawing.Size(86, 17);
this.StartPausedCheckbox.TabIndex = 2;
@ -240,7 +238,7 @@
// PauseWhenMenuActivatedCheckbox
//
this.PauseWhenMenuActivatedCheckbox.AutoSize = true;
this.PauseWhenMenuActivatedCheckbox.Location = new System.Drawing.Point(6, 17);
this.PauseWhenMenuActivatedCheckbox.Location = new System.Drawing.Point(6, 3);
this.PauseWhenMenuActivatedCheckbox.Name = "PauseWhenMenuActivatedCheckbox";
this.PauseWhenMenuActivatedCheckbox.Size = new System.Drawing.Size(161, 17);
this.PauseWhenMenuActivatedCheckbox.TabIndex = 0;
@ -265,6 +263,16 @@
this.tabPage3.Text = "Advanced";
this.tabPage3.UseVisualStyleBackColor = true;
//
// LuaDuringTurboCheckbox
//
this.LuaDuringTurboCheckbox.AutoSize = true;
this.LuaDuringTurboCheckbox.Location = new System.Drawing.Point(6, 174);
this.LuaDuringTurboCheckbox.Name = "LuaDuringTurboCheckbox";
this.LuaDuringTurboCheckbox.Size = new System.Drawing.Size(166, 17);
this.LuaDuringTurboCheckbox.TabIndex = 15;
this.LuaDuringTurboCheckbox.Text = "Run lua scripts when turboing";
this.LuaDuringTurboCheckbox.UseVisualStyleBackColor = true;
//
// label12
//
this.label12.AutoSize = true;
@ -296,7 +304,7 @@
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(24, 90);
this.label9.Location = new System.Drawing.Point(24, 94);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(99, 13);
this.label9.TabIndex = 11;
@ -305,7 +313,7 @@
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(24, 77);
this.label10.Location = new System.Drawing.Point(24, 81);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(277, 13);
this.label10.TabIndex = 10;
@ -340,15 +348,19 @@
this.LogWindowAsConsoleCheckbox.Text = "Create the log window as a console window";
this.LogWindowAsConsoleCheckbox.UseVisualStyleBackColor = true;
//
// LuaDuringTurboCheckbox
// groupBox1
//
this.LuaDuringTurboCheckbox.AutoSize = true;
this.LuaDuringTurboCheckbox.Location = new System.Drawing.Point(6, 180);
this.LuaDuringTurboCheckbox.Name = "LuaDuringTurboCheckbox";
this.LuaDuringTurboCheckbox.Size = new System.Drawing.Size(166, 17);
this.LuaDuringTurboCheckbox.TabIndex = 15;
this.LuaDuringTurboCheckbox.Text = "Run lua scripts when turboing";
this.LuaDuringTurboCheckbox.UseVisualStyleBackColor = true;
this.groupBox1.Controls.Add(this.StartPausedCheckbox);
this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.StartFullScreenCheckbox);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.SingleInstanceModeCheckbox);
this.groupBox1.Location = new System.Drawing.Point(6, 177);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(369, 140);
this.groupBox1.TabIndex = 13;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Startup Options";
//
// EmuHawkOptions
//
@ -370,6 +382,8 @@
this.tabPage1.PerformLayout();
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
@ -404,5 +418,6 @@
private System.Windows.Forms.Label label14;
private System.Windows.Forms.CheckBox StartFullScreenCheckbox;
private System.Windows.Forms.CheckBox LuaDuringTurboCheckbox;
private System.Windows.Forms.GroupBox groupBox1;
}
}

79
BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs generated
View File

@ -36,13 +36,19 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.IDB_CANCEL = new System.Windows.Forms.Button();
this.IDB_SAVE = new System.Windows.Forms.Button();
this.RestoreDefaults = new System.Windows.Forms.Button();
this.SearchBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.MiscButton = new BizHawk.Client.EmuHawk.MenuButton();
this.clearBtnContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.clearAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.clearCurrentTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.restoreDefaultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.HotkeyTabControl.SuspendLayout();
this.clearBtnContextMenu.SuspendLayout();
this.SuspendLayout();
//
// label38
@ -59,7 +65,7 @@
//
this.AutoTabCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.AutoTabCheckBox.AutoSize = true;
this.AutoTabCheckBox.Location = new System.Drawing.Point(453, 440);
this.AutoTabCheckBox.Location = new System.Drawing.Point(432, 440);
this.AutoTabCheckBox.Name = "AutoTabCheckBox";
this.AutoTabCheckBox.Size = new System.Drawing.Size(70, 17);
this.AutoTabCheckBox.TabIndex = 101;
@ -115,19 +121,6 @@
this.IDB_SAVE.UseVisualStyleBackColor = true;
this.IDB_SAVE.Click += new System.EventHandler(this.IDB_SAVE_Click);
//
// RestoreDefaults
//
this.RestoreDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.RestoreDefaults.Location = new System.Drawing.Point(529, 436);
this.RestoreDefaults.Name = "RestoreDefaults";
this.RestoreDefaults.Size = new System.Drawing.Size(60, 22);
this.RestoreDefaults.TabIndex = 105;
this.RestoreDefaults.TabStop = false;
this.RestoreDefaults.Text = "&Defaults";
this.toolTip1.SetToolTip(this.RestoreDefaults, "Reses _all_ bindings to default.");
this.RestoreDefaults.UseVisualStyleBackColor = true;
this.RestoreDefaults.Click += new System.EventHandler(this.RestoreDefaults_Click);
//
// SearchBox
//
this.SearchBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
@ -168,17 +161,63 @@
this.label3.TabIndex = 109;
this.label3.Text = "Tips:";
//
// MiscButton
//
this.MiscButton.Location = new System.Drawing.Point(526, 436);
this.MiscButton.Menu = this.clearBtnContextMenu;
this.MiscButton.Name = "MiscButton";
this.MiscButton.Size = new System.Drawing.Size(60, 22);
this.MiscButton.TabIndex = 110;
this.MiscButton.Text = "Misc...";
this.MiscButton.UseVisualStyleBackColor = true;
//
// clearBtnContextMenu
//
this.clearBtnContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.restoreDefaultsToolStripMenuItem,
this.toolStripSeparator1,
this.clearAllToolStripMenuItem,
this.clearCurrentTabToolStripMenuItem});
this.clearBtnContextMenu.Name = "clearBtnContextMenu";
this.clearBtnContextMenu.Size = new System.Drawing.Size(168, 76);
//
// clearAllToolStripMenuItem
//
this.clearAllToolStripMenuItem.Name = "clearAllToolStripMenuItem";
this.clearAllToolStripMenuItem.Size = new System.Drawing.Size(167, 22);
this.clearAllToolStripMenuItem.Text = "Clear All";
this.clearAllToolStripMenuItem.Click += new System.EventHandler(this.clearAllToolStripMenuItem_Click);
//
// clearCurrentTabToolStripMenuItem
//
this.clearCurrentTabToolStripMenuItem.Name = "clearCurrentTabToolStripMenuItem";
this.clearCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(167, 22);
this.clearCurrentTabToolStripMenuItem.Text = "Clear Current Tab";
this.clearCurrentTabToolStripMenuItem.Click += new System.EventHandler(this.clearCurrentTabToolStripMenuItem_Click);
//
// restoreDefaultsToolStripMenuItem
//
this.restoreDefaultsToolStripMenuItem.Name = "restoreDefaultsToolStripMenuItem";
this.restoreDefaultsToolStripMenuItem.Size = new System.Drawing.Size(167, 22);
this.restoreDefaultsToolStripMenuItem.Text = "Restore Defaults";
this.restoreDefaultsToolStripMenuItem.Click += new System.EventHandler(this.restoreDefaultsToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(164, 6);
//
// HotkeyConfig
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.IDB_CANCEL;
this.ClientSize = new System.Drawing.Size(753, 463);
this.Controls.Add(this.MiscButton);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.SearchBox);
this.Controls.Add(this.RestoreDefaults);
this.Controls.Add(this.IDB_SAVE);
this.Controls.Add(this.IDB_CANCEL);
this.Controls.Add(this.HotkeyTabControl);
@ -190,6 +229,7 @@
this.Text = "Configure Hotkeys";
this.Load += new System.EventHandler(this.NewHotkeyWindow_Load);
this.HotkeyTabControl.ResumeLayout(false);
this.clearBtnContextMenu.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@ -203,11 +243,16 @@
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.Button IDB_CANCEL;
private System.Windows.Forms.Button IDB_SAVE;
private System.Windows.Forms.Button RestoreDefaults;
private System.Windows.Forms.TextBox SearchBox;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.ToolTip toolTip1;
private MenuButton MiscButton;
private System.Windows.Forms.ContextMenuStrip clearBtnContextMenu;
private System.Windows.Forms.ToolStripMenuItem clearAllToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem clearCurrentTabToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem restoreDefaultsToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
}
}

41
BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
View File

@ -61,11 +61,6 @@ namespace BizHawk.Client.EmuHawk
Close();
}
private void RestoreDefaults_Click(object sender, EventArgs e)
{
Defaults();
}
private void AutoTabCheckBox_CheckedChanged(object sender, EventArgs e)
{
SetAutoTab();
@ -166,6 +161,24 @@ namespace BizHawk.Client.EmuHawk
}
}
private void ClearAll(bool currentTabOnly)
{
if (currentTabOnly)
{
foreach (var w in InputWidgets)
{
w.Clear();
}
}
else
{
foreach (var w in HotkeyTabControl.SelectedTab.Controls.OfType<InputCompositeWidget>())
{
w.Clear();
}
}
}
private void SetAutoTab()
{
foreach (var w in InputWidgets)
@ -197,7 +210,7 @@ namespace BizHawk.Client.EmuHawk
if (!e.Control && !e.Alt && !e.Shift &&
(e.KeyCode == Keys.Enter || e.KeyCode == Keys.Tab))
{
var b = Global.Config.HotkeyBindings.FirstOrDefault(x => x.DisplayName == SearchBox.Text);
var b = Global.Config.HotkeyBindings.FirstOrDefault(x => string.Compare(x.DisplayName,SearchBox.Text,true)==0);
//Found
if (b != null)
@ -206,6 +219,7 @@ namespace BizHawk.Client.EmuHawk
if (w != null)
{
HotkeyTabControl.SelectTab((w.Parent as TabPage));
Input.Instance.BindUnpress(e.KeyCode);
w.Focus();
}
}
@ -213,5 +227,20 @@ namespace BizHawk.Client.EmuHawk
e.Handled = true;
}
}
private void clearAllToolStripMenuItem_Click(object sender, EventArgs e)
{
ClearAll(true);
}
private void clearCurrentTabToolStripMenuItem_Click(object sender, EventArgs e)
{
ClearAll(false);
}
private void restoreDefaultsToolStripMenuItem_Click(object sender, EventArgs e)
{
Defaults();
}
}
}

3
BizHawk.Client.EmuHawk/config/HotkeyConfig.resx
View File

@ -120,6 +120,9 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="clearBtnContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>114, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

86
BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs generated
View File

@ -80,6 +80,8 @@
this.LInputColorDialog = new System.Windows.Forms.ColorDialog();
this.MovieInputColorDialog = new System.Windows.Forms.ColorDialog();
this.StackMessagesCheckbox = new System.Windows.Forms.CheckBox();
this.WatchesRadio = new System.Windows.Forms.RadioButton();
this.WatchesLabel = new System.Windows.Forms.Label();
this.MessageTypeBox.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.XNumeric)).BeginInit();
@ -90,7 +92,7 @@
// OK
//
this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OK.Location = new System.Drawing.Point(418, 434);
this.OK.Location = new System.Drawing.Point(348, 441);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 1;
@ -100,6 +102,8 @@
//
// MessageTypeBox
//
this.MessageTypeBox.Controls.Add(this.WatchesLabel);
this.MessageTypeBox.Controls.Add(this.WatchesRadio);
this.MessageTypeBox.Controls.Add(this.AutoholdLabel);
this.MessageTypeBox.Controls.Add(this.AutoholdRadio);
this.MessageTypeBox.Controls.Add(this.MultitrackLabel);
@ -118,7 +122,7 @@
this.MessageTypeBox.Controls.Add(this.FPSRadio);
this.MessageTypeBox.Location = new System.Drawing.Point(12, 12);
this.MessageTypeBox.Name = "MessageTypeBox";
this.MessageTypeBox.Size = new System.Drawing.Size(177, 216);
this.MessageTypeBox.Size = new System.Drawing.Size(177, 234);
this.MessageTypeBox.TabIndex = 2;
this.MessageTypeBox.TabStop = false;
this.MessageTypeBox.Text = "Message Type";
@ -127,7 +131,7 @@
//
this.AutoholdLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.AutoholdLabel.AutoSize = true;
this.AutoholdLabel.Location = new System.Drawing.Point(126, 188);
this.AutoholdLabel.Location = new System.Drawing.Point(126, 209);
this.AutoholdLabel.Name = "AutoholdLabel";
this.AutoholdLabel.Size = new System.Drawing.Size(49, 13);
this.AutoholdLabel.TabIndex = 15;
@ -136,7 +140,7 @@
// AutoholdRadio
//
this.AutoholdRadio.AutoSize = true;
this.AutoholdRadio.Location = new System.Drawing.Point(6, 186);
this.AutoholdRadio.Location = new System.Drawing.Point(6, 210);
this.AutoholdRadio.Name = "AutoholdRadio";
this.AutoholdRadio.Size = new System.Drawing.Size(67, 17);
this.AutoholdRadio.TabIndex = 14;
@ -149,7 +153,7 @@
//
this.MultitrackLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.MultitrackLabel.AutoSize = true;
this.MultitrackLabel.Location = new System.Drawing.Point(126, 164);
this.MultitrackLabel.Location = new System.Drawing.Point(126, 185);
this.MultitrackLabel.Name = "MultitrackLabel";
this.MultitrackLabel.Size = new System.Drawing.Size(49, 13);
this.MultitrackLabel.TabIndex = 13;
@ -158,7 +162,7 @@
// MultitrackRadio
//
this.MultitrackRadio.AutoSize = true;
this.MultitrackRadio.Location = new System.Drawing.Point(6, 162);
this.MultitrackRadio.Location = new System.Drawing.Point(6, 186);
this.MultitrackRadio.Name = "MultitrackRadio";
this.MultitrackRadio.Size = new System.Drawing.Size(71, 17);
this.MultitrackRadio.TabIndex = 12;
@ -171,7 +175,7 @@
//
this.RerecLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.RerecLabel.AutoSize = true;
this.RerecLabel.Location = new System.Drawing.Point(126, 140);
this.RerecLabel.Location = new System.Drawing.Point(126, 161);
this.RerecLabel.Name = "RerecLabel";
this.RerecLabel.Size = new System.Drawing.Size(49, 13);
this.RerecLabel.TabIndex = 11;
@ -180,7 +184,7 @@
// RerecordsRadio
//
this.RerecordsRadio.AutoSize = true;
this.RerecordsRadio.Location = new System.Drawing.Point(6, 138);
this.RerecordsRadio.Location = new System.Drawing.Point(6, 162);
this.RerecordsRadio.Name = "RerecordsRadio";
this.RerecordsRadio.Size = new System.Drawing.Size(74, 17);
this.RerecordsRadio.TabIndex = 10;
@ -192,7 +196,7 @@
//
this.MessLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.MessLabel.AutoSize = true;
this.MessLabel.Location = new System.Drawing.Point(126, 116);
this.MessLabel.Location = new System.Drawing.Point(126, 137);
this.MessLabel.Name = "MessLabel";
this.MessLabel.Size = new System.Drawing.Size(49, 13);
this.MessLabel.TabIndex = 9;
@ -241,7 +245,7 @@
// MessagesRadio
//
this.MessagesRadio.AutoSize = true;
this.MessagesRadio.Location = new System.Drawing.Point(6, 114);
this.MessagesRadio.Location = new System.Drawing.Point(6, 138);
this.MessagesRadio.Name = "MessagesRadio";
this.MessagesRadio.Size = new System.Drawing.Size(73, 17);
this.MessagesRadio.TabIndex = 4;
@ -313,9 +317,9 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.ColorText);
this.groupBox2.Location = new System.Drawing.Point(12, 234);
this.groupBox2.Location = new System.Drawing.Point(12, 251);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(177, 223);
this.groupBox2.Size = new System.Drawing.Size(177, 210);
this.groupBox2.TabIndex = 4;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Message Colors";
@ -323,7 +327,7 @@
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(1, 170);
this.label12.Location = new System.Drawing.Point(1, 161);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(63, 13);
this.label12.TabIndex = 24;
@ -332,7 +336,7 @@
// MovieInputText
//
this.MovieInputText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.MovieInputText.Location = new System.Drawing.Point(45, 187);
this.MovieInputText.Location = new System.Drawing.Point(45, 178);
this.MovieInputText.MaxLength = 8;
this.MovieInputText.Name = "MovieInputText";
this.MovieInputText.ReadOnly = true;
@ -351,7 +355,7 @@
// MovieInputColor
//
this.MovieInputColor.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.MovieInputColor.Location = new System.Drawing.Point(4, 187);
this.MovieInputColor.Location = new System.Drawing.Point(4, 178);
this.MovieInputColor.Name = "MovieInputColor";
this.MovieInputColor.Size = new System.Drawing.Size(20, 20);
this.MovieInputColor.TabIndex = 9;
@ -360,7 +364,7 @@
// LInputColorPanel
//
this.LInputColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.LInputColorPanel.Location = new System.Drawing.Point(6, 139);
this.LInputColorPanel.Location = new System.Drawing.Point(6, 130);
this.LInputColorPanel.Name = "LInputColorPanel";
this.LInputColorPanel.Size = new System.Drawing.Size(20, 20);
this.LInputColorPanel.TabIndex = 7;
@ -369,7 +373,7 @@
// AlertColorPanel
//
this.AlertColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.AlertColorPanel.Location = new System.Drawing.Point(6, 90);
this.AlertColorPanel.Location = new System.Drawing.Point(6, 81);
this.AlertColorPanel.Name = "AlertColorPanel";
this.AlertColorPanel.Size = new System.Drawing.Size(20, 20);
this.AlertColorPanel.TabIndex = 7;
@ -378,7 +382,7 @@
// ColorPanel
//
this.ColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.ColorPanel.Location = new System.Drawing.Point(6, 43);
this.ColorPanel.Location = new System.Drawing.Point(6, 34);
this.ColorPanel.Name = "ColorPanel";
this.ColorPanel.Size = new System.Drawing.Size(20, 20);
this.ColorPanel.TabIndex = 7;
@ -387,7 +391,7 @@
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(1, 120);
this.label7.Location = new System.Drawing.Point(1, 111);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(86, 13);
this.label7.TabIndex = 18;
@ -396,7 +400,7 @@
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(28, 142);
this.label8.Location = new System.Drawing.Point(28, 133);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(18, 13);
this.label8.TabIndex = 17;
@ -405,7 +409,7 @@
// LInputText
//
this.LInputText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.LInputText.Location = new System.Drawing.Point(45, 139);
this.LInputText.Location = new System.Drawing.Point(45, 130);
this.LInputText.MaxLength = 8;
this.LInputText.Name = "LInputText";
this.LInputText.ReadOnly = true;
@ -415,7 +419,7 @@
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(1, 71);
this.label6.Location = new System.Drawing.Point(1, 62);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(78, 13);
this.label6.TabIndex = 13;
@ -424,7 +428,7 @@
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(28, 93);
this.label5.Location = new System.Drawing.Point(28, 84);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(18, 13);
this.label5.TabIndex = 12;
@ -433,7 +437,7 @@
// AlertColorText
//
this.AlertColorText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.AlertColorText.Location = new System.Drawing.Point(45, 90);
this.AlertColorText.Location = new System.Drawing.Point(45, 81);
this.AlertColorText.MaxLength = 8;
this.AlertColorText.Name = "AlertColorText";
this.AlertColorText.ReadOnly = true;
@ -443,7 +447,7 @@
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(6, 27);
this.label4.Location = new System.Drawing.Point(6, 18);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(80, 13);
this.label4.TabIndex = 8;
@ -452,7 +456,7 @@
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(28, 46);
this.label3.Location = new System.Drawing.Point(28, 37);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(18, 13);
this.label3.TabIndex = 7;
@ -461,7 +465,7 @@
// ColorText
//
this.ColorText.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.ColorText.Location = new System.Drawing.Point(45, 43);
this.ColorText.Location = new System.Drawing.Point(45, 34);
this.ColorText.MaxLength = 8;
this.ColorText.Name = "ColorText";
this.ColorText.ReadOnly = true;
@ -476,7 +480,7 @@
//
this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.Cancel.Location = new System.Drawing.Point(499, 434);
this.Cancel.Location = new System.Drawing.Point(429, 441);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 5;
@ -487,7 +491,7 @@
// ResetDefaultsButton
//
this.ResetDefaultsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.ResetDefaultsButton.Location = new System.Drawing.Point(195, 434);
this.ResetDefaultsButton.Location = new System.Drawing.Point(195, 441);
this.ResetDefaultsButton.Name = "ResetDefaultsButton";
this.ResetDefaultsButton.Size = new System.Drawing.Size(96, 23);
this.ResetDefaultsButton.TabIndex = 6;
@ -656,13 +660,33 @@
this.StackMessagesCheckbox.Text = "Stack Messages";
this.StackMessagesCheckbox.UseVisualStyleBackColor = true;
//
// WatchesRadio
//
this.WatchesRadio.AutoSize = true;
this.WatchesRadio.Location = new System.Drawing.Point(6, 114);
this.WatchesRadio.Name = "WatchesRadio";
this.WatchesRadio.Size = new System.Drawing.Size(68, 17);
this.WatchesRadio.TabIndex = 16;
this.WatchesRadio.Text = "Watches";
this.WatchesRadio.UseVisualStyleBackColor = true;
//
// WatchesLabel
//
this.WatchesLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.WatchesLabel.AutoSize = true;
this.WatchesLabel.Location = new System.Drawing.Point(126, 116);
this.WatchesLabel.Name = "WatchesLabel";
this.WatchesLabel.Size = new System.Drawing.Size(49, 13);
this.WatchesLabel.TabIndex = 17;
this.WatchesLabel.Text = "255, 255";
//
// MessageConfig
//
this.AcceptButton = this.OK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.Cancel;
this.ClientSize = new System.Drawing.Size(612, 469);
this.ClientSize = new System.Drawing.Size(512, 469);
this.Controls.Add(this.StackMessagesCheckbox);
this.Controls.Add(this.ResetDefaultsButton);
this.Controls.Add(this.Cancel);
@ -744,5 +768,7 @@
private System.Windows.Forms.CheckBox StackMessagesCheckbox;
private System.Windows.Forms.Label AutoholdLabel;
private System.Windows.Forms.RadioButton AutoholdRadio;
private System.Windows.Forms.Label WatchesLabel;
private System.Windows.Forms.RadioButton WatchesRadio;
}
}

23
BizHawk.Client.EmuHawk/config/MessageConfig.cs
View File

@ -16,6 +16,8 @@ namespace BizHawk.Client.EmuHawk
private int _dispLagy = Global.Config.DispLagy;
private int _dispInpx = Global.Config.DispInpx;
private int _dispInpy = Global.Config.DispInpy;
private int _dispWatchesx = Global.Config.DispRamWatchx;
private int _dispWatchesy = Global.Config.DispRamWatchy;
private int _lastInputColor = Global.Config.LastInputColor;
private int _dispRecx = Global.Config.DispRecx;
private int _dispRecy = Global.Config.DispRecy;
@ -34,6 +36,7 @@ namespace BizHawk.Client.EmuHawk
private int _dispFrameanchor = Global.Config.DispFrameanchor;
private int _dispLaganchor = Global.Config.DispLaganchor;
private int _dispInputanchor = Global.Config.DispInpanchor;
private int _dispWatchesanchor = Global.Config.DispWatchesanchor;
private int _dispRecanchor = Global.Config.DispRecanchor;
private int _dispMultiAnchor = Global.Config.DispMultianchor;
private int _dispMessageAnchor = Global.Config.DispMessageanchor;
@ -142,6 +145,14 @@ namespace BizHawk.Client.EmuHawk
_py = _dispInpy;
SetAnchorRadio(_dispInputanchor);
}
else if (WatchesRadio.Checked)
{
XNumeric.Value = _dispWatchesx;
XNumeric.Value = _dispWatchesy;
_px = _dispWatchesx;
_py = _dispWatchesy;
SetAnchorRadio(_dispWatchesanchor);
}
else if (MessagesRadio.Checked)
{
XNumeric.Value = _dispMessagex;
@ -191,6 +202,8 @@ namespace BizHawk.Client.EmuHawk
Global.Config.DispLagy = _dispLagy;
Global.Config.DispInpx = _dispInpx;
Global.Config.DispInpy = _dispInpy;
Global.Config.DispRamWatchx = _dispWatchesx;
Global.Config.DispRamWatchy = _dispWatchesy;
Global.Config.DispRecx = _dispRecx;
Global.Config.DispRecy = _dispRecy;
Global.Config.DispMultix = _dispMultix;
@ -368,6 +381,11 @@ namespace BizHawk.Client.EmuHawk
_dispInpx = _px;
_dispInpy = _py;
}
else if (WatchesRadio.Checked)
{
_dispWatchesx = _px;
_dispWatchesy = _py;
}
else if (RerecordsRadio.Checked)
{
_dispRecx = _px;
@ -393,6 +411,7 @@ namespace BizHawk.Client.EmuHawk
FCLabel.Text = _dispFrameCx + ", " + _dispFrameCy;
LagLabel.Text = _dispLagx + ", " + _dispLagy;
InpLabel.Text = _dispInpx + ", " + _dispInpy;
WatchesLabel.Text = _dispWatchesx + ", " + _dispWatchesy;
RerecLabel.Text = _dispRecx + ", " + _dispRecy;
MultitrackLabel.Text = _dispMultix + ", " + _dispMultiy;
MessLabel.Text = _dispMessagex + ", " + _dispMessagey;
@ -493,6 +512,10 @@ namespace BizHawk.Client.EmuHawk
{
_dispInputanchor = value;
}
else if (WatchesRadio.Checked)
{
_dispWatchesanchor = value;
}
else if (MessagesRadio.Checked)
{
_dispMessageAnchor = value;

4
BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.cs
View File

@ -89,7 +89,7 @@ namespace BizHawk.Client.EmuHawk
pictureBoxPalette.Image = bmp;
}
private int[,] ResolvePalette(bool showmsg = false)
private byte[,] ResolvePalette(bool showmsg = false)
{
if (AutoLoadPalette.Checked) // checkbox checked: try to load palette from file
{
@ -111,7 +111,7 @@ namespace BizHawk.Client.EmuHawk
else // no filename: interpret this as "reset to default"
{
if (showmsg) GlobalWin.OSD.AddMessage("Standard Palette set");
return (int[,])Palettes.QuickNESPalette.Clone();
return (byte[,])Palettes.QuickNESPalette.Clone();
}
}
else // checkbox unchecked: we're reusing whatever palette was set

75
BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.Designer.cs generated
View File

@ -31,19 +31,20 @@
this.OkBtn = new System.Windows.Forms.Button();
this.CancelBtn = new System.Windows.Forms.Button();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.RegionComboBox = new System.Windows.Forms.ComboBox();
this.HelpBtn = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.BoardPropertiesGroupBox = new System.Windows.Forms.GroupBox();
this.label1 = new System.Windows.Forms.Label();
this.InfoLabel = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.groupBox1.SuspendLayout();
this.BoardPropertiesGroupBox.SuspendLayout();
this.SuspendLayout();
//
// OkBtn
//
this.OkBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OkBtn.Location = new System.Drawing.Point(221, 341);
this.OkBtn.Location = new System.Drawing.Point(221, 354);
this.OkBtn.Name = "OkBtn";
this.OkBtn.Size = new System.Drawing.Size(67, 23);
this.OkBtn.TabIndex = 0;
@ -55,7 +56,7 @@
//
this.CancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.CancelBtn.Location = new System.Drawing.Point(294, 341);
this.CancelBtn.Location = new System.Drawing.Point(294, 354);
this.CancelBtn.Name = "CancelBtn";
this.CancelBtn.Size = new System.Drawing.Size(67, 23);
this.CancelBtn.TabIndex = 1;
@ -75,23 +76,23 @@
this.dataGridView1.Size = new System.Drawing.Size(333, 203);
this.dataGridView1.TabIndex = 9;
//
// comboBox1
// RegionComboBox
//
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Location = new System.Drawing.Point(12, 26);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(235, 21);
this.comboBox1.TabIndex = 11;
this.RegionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.RegionComboBox.FormattingEnabled = true;
this.RegionComboBox.Location = new System.Drawing.Point(12, 26);
this.RegionComboBox.Name = "RegionComboBox";
this.RegionComboBox.Size = new System.Drawing.Size(124, 21);
this.RegionComboBox.TabIndex = 11;
//
// HelpBtn
//
this.HelpBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.HelpBtn.Location = new System.Drawing.Point(12, 67);
this.HelpBtn.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help;
this.HelpBtn.Location = new System.Drawing.Point(12, 87);
this.HelpBtn.Name = "HelpBtn";
this.HelpBtn.Size = new System.Drawing.Size(23, 23);
this.HelpBtn.TabIndex = 10;
this.HelpBtn.Text = "?";
this.HelpBtn.UseVisualStyleBackColor = true;
this.HelpBtn.Click += new System.EventHandler(this.HelpBtn_Click);
//
@ -104,49 +105,60 @@
this.label2.TabIndex = 12;
this.label2.Text = "Region Override:";
//
// groupBox1
// BoardPropertiesGroupBox
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.BoardPropertiesGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.dataGridView1);
this.groupBox1.Location = new System.Drawing.Point(12, 96);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(349, 228);
this.groupBox1.TabIndex = 13;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Board Properties";
this.BoardPropertiesGroupBox.Controls.Add(this.dataGridView1);
this.BoardPropertiesGroupBox.Location = new System.Drawing.Point(12, 113);
this.BoardPropertiesGroupBox.Name = "BoardPropertiesGroupBox";
this.BoardPropertiesGroupBox.Size = new System.Drawing.Size(349, 228);
this.BoardPropertiesGroupBox.TabIndex = 13;
this.BoardPropertiesGroupBox.TabStop = false;
this.BoardPropertiesGroupBox.Text = "Custom Board Properties";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(12, 50);
this.label1.Location = new System.Drawing.Point(12, 53);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(362, 13);
this.label1.TabIndex = 14;
this.label1.Text = "Region Override will be ignored when playing Famicom Disk System games.";
//
// InfoLabel
//
this.InfoLabel.AutoSize = true;
this.InfoLabel.Location = new System.Drawing.Point(40, 92);
this.InfoLabel.Name = "InfoLabel";
this.InfoLabel.Size = new System.Drawing.Size(213, 13);
this.InfoLabel.TabIndex = 15;
this.InfoLabel.Text = "The current board has no custom properties";
//
// NESSyncSettingsForm
//
this.AcceptButton = this.OkBtn;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CancelBtn;
this.ClientSize = new System.Drawing.Size(373, 376);
this.ClientSize = new System.Drawing.Size(373, 389);
this.Controls.Add(this.InfoLabel);
this.Controls.Add(this.label1);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.BoardPropertiesGroupBox);
this.Controls.Add(this.label2);
this.Controls.Add(this.comboBox1);
this.Controls.Add(this.RegionComboBox);
this.Controls.Add(this.HelpBtn);
this.Controls.Add(this.CancelBtn);
this.Controls.Add(this.OkBtn);
this.MinimumSize = new System.Drawing.Size(210, 150);
this.Name = "NESSyncSettingsForm";
this.ShowIcon = false;
this.Text = "NES Movie Settings";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "NES Advanced Settings";
this.Load += new System.EventHandler(this.NESSyncSettingsForm_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.groupBox1.ResumeLayout(false);
this.BoardPropertiesGroupBox.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@ -157,10 +169,11 @@
private System.Windows.Forms.Button OkBtn;
private System.Windows.Forms.Button CancelBtn;
private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.ComboBox RegionComboBox;
private System.Windows.Forms.Button HelpBtn;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label label1;
internal System.Windows.Forms.GroupBox BoardPropertiesGroupBox;
private System.Windows.Forms.Label InfoLabel;
}
}

36
BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs
View File

@ -19,13 +19,26 @@ namespace BizHawk.Client.EmuHawk
public NESSyncSettingsForm()
{
InitializeComponent();
SyncSettings = ((NES)Global.Emulator).GetSyncSettings();
DTDB = new DataTableDictionaryBind<string, string>(SyncSettings.BoardProperties);
dataGridView1.DataSource = DTDB.Table;
comboBox1.DropDownStyle = ComboBoxStyle.DropDownList;
comboBox1.Items.AddRange(Enum.GetNames(typeof(NES.NESSyncSettings.Region)));
comboBox1.SelectedItem = Enum.GetName(typeof(NES.NESSyncSettings.Region), SyncSettings.RegionOverride);
SyncSettings = ((NES)Global.Emulator).GetSyncSettings();
if ((Global.Emulator as NES).HasMapperProperties)
{
DTDB = new DataTableDictionaryBind<string, string>(SyncSettings.BoardProperties);
dataGridView1.DataSource = DTDB.Table;
InfoLabel.Visible = false;
}
else
{
BoardPropertiesGroupBox.Enabled = false;
dataGridView1.DataSource = null;
dataGridView1.Enabled = false;
InfoLabel.Visible = true;
}
RegionComboBox.Items.AddRange(Enum.GetNames(typeof(NES.NESSyncSettings.Region)));
RegionComboBox.SelectedItem = Enum.GetName(typeof(NES.NESSyncSettings.Region), SyncSettings.RegionOverride);
}
private void CancelBtn_Click(object sender, EventArgs e)
@ -41,9 +54,9 @@ namespace BizHawk.Client.EmuHawk
SyncSettings.RegionOverride = (NES.NESSyncSettings.Region)
Enum.Parse(
typeof(NES.NESSyncSettings.Region),
(string)comboBox1.SelectedItem);
(string)RegionComboBox.SelectedItem);
bool changed = DTDB.WasModified ||
bool changed = (DTDB != null && DTDB.WasModified) ||
old != SyncSettings.RegionOverride;
DialogResult = DialogResult.OK;
@ -55,7 +68,12 @@ namespace BizHawk.Client.EmuHawk
private void HelpBtn_Click(object sender, EventArgs e)
{
MessageBox.Show(this, "Board Properties are special per-mapper system settings. They are only useful to advanced users creating Tool Assisted Superplays. No support will be provided if you break something with them.", "Help");
MessageBox.Show(
this,
"Board Properties are special per-mapper system settings. They are only useful to advanced users creating Tool Assisted Superplays. No support will be provided if you break something with them.",
"Help",
MessageBoxButtons.OK,
MessageBoxIcon.Information);
}
private void NESSyncSettingsForm_Load(object sender, EventArgs e)

2
BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs
View File

@ -58,8 +58,6 @@ namespace BizHawk.Client.EmuHawk
SyncSettings.Controls = ctrls;
SyncSettings.Controls = ctrls;
if (changed)
{
GlobalWin.MainForm.PutCoreSyncSettings(SyncSettings);

82
BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs generated
View File

@ -1,82 +0,0 @@
namespace BizHawk.Client.EmuHawk
{
partial class PSXControllerConfig
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PSXControllerConfig));
this.CancelBtn = new System.Windows.Forms.Button();
this.OkBtn = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// CancelBtn
//
this.CancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.CancelBtn.Location = new System.Drawing.Point(294, 227);
this.CancelBtn.Name = "CancelBtn";
this.CancelBtn.Size = new System.Drawing.Size(60, 23);
this.CancelBtn.TabIndex = 5;
this.CancelBtn.Text = "&Cancel";
this.CancelBtn.UseVisualStyleBackColor = true;
this.CancelBtn.Click += new System.EventHandler(this.CancelBtn_Click);
//
// OkBtn
//
this.OkBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OkBtn.Location = new System.Drawing.Point(228, 227);
this.OkBtn.Name = "OkBtn";
this.OkBtn.Size = new System.Drawing.Size(60, 23);
this.OkBtn.TabIndex = 4;
this.OkBtn.Text = "&Ok";
this.OkBtn.UseVisualStyleBackColor = true;
this.OkBtn.Click += new System.EventHandler(this.OkBtn_Click);
//
// PSXControllerConfig
//
this.AcceptButton = this.OkBtn;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CancelBtn;
this.ClientSize = new System.Drawing.Size(366, 262);
this.Controls.Add(this.CancelBtn);
this.Controls.Add(this.OkBtn);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "PSXControllerConfig";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Controller Settings";
this.Load += new System.EventHandler(this.PSXControllerConfig_Load);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Button CancelBtn;
private System.Windows.Forms.Button OkBtn;
}
}

93
BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs
View File

@ -1,93 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using BizHawk.Common;
using BizHawk.Emulation.Cores.Sony.PSX;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.WinFormExtensions;
using BizHawk.Common.ReflectionExtensions;
namespace BizHawk.Client.EmuHawk
{
public partial class PSXControllerConfig : Form
{
public PSXControllerConfig()
{
InitializeComponent();
}
private void PSXControllerConfig_Load(object sender, EventArgs e)
{
var psxSettings = ((Octoshock)Global.Emulator).GetSyncSettings();
for (int i = 0; i < psxSettings.Controllers.Length; i++)
{
Controls.Add(new Label
{
Text = "Controller " + (i + 1),
Location = new Point(15, 19 + (i * 25)),
Width = 85
});
Controls.Add(new CheckBox
{
Text = "Connected",
Name = "Controller" + i,
Location = new Point(105, 15 + (i * 25)),
Checked = psxSettings.Controllers[i].IsConnected,
Width = 90
});
var dropdown = new ComboBox
{
Name = "Controller" + i,
DropDownStyle = ComboBoxStyle.DropDownList,
Location = new Point(200, 15 + (i * 25))
};
dropdown.PopulateFromEnum<Octoshock.ControllerSetting.ControllerType>(psxSettings.Controllers[i].Type);
Controls.Add(dropdown);
}
}
private void OkBtn_Click(object sender, EventArgs e)
{
var psxSettings = ((Octoshock)Global.Emulator).GetSyncSettings();
Controls
.OfType<CheckBox>()
.OrderBy(c => c.Name)
.ToList()
.ForEach(c =>
{
var index = int.Parse(c.Name.Replace("Controller", ""));
psxSettings.Controllers[index].IsConnected = c.Checked;
});
Controls
.OfType<ComboBox>()
.OrderBy(c => c.Name)
.ToList()
.ForEach(c =>
{
var index = int.Parse(c.Name.Replace("Controller", ""));
psxSettings.Controllers[index].Type = c.SelectedItem.ToString().GetEnumFromDescription<Octoshock.ControllerSetting.ControllerType>();
});
GlobalWin.MainForm.PutCoreSyncSettings(psxSettings);
DialogResult = DialogResult.OK;
Close();
}
private void CancelBtn_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}
}

494
BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.Designer.cs generated Normal file
View File

@ -0,0 +1,494 @@
namespace BizHawk.Client.EmuHawk
{
partial class PSXControllerConfigNew
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PSXControllerConfigNew));
this.cbMultitap_1 = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lbl_p_1_4 = new System.Windows.Forms.Label();
this.lbl_p_1_3 = new System.Windows.Forms.Label();
this.lbl_p_1_2 = new System.Windows.Forms.Label();
this.lbl_p_1_1 = new System.Windows.Forms.Label();
this.lbl_1_4 = new System.Windows.Forms.Label();
this.lbl_1_3 = new System.Windows.Forms.Label();
this.lbl_1_2 = new System.Windows.Forms.Label();
this.lbl_1_1 = new System.Windows.Forms.Label();
this.combo_1_4 = new System.Windows.Forms.ComboBox();
this.combo_1_3 = new System.Windows.Forms.ComboBox();
this.combo_1_2 = new System.Windows.Forms.ComboBox();
this.combo_1_1 = new System.Windows.Forms.ComboBox();
this.cbMemcard_1 = new System.Windows.Forms.CheckBox();
this.btnOK = new System.Windows.Forms.Button();
this.btnCancel = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lbl_p_2_4 = new System.Windows.Forms.Label();
this.lbl_p_2_3 = new System.Windows.Forms.Label();
this.lbl_p_2_2 = new System.Windows.Forms.Label();
this.lbl_p_2_1 = new System.Windows.Forms.Label();
this.lbl_2_4 = new System.Windows.Forms.Label();
this.lbl_2_3 = new System.Windows.Forms.Label();
this.lbl_2_2 = new System.Windows.Forms.Label();
this.lbl_2_1 = new System.Windows.Forms.Label();
this.combo_2_4 = new System.Windows.Forms.ComboBox();
this.combo_2_3 = new System.Windows.Forms.ComboBox();
this.combo_2_2 = new System.Windows.Forms.ComboBox();
this.combo_2_1 = new System.Windows.Forms.ComboBox();
this.cbMemcard_2 = new System.Windows.Forms.CheckBox();
this.cbMultitap_2 = new System.Windows.Forms.CheckBox();
this.label1 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// cbMultitap_1
//
this.cbMultitap_1.AutoSize = true;
this.cbMultitap_1.Enabled = false;
this.cbMultitap_1.Location = new System.Drawing.Point(18, 43);
this.cbMultitap_1.Name = "cbMultitap_1";
this.cbMultitap_1.Size = new System.Drawing.Size(63, 17);
this.cbMultitap_1.TabIndex = 0;
this.cbMultitap_1.Text = "Multitap";
this.cbMultitap_1.UseVisualStyleBackColor = true;
this.cbMultitap_1.CheckedChanged += new System.EventHandler(this.cb_changed);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.lbl_p_1_4);
this.groupBox1.Controls.Add(this.lbl_p_1_3);
this.groupBox1.Controls.Add(this.lbl_p_1_2);
this.groupBox1.Controls.Add(this.lbl_p_1_1);
this.groupBox1.Controls.Add(this.lbl_1_4);
this.groupBox1.Controls.Add(this.lbl_1_3);
this.groupBox1.Controls.Add(this.lbl_1_2);
this.groupBox1.Controls.Add(this.lbl_1_1);
this.groupBox1.Controls.Add(this.combo_1_4);
this.groupBox1.Controls.Add(this.combo_1_3);
this.groupBox1.Controls.Add(this.combo_1_2);
this.groupBox1.Controls.Add(this.combo_1_1);
this.groupBox1.Controls.Add(this.cbMemcard_1);
this.groupBox1.Controls.Add(this.cbMultitap_1);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(273, 136);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Port 1";
//
// lbl_p_1_4
//
this.lbl_p_1_4.AutoSize = true;
this.lbl_p_1_4.Location = new System.Drawing.Point(241, 105);
this.lbl_p_1_4.Name = "lbl_p_1_4";
this.lbl_p_1_4.Size = new System.Drawing.Size(20, 13);
this.lbl_p_1_4.TabIndex = 12;
this.lbl_p_1_4.Text = "P1";
this.lbl_p_1_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_p_1_3
//
this.lbl_p_1_3.AutoSize = true;
this.lbl_p_1_3.Location = new System.Drawing.Point(241, 78);
this.lbl_p_1_3.Name = "lbl_p_1_3";
this.lbl_p_1_3.Size = new System.Drawing.Size(20, 13);
this.lbl_p_1_3.TabIndex = 11;
this.lbl_p_1_3.Text = "P1";
this.lbl_p_1_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_p_1_2
//
this.lbl_p_1_2.AutoSize = true;
this.lbl_p_1_2.Location = new System.Drawing.Point(241, 50);
this.lbl_p_1_2.Name = "lbl_p_1_2";
this.lbl_p_1_2.Size = new System.Drawing.Size(20, 13);
this.lbl_p_1_2.TabIndex = 10;
this.lbl_p_1_2.Text = "P1";
this.lbl_p_1_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_p_1_1
//
this.lbl_p_1_1.AutoSize = true;
this.lbl_p_1_1.Location = new System.Drawing.Point(241, 24);
this.lbl_p_1_1.Name = "lbl_p_1_1";
this.lbl_p_1_1.Size = new System.Drawing.Size(20, 13);
this.lbl_p_1_1.TabIndex = 9;
this.lbl_p_1_1.Text = "P1";
this.lbl_p_1_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_1_4
//
this.lbl_1_4.AutoSize = true;
this.lbl_1_4.Location = new System.Drawing.Point(94, 105);
this.lbl_1_4.Name = "lbl_1_4";
this.lbl_1_4.Size = new System.Drawing.Size(15, 13);
this.lbl_1_4.TabIndex = 8;
this.lbl_1_4.Text = "D";
this.lbl_1_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_1_3
//
this.lbl_1_3.AutoSize = true;
this.lbl_1_3.Location = new System.Drawing.Point(94, 78);
this.lbl_1_3.Name = "lbl_1_3";
this.lbl_1_3.Size = new System.Drawing.Size(14, 13);
this.lbl_1_3.TabIndex = 7;
this.lbl_1_3.Text = "C";
this.lbl_1_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_1_2
//
this.lbl_1_2.AutoSize = true;
this.lbl_1_2.Location = new System.Drawing.Point(94, 51);
this.lbl_1_2.Name = "lbl_1_2";
this.lbl_1_2.Size = new System.Drawing.Size(14, 13);
this.lbl_1_2.TabIndex = 6;
this.lbl_1_2.Text = "B";
this.lbl_1_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_1_1
//
this.lbl_1_1.AutoSize = true;
this.lbl_1_1.Location = new System.Drawing.Point(94, 24);
this.lbl_1_1.Name = "lbl_1_1";
this.lbl_1_1.Size = new System.Drawing.Size(14, 13);
this.lbl_1_1.TabIndex = 2;
this.lbl_1_1.Text = "A";
this.lbl_1_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// combo_1_4
//
this.combo_1_4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.combo_1_4.FormattingEnabled = true;
this.combo_1_4.Location = new System.Drawing.Point(114, 102);
this.combo_1_4.Name = "combo_1_4";
this.combo_1_4.Size = new System.Drawing.Size(121, 21);
this.combo_1_4.TabIndex = 5;
this.combo_1_4.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged);
//
// combo_1_3
//
this.combo_1_3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.combo_1_3.FormattingEnabled = true;
this.combo_1_3.Location = new System.Drawing.Point(114, 75);
this.combo_1_3.Name = "combo_1_3";
this.combo_1_3.Size = new System.Drawing.Size(121, 21);
this.combo_1_3.TabIndex = 4;
this.combo_1_3.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged);
//
// combo_1_2
//
this.combo_1_2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.combo_1_2.FormattingEnabled = true;
this.combo_1_2.Location = new System.Drawing.Point(114, 48);
this.combo_1_2.Name = "combo_1_2";
this.combo_1_2.Size = new System.Drawing.Size(121, 21);
this.combo_1_2.TabIndex = 3;
this.combo_1_2.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged);
//
// combo_1_1
//
this.combo_1_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.combo_1_1.FormattingEnabled = true;
this.combo_1_1.Location = new System.Drawing.Point(114, 21);
this.combo_1_1.Name = "combo_1_1";
this.combo_1_1.Size = new System.Drawing.Size(121, 21);
this.combo_1_1.TabIndex = 2;
this.combo_1_1.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged);
//
// cbMemcard_1
//
this.cbMemcard_1.AutoSize = true;
this.cbMemcard_1.Location = new System.Drawing.Point(18, 21);
this.cbMemcard_1.Name = "cbMemcard_1";
this.cbMemcard_1.Size = new System.Drawing.Size(70, 17);
this.cbMemcard_1.TabIndex = 1;
this.cbMemcard_1.Text = "Memcard";
this.cbMemcard_1.UseVisualStyleBackColor = true;
this.cbMemcard_1.CheckedChanged += new System.EventHandler(this.cb_changed);
//
// btnOK
//
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnOK.Location = new System.Drawing.Point(408, 163);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(75, 23);
this.btnOK.TabIndex = 2;
this.btnOK.Text = "OK";
this.btnOK.UseVisualStyleBackColor = true;
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(489, 163);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 3;
this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.lbl_p_2_4);
this.groupBox2.Controls.Add(this.lbl_p_2_3);
this.groupBox2.Controls.Add(this.lbl_p_2_2);
this.groupBox2.Controls.Add(this.lbl_p_2_1);
this.groupBox2.Controls.Add(this.lbl_2_4);
this.groupBox2.Controls.Add(this.lbl_2_3);
this.groupBox2.Controls.Add(this.lbl_2_2);
this.groupBox2.Controls.Add(this.lbl_2_1);
this.groupBox2.Controls.Add(this.combo_2_4);
this.groupBox2.Controls.Add(this.combo_2_3);
this.groupBox2.Controls.Add(this.combo_2_2);
this.groupBox2.Controls.Add(this.combo_2_1);
this.groupBox2.Controls.Add(this.cbMemcard_2);
this.groupBox2.Controls.Add(this.cbMultitap_2);
this.groupBox2.Location = new System.Drawing.Point(291, 12);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(273, 136);
this.groupBox2.TabIndex = 13;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Port 2";
//
// lbl_p_2_4
//
this.lbl_p_2_4.AutoSize = true;
this.lbl_p_2_4.Location = new System.Drawing.Point(241, 105);
this.lbl_p_2_4.Name = "lbl_p_2_4";
this.lbl_p_2_4.Size = new System.Drawing.Size(20, 13);
this.lbl_p_2_4.TabIndex = 12;
this.lbl_p_2_4.Text = "P1";
this.lbl_p_2_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_p_2_3
//
this.lbl_p_2_3.AutoSize = true;
this.lbl_p_2_3.Location = new System.Drawing.Point(241, 78);
this.lbl_p_2_3.Name = "lbl_p_2_3";
this.lbl_p_2_3.Size = new System.Drawing.Size(20, 13);
this.lbl_p_2_3.TabIndex = 11;
this.lbl_p_2_3.Text = "P1";
this.lbl_p_2_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_p_2_2
//
this.lbl_p_2_2.AutoSize = true;
this.lbl_p_2_2.Location = new System.Drawing.Point(241, 50);
this.lbl_p_2_2.Name = "lbl_p_2_2";
this.lbl_p_2_2.Size = new System.Drawing.Size(20, 13);
this.lbl_p_2_2.TabIndex = 10;
this.lbl_p_2_2.Text = "P1";
this.lbl_p_2_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_p_2_1
//
this.lbl_p_2_1.AutoSize = true;
this.lbl_p_2_1.Location = new System.Drawing.Point(241, 24);
this.lbl_p_2_1.Name = "lbl_p_2_1";
this.lbl_p_2_1.Size = new System.Drawing.Size(20, 13);
this.lbl_p_2_1.TabIndex = 9;
this.lbl_p_2_1.Text = "P1";
this.lbl_p_2_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_2_4
//
this.lbl_2_4.AutoSize = true;
this.lbl_2_4.Location = new System.Drawing.Point(94, 105);
this.lbl_2_4.Name = "lbl_2_4";
this.lbl_2_4.Size = new System.Drawing.Size(15, 13);
this.lbl_2_4.TabIndex = 8;
this.lbl_2_4.Text = "D";
this.lbl_2_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_2_3
//
this.lbl_2_3.AutoSize = true;
this.lbl_2_3.Location = new System.Drawing.Point(94, 78);
this.lbl_2_3.Name = "lbl_2_3";
this.lbl_2_3.Size = new System.Drawing.Size(14, 13);
this.lbl_2_3.TabIndex = 7;
this.lbl_2_3.Text = "C";
this.lbl_2_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_2_2
//
this.lbl_2_2.AutoSize = true;
this.lbl_2_2.Location = new System.Drawing.Point(94, 51);
this.lbl_2_2.Name = "lbl_2_2";
this.lbl_2_2.Size = new System.Drawing.Size(14, 13);
this.lbl_2_2.TabIndex = 6;
this.lbl_2_2.Text = "B";
this.lbl_2_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lbl_2_1
//
this.lbl_2_1.AutoSize = true;
this.lbl_2_1.Location = new System.Drawing.Point(94, 24);
this.lbl_2_1.Name = "lbl_2_1";
this.lbl_2_1.Size = new System.Drawing.Size(14, 13);
this.lbl_2_1.TabIndex = 2;
this.lbl_2_1.Text = "A";
this.lbl_2_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// combo_2_4
//
this.combo_2_4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.combo_2_4.FormattingEnabled = true;
this.combo_2_4.Location = new System.Drawing.Point(114, 102);
this.combo_2_4.Name = "combo_2_4";
this.combo_2_4.Size = new System.Drawing.Size(121, 21);
this.combo_2_4.TabIndex = 5;
this.combo_2_4.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged);
//
// combo_2_3
//
this.combo_2_3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.combo_2_3.FormattingEnabled = true;
this.combo_2_3.Location = new System.Drawing.Point(114, 75);
this.combo_2_3.Name = "combo_2_3";
this.combo_2_3.Size = new System.Drawing.Size(121, 21);
this.combo_2_3.TabIndex = 4;
this.combo_2_3.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged);
//
// combo_2_2
//
this.combo_2_2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.combo_2_2.FormattingEnabled = true;
this.combo_2_2.Location = new System.Drawing.Point(114, 48);
this.combo_2_2.Name = "combo_2_2";
this.combo_2_2.Size = new System.Drawing.Size(121, 21);
this.combo_2_2.TabIndex = 3;
this.combo_2_2.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged);
//
// combo_2_1
//
this.combo_2_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.combo_2_1.FormattingEnabled = true;
this.combo_2_1.Location = new System.Drawing.Point(114, 21);
this.combo_2_1.Name = "combo_2_1";
this.combo_2_1.Size = new System.Drawing.Size(121, 21);
this.combo_2_1.TabIndex = 2;
this.combo_2_1.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged);
//
// cbMemcard_2
//
this.cbMemcard_2.AutoSize = true;
this.cbMemcard_2.Location = new System.Drawing.Point(18, 21);
this.cbMemcard_2.Name = "cbMemcard_2";
this.cbMemcard_2.Size = new System.Drawing.Size(70, 17);
this.cbMemcard_2.TabIndex = 1;
this.cbMemcard_2.Text = "Memcard";
this.cbMemcard_2.UseVisualStyleBackColor = true;
this.cbMemcard_2.CheckedChanged += new System.EventHandler(this.cb_changed);
//
// cbMultitap_2
//
this.cbMultitap_2.AutoSize = true;
this.cbMultitap_2.Enabled = false;
this.cbMultitap_2.Location = new System.Drawing.Point(18, 43);
this.cbMultitap_2.Name = "cbMultitap_2";
this.cbMultitap_2.Size = new System.Drawing.Size(63, 17);
this.cbMultitap_2.TabIndex = 0;
this.cbMultitap_2.Text = "Multitap";
this.cbMultitap_2.UseVisualStyleBackColor = true;
this.cbMultitap_2.CheckedChanged += new System.EventHandler(this.cb_changed);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(13, 172);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(177, 13);
this.label1.TabIndex = 14;
this.label1.Text = "Sorry, multitap not supported just yet";
//
// PSXControllerConfigNew
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(586, 201);
this.Controls.Add(this.label1);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.groupBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "PSXControllerConfigNew";
this.Text = "Controller / Memcard Configuration";
this.Load += new System.EventHandler(this.PSXControllerConfigNew_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.CheckBox cbMultitap_1;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label lbl_p_1_4;
private System.Windows.Forms.Label lbl_p_1_3;
private System.Windows.Forms.Label lbl_p_1_2;
private System.Windows.Forms.Label lbl_p_1_1;
private System.Windows.Forms.Label lbl_1_4;
private System.Windows.Forms.Label lbl_1_3;
private System.Windows.Forms.Label lbl_1_2;
private System.Windows.Forms.Label lbl_1_1;
private System.Windows.Forms.ComboBox combo_1_4;
private System.Windows.Forms.ComboBox combo_1_3;
private System.Windows.Forms.ComboBox combo_1_2;
private System.Windows.Forms.ComboBox combo_1_1;
private System.Windows.Forms.CheckBox cbMemcard_1;
private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Label lbl_p_2_4;
private System.Windows.Forms.Label lbl_p_2_3;
private System.Windows.Forms.Label lbl_p_2_2;
private System.Windows.Forms.Label lbl_p_2_1;
private System.Windows.Forms.Label lbl_2_4;
private System.Windows.Forms.Label lbl_2_3;
private System.Windows.Forms.Label lbl_2_2;
private System.Windows.Forms.Label lbl_2_1;
private System.Windows.Forms.ComboBox combo_2_4;
private System.Windows.Forms.ComboBox combo_2_3;
private System.Windows.Forms.ComboBox combo_2_2;
private System.Windows.Forms.ComboBox combo_2_1;
private System.Windows.Forms.CheckBox cbMemcard_2;
private System.Windows.Forms.CheckBox cbMultitap_2;
private System.Windows.Forms.Label label1;
}
}

148
BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.cs Normal file
View File

@ -0,0 +1,148 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using BizHawk.Common;
using BizHawk.Emulation.Cores.Sony.PSX;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.WinFormExtensions;
using BizHawk.Common.ReflectionExtensions;
namespace BizHawk.Client.EmuHawk
{
public partial class PSXControllerConfigNew : Form
{
public PSXControllerConfigNew()
{
InitializeComponent();
}
private void PSXControllerConfigNew_Load(object sender, EventArgs e)
{
//populate combo boxes
foreach(var combo in new[]{combo_1_1,combo_1_2,combo_1_3,combo_1_4,combo_2_1,combo_2_2,combo_2_3,combo_2_4})
{
combo.Items.Add("-Nothing-");
combo.Items.Add("Gamepad");
combo.Items.Add("Dual Shock");
combo.Items.Add("Dual Analog");
combo.SelectedIndex = 0;
}
var psxSettings = ((Octoshock)Global.Emulator).GetSyncSettings();
GuiFromUserConfig(psxSettings.FIOConfig);
RefreshLabels();
}
void GuiFromUserConfig(OctoshockFIOConfigUser user)
{
cbMemcard_1.Checked = user.Memcards[0];
cbMemcard_2.Checked = user.Memcards[1];
cbMultitap_1.Checked = user.Multitaps[0];
cbMultitap_2.Checked = user.Multitaps[1];
var combos = new[] { combo_1_1, combo_1_2, combo_1_3, combo_1_4, combo_2_1, combo_2_2, combo_2_3, combo_2_4 };
for (int i = 0; i < 8; i++)
{
var combo = combos[i];
if (user.Devices8[i] == OctoshockDll.ePeripheralType.None) combo.SelectedIndex = 0;
if (user.Devices8[i] == OctoshockDll.ePeripheralType.DualAnalog) combo.SelectedIndex = 1;
if (user.Devices8[i] == OctoshockDll.ePeripheralType.DualShock) combo.SelectedIndex = 2;
}
}
OctoshockFIOConfigUser UserConfigFromGui()
{
OctoshockFIOConfigUser uc = new OctoshockFIOConfigUser();
uc.Memcards[0] = cbMemcard_1.Checked;
uc.Memcards[1] = cbMemcard_2.Checked;
uc.Multitaps[0] = cbMultitap_1.Checked;
uc.Multitaps[1] = cbMultitap_2.Checked;
var combos = new[] { combo_1_1, combo_1_2, combo_1_3, combo_1_4, combo_2_1, combo_2_2, combo_2_3, combo_2_4 };
for (int i = 0; i < 8; i++)
{
var combo = combos[i];
if (combo.SelectedIndex == 0) uc.Devices8[i] = OctoshockDll.ePeripheralType.None;
if (combo.SelectedIndex == 1) uc.Devices8[i] = OctoshockDll.ePeripheralType.DualAnalog;
if (combo.SelectedIndex == 2) uc.Devices8[i] = OctoshockDll.ePeripheralType.DualShock;
}
return uc;
}
void RefreshLabels()
{
var uc = UserConfigFromGui();
bool b1 = uc.Multitaps[0];
lbl_1_1.Visible = b1;
lbl_1_2.Visible = b1;
lbl_1_3.Visible = b1;
lbl_1_4.Visible = b1;
combo_1_2.Enabled = b1;
combo_1_3.Enabled = b1;
combo_1_4.Enabled = b1;
lbl_p_1_2.Visible = b1;
lbl_p_1_3.Visible = b1;
lbl_p_1_4.Visible = b1;
bool b2 = uc.Multitaps[1];
lbl_2_1.Visible = b2;
lbl_2_2.Visible = b2;
lbl_2_3.Visible = b2;
lbl_2_4.Visible = b2;
combo_2_2.Enabled = b2;
combo_2_3.Enabled = b2;
combo_2_4.Enabled = b2;
lbl_p_2_2.Visible = b2;
lbl_p_2_3.Visible = b2;
lbl_p_2_4.Visible = b2;
var LC = uc.ToLogical();
var p_labels = new[] { lbl_p_1_1,lbl_p_1_2,lbl_p_1_3,lbl_p_1_4,lbl_p_2_1,lbl_p_2_2,lbl_p_2_3,lbl_p_2_4};
for (int i = 0; i < 8; i++)
{
var lbl = p_labels[i];
if (LC.PlayerAssignments[i] == -1)
lbl.Visible = false;
else
{
lbl.Text = "P" + LC.PlayerAssignments[i];
lbl.Visible = true;
}
}
}
private void cb_changed(object sender, EventArgs e)
{
RefreshLabels();
}
private void combo_SelectedIndexChanged(object sender, EventArgs e)
{
RefreshLabels();
}
private void btnOK_Click(object sender, EventArgs e)
{
var psxSettings = ((Octoshock)Global.Emulator).GetSyncSettings();
psxSettings.FIOConfig = UserConfigFromGui();
GlobalWin.MainForm.PutCoreSyncSettings(psxSettings);
DialogResult = DialogResult.OK;
Close();
}
}
}

0
BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.resx → BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.resx
View File

235
BizHawk.Client.EmuHawk/config/PSX/PSXOptions.Designer.cs generated
View File

@ -33,6 +33,7 @@
this.btnCancel = new System.Windows.Forms.Button();
this.btnOk = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.lblTweakedMednafen = new System.Windows.Forms.Label();
this.rbTweakedMednafenMode = new System.Windows.Forms.RadioButton();
this.label3 = new System.Windows.Forms.Label();
@ -43,31 +44,42 @@
this.lblPixelPro = new System.Windows.Forms.Label();
this.rbPixelPro = new System.Windows.Forms.RadioButton();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.rbClipNone = new System.Windows.Forms.RadioButton();
this.rbClipToFramebuffer = new System.Windows.Forms.RadioButton();
this.rbClipBasic = new System.Windows.Forms.RadioButton();
this.lblPAL = new System.Windows.Forms.Label();
this.PAL_LastLineNumeric = new System.Windows.Forms.NumericUpDown();
this.PAL_FirstLineNumeric = new System.Windows.Forms.NumericUpDown();
this.lblNTSC = new System.Windows.Forms.Label();
this.btnAreaFull = new System.Windows.Forms.Button();
this.checkClipHorizontal = new System.Windows.Forms.CheckBox();
this.label4 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.NTSC_LastLineNumeric = new System.Windows.Forms.NumericUpDown();
this.NTSC_FirstLineNumeric = new System.Windows.Forms.NumericUpDown();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.rbWeave = new System.Windows.Forms.RadioButton();
this.rbBobOffset = new System.Windows.Forms.RadioButton();
this.rbBob = new System.Windows.Forms.RadioButton();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.cbLEC = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PAL_LastLineNumeric)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PAL_FirstLineNumeric)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NTSC_LastLineNumeric)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NTSC_FirstLineNumeric)).BeginInit();
this.groupBox4.SuspendLayout();
this.groupBox5.SuspendLayout();
this.SuspendLayout();
//
// btnCancel
//
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(622, 262);
this.btnCancel.Location = new System.Drawing.Point(622, 370);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 3;
@ -77,7 +89,7 @@
// btnOk
//
this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnOk.Location = new System.Drawing.Point(541, 262);
this.btnOk.Location = new System.Drawing.Point(541, 370);
this.btnOk.Name = "btnOk";
this.btnOk.Size = new System.Drawing.Size(75, 23);
this.btnOk.TabIndex = 2;
@ -99,14 +111,25 @@
this.groupBox1.Controls.Add(this.rbPixelPro);
this.groupBox1.Location = new System.Drawing.Point(12, 7);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(474, 278);
this.groupBox1.Size = new System.Drawing.Size(474, 293);
this.groupBox1.TabIndex = 6;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Resolution Management";
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(326, 254);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(53, 13);
this.linkLabel1.TabIndex = 29;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "About Me";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// lblTweakedMednafen
//
this.lblTweakedMednafen.Location = new System.Drawing.Point(255, 132);
this.lblTweakedMednafen.Location = new System.Drawing.Point(249, 134);
this.lblTweakedMednafen.Name = "lblTweakedMednafen";
this.lblTweakedMednafen.Size = new System.Drawing.Size(213, 93);
this.lblTweakedMednafen.TabIndex = 28;
@ -115,7 +138,7 @@
// rbTweakedMednafenMode
//
this.rbTweakedMednafenMode.AutoSize = true;
this.rbTweakedMednafenMode.Location = new System.Drawing.Point(246, 116);
this.rbTweakedMednafenMode.Location = new System.Drawing.Point(246, 118);
this.rbTweakedMednafenMode.Name = "rbTweakedMednafenMode";
this.rbTweakedMednafenMode.Size = new System.Drawing.Size(193, 17);
this.rbTweakedMednafenMode.TabIndex = 27;
@ -125,13 +148,13 @@
//
// label3
//
this.label3.Location = new System.Drawing.Point(246, 39);
this.label3.Location = new System.Drawing.Point(249, 35);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(213, 82);
this.label3.TabIndex = 26;
this.label3.Text = "Displays all content unmodified\r\n • Window size will constantly change\r\n • Aspect" +
" ratio is usually wrong\r\n • Recommended for hacking\r\n • Ideal for segmented AV d" +
"umping\r\n";
"umping\r\n • Ideal for screen shots\r\n\r\n";
//
// rbDebugMode
//
@ -147,7 +170,7 @@
// btnNiceDisplayConfig
//
this.btnNiceDisplayConfig.AutoSize = true;
this.btnNiceDisplayConfig.Location = new System.Drawing.Point(146, 238);
this.btnNiceDisplayConfig.Location = new System.Drawing.Point(145, 244);
this.btnNiceDisplayConfig.Name = "btnNiceDisplayConfig";
this.btnNiceDisplayConfig.Size = new System.Drawing.Size(173, 23);
this.btnNiceDisplayConfig.TabIndex = 24;
@ -157,7 +180,7 @@
//
// lblMednafen
//
this.lblMednafen.Location = new System.Drawing.Point(6, 132);
this.lblMednafen.Location = new System.Drawing.Point(6, 134);
this.lblMednafen.Name = "lblMednafen";
this.lblMednafen.Size = new System.Drawing.Size(213, 93);
this.lblMednafen.TabIndex = 23;
@ -166,7 +189,7 @@
// rbMednafenMode
//
this.rbMednafenMode.AutoSize = true;
this.rbMednafenMode.Location = new System.Drawing.Point(6, 116);
this.rbMednafenMode.Location = new System.Drawing.Point(6, 118);
this.rbMednafenMode.Name = "rbMednafenMode";
this.rbMednafenMode.Size = new System.Drawing.Size(145, 17);
this.rbMednafenMode.TabIndex = 22;
@ -197,27 +220,80 @@
//
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.groupBox3);
this.groupBox2.Controls.Add(this.lblPAL);
this.groupBox2.Controls.Add(this.PAL_LastLineNumeric);
this.groupBox2.Controls.Add(this.PAL_FirstLineNumeric);
this.groupBox2.Controls.Add(this.lblNTSC);
this.groupBox2.Controls.Add(this.btnAreaFull);
this.groupBox2.Controls.Add(this.checkClipHorizontal);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Controls.Add(this.NTSC_LastLineNumeric);
this.groupBox2.Controls.Add(this.NTSC_FirstLineNumeric);
this.groupBox2.Location = new System.Drawing.Point(492, 7);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(212, 160);
this.groupBox2.Size = new System.Drawing.Size(212, 239);
this.groupBox2.TabIndex = 31;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Drawing Area";
//
// groupBox3
//
this.groupBox3.Controls.Add(this.rbClipNone);
this.groupBox3.Controls.Add(this.rbClipToFramebuffer);
this.groupBox3.Controls.Add(this.rbClipBasic);
this.groupBox3.Location = new System.Drawing.Point(7, 131);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(197, 88);
this.groupBox3.TabIndex = 46;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Horizontal Overscan Clipping";
//
// rbClipNone
//
this.rbClipNone.AutoSize = true;
this.rbClipNone.Location = new System.Drawing.Point(6, 19);
this.rbClipNone.Name = "rbClipNone";
this.rbClipNone.Size = new System.Drawing.Size(51, 17);
this.rbClipNone.TabIndex = 48;
this.rbClipNone.TabStop = true;
this.rbClipNone.Text = "None";
this.toolTip1.SetToolTip(this.rbClipNone, resources.GetString("rbClipNone.ToolTip"));
this.rbClipNone.UseVisualStyleBackColor = true;
this.rbClipNone.CheckedChanged += new System.EventHandler(this.rbClipNone_CheckedChanged);
//
// rbClipToFramebuffer
//
this.rbClipToFramebuffer.AutoSize = true;
this.rbClipToFramebuffer.Location = new System.Drawing.Point(6, 65);
this.rbClipToFramebuffer.Name = "rbClipToFramebuffer";
this.rbClipToFramebuffer.Size = new System.Drawing.Size(117, 17);
this.rbClipToFramebuffer.TabIndex = 47;
this.rbClipToFramebuffer.TabStop = true;
this.rbClipToFramebuffer.Text = "Clip To Framebuffer";
this.toolTip1.SetToolTip(this.rbClipToFramebuffer, "Subverts mednafen\'s internal video display field emulation to show only the game\'" +
"s framebuffer.\r\nHorizontal letterbox bars may be re-added in Mednafen-style reso" +
"lution modes to maintain correct AR.");
this.rbClipToFramebuffer.UseVisualStyleBackColor = true;
this.rbClipToFramebuffer.CheckedChanged += new System.EventHandler(this.rbClipToFramebuffer_CheckedChanged);
//
// rbClipBasic
//
this.rbClipBasic.AutoSize = true;
this.rbClipBasic.Location = new System.Drawing.Point(6, 42);
this.rbClipBasic.Name = "rbClipBasic";
this.rbClipBasic.Size = new System.Drawing.Size(91, 17);
this.rbClipBasic.TabIndex = 46;
this.rbClipBasic.TabStop = true;
this.rbClipBasic.Text = "Basic Clipping";
this.toolTip1.SetToolTip(this.rbClipBasic, "A mednafen option -- appears to be 5.5% horizontally");
this.rbClipBasic.UseVisualStyleBackColor = true;
this.rbClipBasic.CheckedChanged += new System.EventHandler(this.rbClipHorizontal_CheckedChanged);
//
// lblPAL
//
this.lblPAL.AutoSize = true;
this.lblPAL.Location = new System.Drawing.Point(131, 22);
this.lblPAL.Location = new System.Drawing.Point(131, 17);
this.lblPAL.Name = "lblPAL";
this.lblPAL.Size = new System.Drawing.Size(27, 13);
this.lblPAL.TabIndex = 44;
@ -225,7 +301,7 @@
//
// PAL_LastLineNumeric
//
this.PAL_LastLineNumeric.Location = new System.Drawing.Point(124, 67);
this.PAL_LastLineNumeric.Location = new System.Drawing.Point(124, 62);
this.PAL_LastLineNumeric.Maximum = new decimal(new int[] {
287,
0,
@ -243,7 +319,7 @@
//
// PAL_FirstLineNumeric
//
this.PAL_FirstLineNumeric.Location = new System.Drawing.Point(124, 41);
this.PAL_FirstLineNumeric.Location = new System.Drawing.Point(124, 36);
this.PAL_FirstLineNumeric.Maximum = new decimal(new int[] {
287,
0,
@ -257,7 +333,7 @@
// lblNTSC
//
this.lblNTSC.AutoSize = true;
this.lblNTSC.Location = new System.Drawing.Point(62, 22);
this.lblNTSC.Location = new System.Drawing.Point(62, 17);
this.lblNTSC.Name = "lblNTSC";
this.lblNTSC.Size = new System.Drawing.Size(36, 13);
this.lblNTSC.TabIndex = 41;
@ -265,30 +341,18 @@
//
// btnAreaFull
//
this.btnAreaFull.Location = new System.Drawing.Point(6, 98);
this.btnAreaFull.Location = new System.Drawing.Point(8, 94);
this.btnAreaFull.Name = "btnAreaFull";
this.btnAreaFull.Size = new System.Drawing.Size(136, 23);
this.btnAreaFull.Size = new System.Drawing.Size(163, 23);
this.btnAreaFull.TabIndex = 40;
this.btnAreaFull.Text = "Full [0,239] and [0,287]";
this.btnAreaFull.UseVisualStyleBackColor = true;
this.btnAreaFull.Click += new System.EventHandler(this.btnAreaFull_Click);
//
// checkClipHorizontal
//
this.checkClipHorizontal.AutoSize = true;
this.checkClipHorizontal.Location = new System.Drawing.Point(7, 127);
this.checkClipHorizontal.Name = "checkClipHorizontal";
this.checkClipHorizontal.Size = new System.Drawing.Size(142, 17);
this.checkClipHorizontal.TabIndex = 30;
this.checkClipHorizontal.Text = "Clip Horizontal Overscan";
this.toolTip1.SetToolTip(this.checkClipHorizontal, "A mednafen option -- appears to be 5.5% horizontally");
this.checkClipHorizontal.UseVisualStyleBackColor = true;
this.checkClipHorizontal.CheckedChanged += new System.EventHandler(this.checkClipHorizontal_CheckedChanged);
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(4, 69);
this.label4.Location = new System.Drawing.Point(4, 64);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(49, 13);
this.label4.TabIndex = 24;
@ -297,7 +361,7 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(5, 43);
this.label1.Location = new System.Drawing.Point(5, 38);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(48, 13);
this.label1.TabIndex = 23;
@ -305,7 +369,7 @@
//
// NTSC_LastLineNumeric
//
this.NTSC_LastLineNumeric.Location = new System.Drawing.Point(59, 67);
this.NTSC_LastLineNumeric.Location = new System.Drawing.Point(59, 62);
this.NTSC_LastLineNumeric.Maximum = new decimal(new int[] {
239,
0,
@ -323,7 +387,7 @@
//
// NTSC_FirstLineNumeric
//
this.NTSC_FirstLineNumeric.Location = new System.Drawing.Point(59, 41);
this.NTSC_FirstLineNumeric.Location = new System.Drawing.Point(59, 36);
this.NTSC_FirstLineNumeric.Maximum = new decimal(new int[] {
239,
0,
@ -334,16 +398,76 @@
this.NTSC_FirstLineNumeric.TabIndex = 21;
this.NTSC_FirstLineNumeric.ValueChanged += new System.EventHandler(this.DrawingArea_ValueChanged);
//
// linkLabel1
// rbWeave
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(327, 248);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(53, 13);
this.linkLabel1.TabIndex = 29;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "About Me";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
this.rbWeave.AutoSize = true;
this.rbWeave.Location = new System.Drawing.Point(6, 19);
this.rbWeave.Name = "rbWeave";
this.rbWeave.Size = new System.Drawing.Size(60, 17);
this.rbWeave.TabIndex = 48;
this.rbWeave.TabStop = true;
this.rbWeave.Text = "Weave";
this.toolTip1.SetToolTip(this.rbWeave, "Good for low-motion video");
this.rbWeave.UseVisualStyleBackColor = true;
//
// rbBobOffset
//
this.rbBobOffset.AutoSize = true;
this.rbBobOffset.Location = new System.Drawing.Point(122, 19);
this.rbBobOffset.Name = "rbBobOffset";
this.rbBobOffset.Size = new System.Drawing.Size(75, 17);
this.rbBobOffset.TabIndex = 47;
this.rbBobOffset.TabStop = true;
this.rbBobOffset.Text = "Bob Offset";
this.toolTip1.SetToolTip(this.rbBobOffset, "Good for high-motion video, but is a bit flickery; reduces the subjective vertica" +
"l resolution.");
this.rbBobOffset.UseVisualStyleBackColor = true;
//
// rbBob
//
this.rbBob.AutoSize = true;
this.rbBob.Location = new System.Drawing.Point(72, 19);
this.rbBob.Name = "rbBob";
this.rbBob.Size = new System.Drawing.Size(44, 17);
this.rbBob.TabIndex = 46;
this.rbBob.TabStop = true;
this.rbBob.Text = "Bob";
this.toolTip1.SetToolTip(this.rbBob, "Good for causing a headache. All glory to Bob.");
this.rbBob.UseVisualStyleBackColor = true;
//
// groupBox4
//
this.groupBox4.Controls.Add(this.rbWeave);
this.groupBox4.Controls.Add(this.rbBobOffset);
this.groupBox4.Controls.Add(this.rbBob);
this.groupBox4.Location = new System.Drawing.Point(492, 251);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(212, 49);
this.groupBox4.TabIndex = 50;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Deinterlacing";
//
// groupBox5
//
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox5.Controls.Add(this.cbLEC);
this.groupBox5.Location = new System.Drawing.Point(12, 306);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(299, 85);
this.groupBox5.TabIndex = 47;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Emulation";
//
// cbLEC
//
this.cbLEC.AutoSize = true;
this.cbLEC.Location = new System.Drawing.Point(9, 19);
this.cbLEC.Name = "cbLEC";
this.cbLEC.Size = new System.Drawing.Size(222, 30);
this.cbLEC.TabIndex = 0;
this.cbLEC.Text = "Emulate Sector Error Correction\r\n(usually unneeded; breaks some patches)";
this.cbLEC.UseVisualStyleBackColor = true;
//
// PSXOptions
//
@ -351,7 +475,9 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(713, 297);
this.ClientSize = new System.Drawing.Size(713, 405);
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btnCancel);
@ -365,10 +491,16 @@
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.PAL_LastLineNumeric)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.PAL_FirstLineNumeric)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NTSC_LastLineNumeric)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NTSC_FirstLineNumeric)).EndInit();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.ResumeLayout(false);
}
@ -393,12 +525,21 @@
private System.Windows.Forms.NumericUpDown PAL_FirstLineNumeric;
private System.Windows.Forms.Label lblNTSC;
private System.Windows.Forms.Button btnAreaFull;
private System.Windows.Forms.CheckBox checkClipHorizontal;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.NumericUpDown NTSC_LastLineNumeric;
private System.Windows.Forms.NumericUpDown NTSC_FirstLineNumeric;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.RadioButton rbClipNone;
private System.Windows.Forms.RadioButton rbClipToFramebuffer;
private System.Windows.Forms.RadioButton rbClipBasic;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.RadioButton rbWeave;
private System.Windows.Forms.RadioButton rbBobOffset;
private System.Windows.Forms.RadioButton rbBob;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.CheckBox cbLEC;
}
}

61
BizHawk.Client.EmuHawk/config/PSX/PSXOptions.cs
View File

@ -17,10 +17,11 @@ namespace BizHawk.Client.EmuHawk
//backups of the labels for string replacing
string lblPixelPro_text, lblMednafen_text, lblTweakedMednafen_text;
public PSXOptions(Octoshock.Settings settings, OctoshockDll.eVidStandard vidStandard, Size currentVideoSize)
public PSXOptions(Octoshock.Settings settings, Octoshock.SyncSettings syncSettings, OctoshockDll.eVidStandard vidStandard, Size currentVideoSize)
{
InitializeComponent();
_settings = settings;
_syncSettings = syncSettings;
_previewVideoStandard = vidStandard;
_previewVideoSize = currentVideoSize;
@ -36,7 +37,15 @@ namespace BizHawk.Client.EmuHawk
rbDebugMode.Checked = _settings.ResolutionMode == Octoshock.eResolutionMode.Debug;
rbMednafenMode.Checked = _settings.ResolutionMode == Octoshock.eResolutionMode.Mednafen;
rbTweakedMednafenMode.Checked = _settings.ResolutionMode == Octoshock.eResolutionMode.TweakedMednafen;
checkClipHorizontal.Checked = _settings.ClipHorizontalOverscan;
rbClipNone.Checked = _settings.HorizontalClipping == Octoshock.eHorizontalClipping.None;
rbClipBasic.Checked = _settings.HorizontalClipping == Octoshock.eHorizontalClipping.Basic;
rbClipToFramebuffer.Checked = _settings.HorizontalClipping == Octoshock.eHorizontalClipping.Framebuffer;
cbLEC.Checked = _syncSettings.EnableLEC;
rbWeave.Checked = _settings.DeinterlaceMode == Octoshock.eDeinterlaceMode.Weave;
rbBob.Checked = _settings.DeinterlaceMode == Octoshock.eDeinterlaceMode.Bob;
rbBobOffset.Checked = _settings.DeinterlaceMode == Octoshock.eDeinterlaceMode.BobOffset;
NTSC_FirstLineNumeric.Value = _settings.ScanlineStart_NTSC;
NTSC_LastLineNumeric.Value = _settings.ScanlineEnd_NTSC;
@ -47,6 +56,7 @@ namespace BizHawk.Client.EmuHawk
Size _previewVideoSize;
OctoshockDll.eVidStandard _previewVideoStandard;
Octoshock.Settings _settings;
Octoshock.SyncSettings _syncSettings;
bool _dispSettingsSet = false;
private void btnNiceDisplayConfig_Click(object sender, EventArgs e)
@ -62,25 +72,33 @@ namespace BizHawk.Client.EmuHawk
var ss = psx.GetSyncSettings();
var vid = psx.SystemVidStandard;
var size = psx.CurrentVideoSize;
var dlg = new PSXOptions(s,vid,size);
var dlg = new PSXOptions(s,ss,vid,size);
var result = dlg.ShowDialog(owner);
return result;
}
void SyncGuiToTheseSettings(Octoshock.Settings settings)
void SyncSettingsFromGui(Octoshock.Settings settings, Octoshock.SyncSettings syncSettings)
{
if (rbPixelPro.Checked) settings.ResolutionMode = Octoshock.eResolutionMode.PixelPro;
if (rbDebugMode.Checked) settings.ResolutionMode = Octoshock.eResolutionMode.Debug;
if (rbMednafenMode.Checked) settings.ResolutionMode = Octoshock.eResolutionMode.Mednafen;
if (rbTweakedMednafenMode.Checked) settings.ResolutionMode = Octoshock.eResolutionMode.TweakedMednafen;
settings.ClipHorizontalOverscan = checkClipHorizontal.Checked;
if (rbClipNone.Checked) settings.HorizontalClipping = Octoshock.eHorizontalClipping.None;
if (rbClipBasic.Checked) settings.HorizontalClipping = Octoshock.eHorizontalClipping.Basic;
if (rbClipToFramebuffer.Checked) settings.HorizontalClipping = Octoshock.eHorizontalClipping.Framebuffer;
if(rbWeave.Checked) _settings.DeinterlaceMode = Octoshock.eDeinterlaceMode.Weave;
if(rbBob.Checked) _settings.DeinterlaceMode = Octoshock.eDeinterlaceMode.Bob;
if(rbBobOffset.Checked) _settings.DeinterlaceMode = Octoshock.eDeinterlaceMode.BobOffset;
settings.ScanlineStart_NTSC = (int)NTSC_FirstLineNumeric.Value;
settings.ScanlineEnd_NTSC = (int)NTSC_LastLineNumeric.Value;
settings.ScanlineStart_PAL = (int)PAL_FirstLineNumeric.Value;
settings.ScanlineEnd_PAL = (int)PAL_LastLineNumeric.Value;
syncSettings.EnableLEC = cbLEC.Checked;
}
private void btnOk_Click(object sender, EventArgs e)
@ -93,9 +111,10 @@ namespace BizHawk.Client.EmuHawk
Global.Config.DispFinalFilter = 1; //bilinear, I hope
}
SyncGuiToTheseSettings(_settings);
SyncSettingsFromGui(_settings, _syncSettings);
_settings.Validate();
GlobalWin.MainForm.PutCoreSettings(_settings);
GlobalWin.MainForm.PutCoreSyncSettings(_syncSettings);
DialogResult = DialogResult.OK;
Close();
@ -113,7 +132,8 @@ namespace BizHawk.Client.EmuHawk
void SyncLabels()
{
var temp = _settings.Clone();
SyncGuiToTheseSettings(temp);
var syncTemp = _syncSettings.Clone();
SyncSettingsFromGui(temp, syncTemp);
_settings.Validate();
//actually, I think this is irrelevant. But it's nice in case we want to do some kind of a more detailed simulation later
@ -121,16 +141,16 @@ namespace BizHawk.Client.EmuHawk
int h = _previewVideoSize.Height;
temp.ResolutionMode = Octoshock.eResolutionMode.PixelPro;
var size = Octoshock.CalculateResolution(_previewVideoStandard, temp, w, h);
lblPixelPro.Text = lblPixelPro_text.Replace("800x480", string.Format("{0}x{1}", size.Width, size.Height)); ;
var ri = Octoshock.CalculateResolution(_previewVideoStandard, temp, w, h);
lblPixelPro.Text = lblPixelPro_text.Replace("800x480", string.Format("{0}x{1}", ri.Resolution.Width, ri.Resolution.Height)); ;
temp.ResolutionMode = Octoshock.eResolutionMode.Mednafen;
size = Octoshock.CalculateResolution(_previewVideoStandard, temp, w, h);
lblMednafen.Text = lblMednafen_text.Replace("320x240", string.Format("{0}x{1}", size.Width, size.Height));
ri = Octoshock.CalculateResolution(_previewVideoStandard, temp, w, h);
lblMednafen.Text = lblMednafen_text.Replace("320x240", string.Format("{0}x{1}", ri.Resolution.Width, ri.Resolution.Height));
temp.ResolutionMode = Octoshock.eResolutionMode.TweakedMednafen;
size = Octoshock.CalculateResolution(_previewVideoStandard, temp, w, h);
lblTweakedMednafen.Text = lblTweakedMednafen_text.Replace("400x300", string.Format("{0}x{1}", size.Width, size.Height));
ri = Octoshock.CalculateResolution(_previewVideoStandard, temp, w, h);
lblTweakedMednafen.Text = lblTweakedMednafen_text.Replace("400x300", string.Format("{0}x{1}", ri.Resolution.Width, ri.Resolution.Height));
}
private void DrawingArea_ValueChanged(object sender, EventArgs e)
@ -138,7 +158,18 @@ namespace BizHawk.Client.EmuHawk
SyncLabels();
}
private void checkClipHorizontal_CheckedChanged(object sender, EventArgs e)
private void rbClipHorizontal_CheckedChanged(object sender, EventArgs e)
{
SyncLabels();
}
private void rbClipToFramebuffer_CheckedChanged(object sender, EventArgs e)
{
SyncLabels();
}
private void rbClipNone_CheckedChanged(object sender, EventArgs e)
{
SyncLabels();
}
@ -157,5 +188,7 @@ But: 1. we think we improved on it a tiny bit with the tweaked mode
And: 2. It's not suitable for detailed scrutinizing of graphics
");
}
}
}

5
BizHawk.Client.EmuHawk/config/PSX/PSXOptions.resx
View File

@ -146,4 +146,9 @@ fit gracefully in a 800x480 window.
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="rbClipNone.ToolTip" xml:space="preserve">
<value>Mednafen adds quite a bit overscan to closely emulate minor quirks of the psx's display output.
Using this option may result in objectionable levels of black bars, but will fix some rare quirks in games.
</value>
</data>
</root>

BIN
BizHawk.Client.EmuHawk/images/BlankCursor.cur Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 326 B

BIN
BizHawk.Client.EmuHawk/images/basicbot.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
BizHawk.Client.EmuHawk/images/kitchensink.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 476 B

BIN
BizHawk.Client.EmuHawk/images/tastudio/icon_anchor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
BizHawk.Client.EmuHawk/images/tastudio/icon_anchor_lag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
BizHawk.Client.EmuHawk/images/tastudio/icon_marker.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

37
BizHawk.Client.EmuHawk/movie/PlayMovie.cs
View File

@ -87,26 +87,27 @@ namespace BizHawk.Client.EmuHawk
return null;
}
var index = IsDuplicateOf(filename);
if (!index.HasValue)
//System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch(); watch.Start();
var movie = PreLoadMovieFile(file, force);
if (movie == null)
{
//System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch(); watch.Start();
var movie = PreLoadMovieFile(file, force);
if (movie == null)
{
return null;
}
//watch.Stop(); Console.WriteLine("[{0}] {1}",watch.ElapsedMilliseconds,Path.GetFileName(filename));
lock (_movieList)
{
_movieList.Add(movie);
index = _movieList.Count - 1;
}
_sortReverse = false;
_sortedCol = string.Empty;
return null;
}
//watch.Stop(); Console.WriteLine("[{0}] {1}",watch.ElapsedMilliseconds,Path.GetFileName(filename));
int? index;
lock (_movieList)
{
//need to check IsDuplicateOf within the lock
index = IsDuplicateOf(filename);
if (index.HasValue) return index;
_movieList.Add(movie);
index = _movieList.Count - 1;
}
_sortReverse = false;
_sortedCol = string.Empty;
return index;
}

3
BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs generated
View File

@ -95,7 +95,8 @@
this.StartFromCombo.FormattingEnabled = true;
this.StartFromCombo.Items.AddRange(new object[] {
"Power-On",
"Now"});
"Now",
"SaveRam"});
this.StartFromCombo.Location = new System.Drawing.Point(83, 65);
this.StartFromCombo.MaxDropDownItems = 32;
this.StartFromCombo.Name = "StartFromCombo";

18
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
View File

@ -28,6 +28,15 @@ namespace BizHawk.Client.EmuHawk
.First(i => i.ToString()
.ToLower() == "now"));
}
if (!Global.Emulator.HasSaveRam())
{
StartFromCombo.Items.Remove(
StartFromCombo.Items
.OfType<object>()
.First(i => i.ToString()
.ToLower() == "saveram"));
}
}
private string MakePath()
@ -84,6 +93,7 @@ namespace BizHawk.Client.EmuHawk
var core = Global.Emulator.AsStatable();
movieToRecord.StartsFromSavestate = true;
movieToRecord.StartsFromSaveRam = false;
if (core.BinarySaveStatesPreferred)
{
@ -104,11 +114,17 @@ namespace BizHawk.Client.EmuHawk
movieToRecord.SavestateFramebuffer = new int[0];
if (movieToRecord.SavestateFramebuffer != null)
{
movieToRecord.SavestateFramebuffer = (int[])Global.Emulator.VideoProvider().GetVideoBuffer().Clone();
}
}
}
else if (StartFromCombo.SelectedItem.ToString() == "SaveRam" && Global.Emulator.HasSaveRam())
{
var core = Global.Emulator.AsSaveRam();
movieToRecord.StartsFromSavestate = false;
movieToRecord.StartsFromSaveRam = true;
movieToRecord.SaveRam = core.CloneSaveRam();
}
movieToRecord.PopulateWithDefaultHeaderValues(AuthorBox.Text);
movieToRecord.Save();

924
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs generated Normal file
View File

@ -0,0 +1,924 @@
namespace BizHawk.Client.EmuHawk
{
partial class BasicBot
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BasicBot));
this.BotMenu = new MenuStripEx();
this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.NewMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.OpenMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SaveMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SaveAsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.RecentSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.MemoryDomainsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.DataSizeMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this._1ByteMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this._2ByteMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this._4ByteMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.BigEndianMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.TurboWhileBottingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.RunBtn = new System.Windows.Forms.Button();
this.BotStatusStrip = new System.Windows.Forms.StatusStrip();
this.BotStatusButton = new System.Windows.Forms.ToolStripStatusLabel();
this.MessageLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.ControlsBox = new System.Windows.Forms.GroupBox();
this.ControlProbabilityPanel = new System.Windows.Forms.Panel();
this.BestGroupBox = new System.Windows.Forms.GroupBox();
this.PlayBestButton = new System.Windows.Forms.Button();
this.ClearBestButton = new System.Windows.Forms.Button();
this.BestAttemptNumberLabel = new System.Windows.Forms.Label();
this.label17 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.BestAttemptLogLabel = new System.Windows.Forms.Label();
this.BestTieBreak3Box = new System.Windows.Forms.TextBox();
this.BestTieBreak2Box = new System.Windows.Forms.TextBox();
this.BestTieBreak1Box = new System.Windows.Forms.TextBox();
this.BestMaximizeBox = new System.Windows.Forms.TextBox();
this.label16 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.AttemptsLabel = new System.Windows.Forms.Label();
this.FramesLabel = new System.Windows.Forms.Label();
this.GoalGroupBox = new System.Windows.Forms.GroupBox();
this.label12 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.TieBreaker1Box = new BizHawk.Client.EmuHawk.HexTextBox();
this.TieBreaker2Box = new BizHawk.Client.EmuHawk.HexTextBox();
this.TieBreaker3Box = new BizHawk.Client.EmuHawk.HexTextBox();
this.label5 = new System.Windows.Forms.Label();
this.MaximizeAddressBox = new BizHawk.Client.EmuHawk.HexTextBox();
this.maximizeLabeltext = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.FrameLengthNumeric = new System.Windows.Forms.NumericUpDown();
this.label3 = new System.Windows.Forms.Label();
this.StopBtn = new System.Windows.Forms.Button();
this.label8 = new System.Windows.Forms.Label();
this.StartFromSlotBox = new System.Windows.Forms.ComboBox();
this.ControlGroupBox = new System.Windows.Forms.GroupBox();
this.panel2 = new System.Windows.Forms.Panel();
this.StatsContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.ClearStatsContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.BotMenu.SuspendLayout();
this.BotStatusStrip.SuspendLayout();
this.ControlsBox.SuspendLayout();
this.BestGroupBox.SuspendLayout();
this.panel1.SuspendLayout();
this.GoalGroupBox.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.FrameLengthNumeric)).BeginInit();
this.ControlGroupBox.SuspendLayout();
this.panel2.SuspendLayout();
this.StatsContextMenu.SuspendLayout();
this.SuspendLayout();
//
// BotMenu
//
this.BotMenu.ClickThrough = true;
this.BotMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
this.OptionsSubMenu});
this.BotMenu.Location = new System.Drawing.Point(0, 0);
this.BotMenu.Name = "BotMenu";
this.BotMenu.Size = new System.Drawing.Size(587, 24);
this.BotMenu.TabIndex = 0;
this.BotMenu.Text = "menuStrip1";
//
// FileSubMenu
//
this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NewMenuItem,
this.OpenMenuItem,
this.SaveMenuItem,
this.SaveAsMenuItem,
this.RecentSubMenu,
this.toolStripSeparator1,
this.ExitMenuItem});
this.FileSubMenu.Name = "FileSubMenu";
this.FileSubMenu.Size = new System.Drawing.Size(37, 20);
this.FileSubMenu.Text = "&File";
this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
//
// NewMenuItem
//
this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewMenuItem.Name = "NewMenuItem";
this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.NewMenuItem.Size = new System.Drawing.Size(195, 22);
this.NewMenuItem.Text = "&New";
this.NewMenuItem.Click += new System.EventHandler(this.NewMenuItem_Click);
//
// OpenMenuItem
//
this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenMenuItem.Name = "OpenMenuItem";
this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.OpenMenuItem.Size = new System.Drawing.Size(195, 22);
this.OpenMenuItem.Text = "&Open...";
this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
//
// SaveMenuItem
//
this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveMenuItem.Name = "SaveMenuItem";
this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.SaveMenuItem.Size = new System.Drawing.Size(195, 22);
this.SaveMenuItem.Text = "&Save";
this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click);
//
// SaveAsMenuItem
//
this.SaveAsMenuItem.Name = "SaveAsMenuItem";
this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S)));
this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22);
this.SaveAsMenuItem.Text = "Save &As...";
this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click);
//
// RecentSubMenu
//
this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator2});
this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(195, 22);
this.RecentSubMenu.Text = "Recent";
this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(57, 6);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6);
//
// ExitMenuItem
//
this.ExitMenuItem.Name = "ExitMenuItem";
this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4";
this.ExitMenuItem.Size = new System.Drawing.Size(195, 22);
this.ExitMenuItem.Text = "E&xit";
this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
//
// OptionsSubMenu
//
this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.MemoryDomainsMenuItem,
this.DataSizeMenuItem,
this.BigEndianMenuItem,
this.toolStripSeparator4,
this.TurboWhileBottingMenuItem});
this.OptionsSubMenu.Name = "OptionsSubMenu";
this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20);
this.OptionsSubMenu.Text = "&Options";
this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened);
//
// MemoryDomainsMenuItem
//
this.MemoryDomainsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator3});
this.MemoryDomainsMenuItem.Name = "MemoryDomainsMenuItem";
this.MemoryDomainsMenuItem.Size = new System.Drawing.Size(181, 22);
this.MemoryDomainsMenuItem.Text = "Memory Domains";
this.MemoryDomainsMenuItem.DropDownOpened += new System.EventHandler(this.MemoryDomainsMenuItem_DropDownOpened);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6);
//
// DataSizeMenuItem
//
this.DataSizeMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this._1ByteMenuItem,
this._2ByteMenuItem,
this._4ByteMenuItem});
this.DataSizeMenuItem.Name = "DataSizeMenuItem";
this.DataSizeMenuItem.Size = new System.Drawing.Size(181, 22);
this.DataSizeMenuItem.Text = "Data Size";
this.DataSizeMenuItem.DropDownOpened += new System.EventHandler(this.DataSizeMenuItem_DropDownOpened);
//
// _1ByteMenuItem
//
this._1ByteMenuItem.Name = "_1ByteMenuItem";
this._1ByteMenuItem.Size = new System.Drawing.Size(152, 22);
this._1ByteMenuItem.Text = "1 Byte";
this._1ByteMenuItem.Click += new System.EventHandler(this._1ByteMenuItem_Click);
//
// _2ByteMenuItem
//
this._2ByteMenuItem.Name = "_2ByteMenuItem";
this._2ByteMenuItem.Size = new System.Drawing.Size(152, 22);
this._2ByteMenuItem.Text = "2 Bytes";
this._2ByteMenuItem.Click += new System.EventHandler(this._2ByteMenuItem_Click);
//
// _4ByteMenuItem
//
this._4ByteMenuItem.Name = "_4ByteMenuItem";
this._4ByteMenuItem.Size = new System.Drawing.Size(152, 22);
this._4ByteMenuItem.Text = "4 Bytes";
this._4ByteMenuItem.Click += new System.EventHandler(this._4ByteMenuItem_Click);
//
// BigEndianMenuItem
//
this.BigEndianMenuItem.Name = "BigEndianMenuItem";
this.BigEndianMenuItem.Size = new System.Drawing.Size(181, 22);
this.BigEndianMenuItem.Text = "Big Endian";
this.BigEndianMenuItem.Click += new System.EventHandler(this.BigEndianMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(178, 6);
//
// TurboWhileBottingMenuItem
//
this.TurboWhileBottingMenuItem.Name = "TurboWhileBottingMenuItem";
this.TurboWhileBottingMenuItem.Size = new System.Drawing.Size(181, 22);
this.TurboWhileBottingMenuItem.Text = "Turbo While Botting";
this.TurboWhileBottingMenuItem.Click += new System.EventHandler(this.TurboWhileBottingMenuItem_Click);
//
// RunBtn
//
this.RunBtn.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play;
this.RunBtn.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.RunBtn.Location = new System.Drawing.Point(6, 56);
this.RunBtn.Name = "RunBtn";
this.RunBtn.Size = new System.Drawing.Size(75, 23);
this.RunBtn.TabIndex = 2001;
this.RunBtn.Text = "&Run";
this.RunBtn.UseVisualStyleBackColor = true;
this.RunBtn.Click += new System.EventHandler(this.RunBtn_Click);
//
// BotStatusStrip
//
this.BotStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.BotStatusButton,
this.MessageLabel});
this.BotStatusStrip.Location = new System.Drawing.Point(0, 565);
this.BotStatusStrip.Name = "BotStatusStrip";
this.BotStatusStrip.Size = new System.Drawing.Size(587, 22);
this.BotStatusStrip.TabIndex = 2;
this.BotStatusStrip.Text = "statusStrip1";
//
// BotStatusButton
//
this.BotStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.BotStatusButton.Image = ((System.Drawing.Image)(resources.GetObject("BotStatusButton.Image")));
this.BotStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.BotStatusButton.Name = "BotStatusButton";
this.BotStatusButton.RightToLeftAutoMirrorImage = true;
this.BotStatusButton.Size = new System.Drawing.Size(16, 17);
this.BotStatusButton.Text = " ";
this.BotStatusButton.ToolTipText = " ";
//
// MessageLabel
//
this.MessageLabel.Name = "MessageLabel";
this.MessageLabel.Size = new System.Drawing.Size(109, 17);
this.MessageLabel.Text = " ";
//
// ControlsBox
//
this.ControlsBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.ControlsBox.Controls.Add(this.ControlProbabilityPanel);
this.ControlsBox.Location = new System.Drawing.Point(12, 183);
this.ControlsBox.Name = "ControlsBox";
this.ControlsBox.Size = new System.Drawing.Size(312, 369);
this.ControlsBox.TabIndex = 3;
this.ControlsBox.TabStop = false;
this.ControlsBox.Text = "Controls";
//
// ControlProbabilityPanel
//
this.ControlProbabilityPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.ControlProbabilityPanel.AutoScroll = true;
this.ControlProbabilityPanel.Location = new System.Drawing.Point(6, 19);
this.ControlProbabilityPanel.Name = "ControlProbabilityPanel";
this.ControlProbabilityPanel.Size = new System.Drawing.Size(299, 344);
this.ControlProbabilityPanel.TabIndex = 0;
//
// BestGroupBox
//
this.BestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.BestGroupBox.Controls.Add(this.PlayBestButton);
this.BestGroupBox.Controls.Add(this.ClearBestButton);
this.BestGroupBox.Controls.Add(this.BestAttemptNumberLabel);
this.BestGroupBox.Controls.Add(this.label17);
this.BestGroupBox.Controls.Add(this.panel1);
this.BestGroupBox.Controls.Add(this.BestTieBreak3Box);
this.BestGroupBox.Controls.Add(this.BestTieBreak2Box);
this.BestGroupBox.Controls.Add(this.BestTieBreak1Box);
this.BestGroupBox.Controls.Add(this.BestMaximizeBox);
this.BestGroupBox.Controls.Add(this.label16);
this.BestGroupBox.Controls.Add(this.label15);
this.BestGroupBox.Controls.Add(this.label14);
this.BestGroupBox.Controls.Add(this.label13);
this.BestGroupBox.Location = new System.Drawing.Point(330, 183);
this.BestGroupBox.Name = "BestGroupBox";
this.BestGroupBox.Size = new System.Drawing.Size(245, 369);
this.BestGroupBox.TabIndex = 4;
this.BestGroupBox.TabStop = false;
this.BestGroupBox.Text = "Best";
//
// PlayBestButton
//
this.PlayBestButton.Enabled = false;
this.PlayBestButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play;
this.PlayBestButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.PlayBestButton.Location = new System.Drawing.Point(12, 46);
this.PlayBestButton.Name = "PlayBestButton";
this.PlayBestButton.Size = new System.Drawing.Size(75, 23);
this.PlayBestButton.TabIndex = 2004;
this.PlayBestButton.Text = "&Play";
this.PlayBestButton.UseVisualStyleBackColor = true;
this.PlayBestButton.Click += new System.EventHandler(this.PlayBestButton_Click);
//
// ClearBestButton
//
this.ClearBestButton.Enabled = false;
this.ClearBestButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close;
this.ClearBestButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.ClearBestButton.Location = new System.Drawing.Point(12, 70);
this.ClearBestButton.Name = "ClearBestButton";
this.ClearBestButton.Size = new System.Drawing.Size(75, 23);
this.ClearBestButton.TabIndex = 2003;
this.ClearBestButton.Text = "&Clear";
this.ClearBestButton.UseVisualStyleBackColor = true;
this.ClearBestButton.Click += new System.EventHandler(this.ClearBestButton_Click);
//
// BestAttemptNumberLabel
//
this.BestAttemptNumberLabel.AutoSize = true;
this.BestAttemptNumberLabel.Location = new System.Drawing.Point(59, 20);
this.BestAttemptNumberLabel.Name = "BestAttemptNumberLabel";
this.BestAttemptNumberLabel.Size = new System.Drawing.Size(13, 13);
this.BestAttemptNumberLabel.TabIndex = 23;
this.BestAttemptNumberLabel.Text = "0";
//
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(17, 20);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(46, 13);
this.label17.TabIndex = 22;
this.label17.Text = "Attempt:";
//
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.AutoScroll = true;
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel1.Controls.Add(this.BestAttemptLogLabel);
this.panel1.Location = new System.Drawing.Point(12, 112);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(227, 251);
this.panel1.TabIndex = 21;
//
// BestAttemptLogLabel
//
this.BestAttemptLogLabel.AutoSize = true;
this.BestAttemptLogLabel.Location = new System.Drawing.Point(8, 8);
this.BestAttemptLogLabel.Name = "BestAttemptLogLabel";
this.BestAttemptLogLabel.Size = new System.Drawing.Size(130, 13);
this.BestAttemptLogLabel.TabIndex = 0;
this.BestAttemptLogLabel.Text = " ";
//
// BestTieBreak3Box
//
this.BestTieBreak3Box.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.BestTieBreak3Box.Location = new System.Drawing.Point(178, 73);
this.BestTieBreak3Box.Name = "BestTieBreak3Box";
this.BestTieBreak3Box.ReadOnly = true;
this.BestTieBreak3Box.Size = new System.Drawing.Size(58, 20);
this.BestTieBreak3Box.TabIndex = 20;
this.BestTieBreak3Box.TabStop = false;
//
// BestTieBreak2Box
//
this.BestTieBreak2Box.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.BestTieBreak2Box.Location = new System.Drawing.Point(178, 53);
this.BestTieBreak2Box.Name = "BestTieBreak2Box";
this.BestTieBreak2Box.ReadOnly = true;
this.BestTieBreak2Box.Size = new System.Drawing.Size(58, 20);
this.BestTieBreak2Box.TabIndex = 19;
this.BestTieBreak2Box.TabStop = false;
//
// BestTieBreak1Box
//
this.BestTieBreak1Box.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.BestTieBreak1Box.Location = new System.Drawing.Point(178, 33);
this.BestTieBreak1Box.Name = "BestTieBreak1Box";
this.BestTieBreak1Box.ReadOnly = true;
this.BestTieBreak1Box.Size = new System.Drawing.Size(58, 20);
this.BestTieBreak1Box.TabIndex = 18;
this.BestTieBreak1Box.TabStop = false;
//
// BestMaximizeBox
//
this.BestMaximizeBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.BestMaximizeBox.Location = new System.Drawing.Point(178, 13);
this.BestMaximizeBox.Name = "BestMaximizeBox";
this.BestMaximizeBox.ReadOnly = true;
this.BestMaximizeBox.Size = new System.Drawing.Size(58, 20);
this.BestMaximizeBox.TabIndex = 17;
this.BestMaximizeBox.TabStop = false;
//
// label16
//
this.label16.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(111, 76);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(61, 13);
this.label16.TabIndex = 16;
this.label16.Text = "Tiebreak 3:";
//
// label15
//
this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(111, 56);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(61, 13);
this.label15.TabIndex = 15;
this.label15.Text = "Tiebreak 2:";
//
// label14
//
this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(111, 36);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(61, 13);
this.label14.TabIndex = 6;
this.label14.Text = "Tiebreak 1:";
//
// label13
//
this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(119, 16);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(53, 13);
this.label13.TabIndex = 0;
this.label13.Text = "Maximize:";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(3, 2);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(51, 13);
this.label1.TabIndex = 5;
this.label1.Text = "Attempts:";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(10, 17);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(44, 13);
this.label2.TabIndex = 6;
this.label2.Text = "Frames:";
//
// AttemptsLabel
//
this.AttemptsLabel.AutoSize = true;
this.AttemptsLabel.Location = new System.Drawing.Point(61, 2);
this.AttemptsLabel.Name = "AttemptsLabel";
this.AttemptsLabel.Size = new System.Drawing.Size(13, 13);
this.AttemptsLabel.TabIndex = 7;
this.AttemptsLabel.Text = "0";
//
// FramesLabel
//
this.FramesLabel.AutoSize = true;
this.FramesLabel.Location = new System.Drawing.Point(61, 17);
this.FramesLabel.Name = "FramesLabel";
this.FramesLabel.Size = new System.Drawing.Size(13, 13);
this.FramesLabel.TabIndex = 8;
this.FramesLabel.Text = "0";
//
// GoalGroupBox
//
this.GoalGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.GoalGroupBox.Controls.Add(this.label12);
this.GoalGroupBox.Controls.Add(this.label11);
this.GoalGroupBox.Controls.Add(this.label10);
this.GoalGroupBox.Controls.Add(this.label9);
this.GoalGroupBox.Controls.Add(this.label7);
this.GoalGroupBox.Controls.Add(this.label6);
this.GoalGroupBox.Controls.Add(this.TieBreaker1Box);
this.GoalGroupBox.Controls.Add(this.TieBreaker2Box);
this.GoalGroupBox.Controls.Add(this.TieBreaker3Box);
this.GoalGroupBox.Controls.Add(this.label5);
this.GoalGroupBox.Controls.Add(this.MaximizeAddressBox);
this.GoalGroupBox.Controls.Add(this.maximizeLabeltext);
this.GoalGroupBox.Controls.Add(this.label4);
this.GoalGroupBox.Controls.Add(this.FrameLengthNumeric);
this.GoalGroupBox.Controls.Add(this.label3);
this.GoalGroupBox.Location = new System.Drawing.Point(12, 27);
this.GoalGroupBox.Name = "GoalGroupBox";
this.GoalGroupBox.Size = new System.Drawing.Size(312, 150);
this.GoalGroupBox.TabIndex = 9;
this.GoalGroupBox.TabStop = false;
this.GoalGroupBox.Text = "Goal";
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(108, 124);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(59, 13);
this.label12.TabIndex = 14;
this.label12.Text = "Address 0x";
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(108, 102);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(59, 13);
this.label11.TabIndex = 13;
this.label11.Text = "Address 0x";
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(108, 79);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(59, 13);
this.label10.TabIndex = 12;
this.label10.Text = "Address 0x";
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(108, 56);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(59, 13);
this.label9.TabIndex = 11;
this.label9.Text = "Address 0x";
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(42, 124);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(61, 13);
this.label7.TabIndex = 10;
this.label7.Text = "Tiebreak 3:";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(42, 102);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(61, 13);
this.label6.TabIndex = 9;
this.label6.Text = "Tiebreak 2:";
//
// TieBreaker1Box
//
this.TieBreaker1Box.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TieBreaker1Box.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.TieBreaker1Box.Location = new System.Drawing.Point(167, 75);
this.TieBreaker1Box.Name = "TieBreaker1Box";
this.TieBreaker1Box.Nullable = true;
this.TieBreaker1Box.Size = new System.Drawing.Size(95, 20);
this.TieBreaker1Box.TabIndex = 1002;
//
// TieBreaker2Box
//
this.TieBreaker2Box.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TieBreaker2Box.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.TieBreaker2Box.Location = new System.Drawing.Point(167, 98);
this.TieBreaker2Box.Name = "TieBreaker2Box";
this.TieBreaker2Box.Nullable = true;
this.TieBreaker2Box.Size = new System.Drawing.Size(95, 20);
this.TieBreaker2Box.TabIndex = 1003;
//
// TieBreaker3Box
//
this.TieBreaker3Box.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TieBreaker3Box.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.TieBreaker3Box.Location = new System.Drawing.Point(167, 120);
this.TieBreaker3Box.Name = "TieBreaker3Box";
this.TieBreaker3Box.Nullable = true;
this.TieBreaker3Box.Size = new System.Drawing.Size(95, 20);
this.TieBreaker3Box.TabIndex = 1004;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(42, 79);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(61, 13);
this.label5.TabIndex = 5;
this.label5.Text = "Tiebreak 1:";
//
// MaximizeAddressBox
//
this.MaximizeAddressBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.MaximizeAddressBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.MaximizeAddressBox.Location = new System.Drawing.Point(167, 52);
this.MaximizeAddressBox.Name = "MaximizeAddressBox";
this.MaximizeAddressBox.Nullable = true;
this.MaximizeAddressBox.Size = new System.Drawing.Size(95, 20);
this.MaximizeAddressBox.TabIndex = 1001;
this.MaximizeAddressBox.TextChanged += new System.EventHandler(this.FrameLengthNumeric_ValueChanged);
//
// maximizeLabeltext
//
this.maximizeLabeltext.AutoSize = true;
this.maximizeLabeltext.Location = new System.Drawing.Point(50, 56);
this.maximizeLabeltext.Name = "maximizeLabeltext";
this.maximizeLabeltext.Size = new System.Drawing.Size(53, 13);
this.maximizeLabeltext.TabIndex = 3;
this.maximizeLabeltext.Text = "Maximize:";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(113, 29);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(38, 13);
this.label4.TabIndex = 2;
this.label4.Text = "frames";
//
// FrameLengthNumeric
//
this.FrameLengthNumeric.Location = new System.Drawing.Point(60, 25);
this.FrameLengthNumeric.Maximum = new decimal(new int[] {
999,
0,
0,
0});
this.FrameLengthNumeric.Name = "FrameLengthNumeric";
this.FrameLengthNumeric.Size = new System.Drawing.Size(46, 20);
this.FrameLengthNumeric.TabIndex = 1000;
this.FrameLengthNumeric.Value = new decimal(new int[] {
100,
0,
0,
0});
this.FrameLengthNumeric.ValueChanged += new System.EventHandler(this.FrameLengthNumeric_ValueChanged);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(7, 29);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(50, 13);
this.label3.TabIndex = 0;
this.label3.Text = "End after";
//
// StopBtn
//
this.StopBtn.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
this.StopBtn.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.StopBtn.Location = new System.Drawing.Point(6, 56);
this.StopBtn.Name = "StopBtn";
this.StopBtn.Size = new System.Drawing.Size(75, 23);
this.StopBtn.TabIndex = 2002;
this.StopBtn.Text = "&Stop";
this.StopBtn.UseVisualStyleBackColor = true;
this.StopBtn.Visible = false;
this.StopBtn.Click += new System.EventHandler(this.StopBtn_Click);
//
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(7, 29);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(58, 13);
this.label8.TabIndex = 11;
this.label8.Text = "Start From:";
//
// StartFromSlotBox
//
this.StartFromSlotBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.StartFromSlotBox.FormattingEnabled = true;
this.StartFromSlotBox.Items.AddRange(new object[] {
"Slot 0",
"Slot 1",
"Slot 2",
"Slot 3",
"Slot 4",
"Slot 5",
"Slot 6",
"Slot 7",
"Slot 8",
"Slot 9"});
this.StartFromSlotBox.Location = new System.Drawing.Point(71, 25);
this.StartFromSlotBox.Name = "StartFromSlotBox";
this.StartFromSlotBox.Size = new System.Drawing.Size(75, 21);
this.StartFromSlotBox.TabIndex = 2000;
//
// ControlGroupBox
//
this.ControlGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.ControlGroupBox.Controls.Add(this.panel2);
this.ControlGroupBox.Controls.Add(this.StopBtn);
this.ControlGroupBox.Controls.Add(this.RunBtn);
this.ControlGroupBox.Controls.Add(this.StartFromSlotBox);
this.ControlGroupBox.Controls.Add(this.label8);
this.ControlGroupBox.Location = new System.Drawing.Point(329, 27);
this.ControlGroupBox.Name = "ControlGroupBox";
this.ControlGroupBox.Size = new System.Drawing.Size(245, 150);
this.ControlGroupBox.TabIndex = 2004;
this.ControlGroupBox.TabStop = false;
this.ControlGroupBox.Text = "Control";
//
// panel2
//
this.panel2.ContextMenuStrip = this.StatsContextMenu;
this.panel2.Controls.Add(this.label1);
this.panel2.Controls.Add(this.label2);
this.panel2.Controls.Add(this.FramesLabel);
this.panel2.Controls.Add(this.AttemptsLabel);
this.panel2.Location = new System.Drawing.Point(6, 85);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(140, 33);
this.panel2.TabIndex = 2003;
//
// StatsContextMenu
//
this.StatsContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ClearStatsContextMenuItem});
this.StatsContextMenu.Name = "StatsContextMenu";
this.StatsContextMenu.Size = new System.Drawing.Size(102, 26);
//
// ClearStatsContextMenuItem
//
this.ClearStatsContextMenuItem.Name = "ClearStatsContextMenuItem";
this.ClearStatsContextMenuItem.Size = new System.Drawing.Size(101, 22);
this.ClearStatsContextMenuItem.Text = "&Clear";
this.ClearStatsContextMenuItem.Click += new System.EventHandler(this.ClearStatsContextMenuItem_Click);
//
// BasicBot
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(587, 587);
this.Controls.Add(this.ControlGroupBox);
this.Controls.Add(this.GoalGroupBox);
this.Controls.Add(this.BestGroupBox);
this.Controls.Add(this.ControlsBox);
this.Controls.Add(this.BotStatusStrip);
this.Controls.Add(this.BotMenu);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.BotMenu;
this.Name = "BasicBot";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Basic Bot";
this.Load += new System.EventHandler(this.BasicBot_Load);
this.BotMenu.ResumeLayout(false);
this.BotMenu.PerformLayout();
this.BotStatusStrip.ResumeLayout(false);
this.BotStatusStrip.PerformLayout();
this.ControlsBox.ResumeLayout(false);
this.BestGroupBox.ResumeLayout(false);
this.BestGroupBox.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.GoalGroupBox.ResumeLayout(false);
this.GoalGroupBox.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.FrameLengthNumeric)).EndInit();
this.ControlGroupBox.ResumeLayout(false);
this.ControlGroupBox.PerformLayout();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.StatsContextMenu.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private MenuStripEx BotMenu;
private System.Windows.Forms.ToolStripMenuItem FileSubMenu;
private System.Windows.Forms.ToolStripMenuItem ExitMenuItem;
private System.Windows.Forms.Button RunBtn;
private System.Windows.Forms.ToolStripMenuItem OpenMenuItem;
private System.Windows.Forms.ToolStripMenuItem SaveMenuItem;
private System.Windows.Forms.ToolStripMenuItem RecentSubMenu;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.StatusStrip BotStatusStrip;
private System.Windows.Forms.GroupBox ControlsBox;
private System.Windows.Forms.Panel ControlProbabilityPanel;
private System.Windows.Forms.GroupBox BestGroupBox;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label AttemptsLabel;
private System.Windows.Forms.Label FramesLabel;
private System.Windows.Forms.ToolStripMenuItem OptionsSubMenu;
private System.Windows.Forms.GroupBox GoalGroupBox;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label6;
private HexTextBox TieBreaker1Box;
private HexTextBox TieBreaker2Box;
private HexTextBox TieBreaker3Box;
private System.Windows.Forms.Label label5;
private HexTextBox MaximizeAddressBox;
private System.Windows.Forms.Label maximizeLabeltext;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.NumericUpDown FrameLengthNumeric;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button StopBtn;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.ComboBox StartFromSlotBox;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.TextBox BestTieBreak3Box;
private System.Windows.Forms.TextBox BestTieBreak2Box;
private System.Windows.Forms.TextBox BestTieBreak1Box;
private System.Windows.Forms.TextBox BestMaximizeBox;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label BestAttemptNumberLabel;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label BestAttemptLogLabel;
private System.Windows.Forms.Button ClearBestButton;
private System.Windows.Forms.ToolStripMenuItem SaveAsMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripMenuItem NewMenuItem;
private System.Windows.Forms.Button PlayBestButton;
private System.Windows.Forms.ToolStripStatusLabel MessageLabel;
private System.Windows.Forms.GroupBox ControlGroupBox;
private System.Windows.Forms.ToolStripMenuItem TurboWhileBottingMenuItem;
private System.Windows.Forms.ToolStripMenuItem MemoryDomainsMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.ContextMenuStrip StatsContextMenu;
private System.Windows.Forms.ToolStripMenuItem ClearStatsContextMenuItem;
private System.Windows.Forms.ToolStripStatusLabel BotStatusButton;
private System.Windows.Forms.ToolStripMenuItem BigEndianMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.ToolStripMenuItem DataSizeMenuItem;
private System.Windows.Forms.ToolStripMenuItem _1ByteMenuItem;
private System.Windows.Forms.ToolStripMenuItem _2ByteMenuItem;
private System.Windows.Forms.ToolStripMenuItem _4ByteMenuItem;
}
}

1004
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs Normal file
View File

File diff suppressed because it is too large Load Diff

272
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.resx Normal file
View File

@ -0,0 +1,272 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="BotMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="BotStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>119, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="BotStatusButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="StatsContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>248, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAMDAAAAEAGACoHAAAFgAAACgAAAAwAAAAYAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXD70AAAAA
AAAkHO0AAAAXD70XD70kHO0kHO0kHO0kHO0kHO0kHO0kHO0XD70XD70kHO0kHO0kHO0kHO0kHO0kHO0k
HO0XD70XD70AAAAkHO0AAAAAAAAXD70AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3t8oAAAAAAAB3t8oAAABfqsBf
qsB3t8p3t8p3t8p3t8p3t8pfqsBfqsAAAAAAAABfqsBfqsB3t8p3t8p3t8p3t8p3t8pfqsBfqsAAAAB3
t8oAAAAAAAB3t8oAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAABfqsB3t8p3t8pfqsAAAABfqsB3t8p3t8p3t8p3t8p3t8p3t8p3t8pfqsAAAAAAAABfqsB3t8p3
t8p3t8p3t8p3t8p3t8p3t8pfqsAAAABfqsB3t8p3t8pfqsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAABfqsB3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3
t8pfqsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAABfqsB3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8pfqsAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AABfqsB3t8p3t8pfqsBfqsB3t8p3t8pfqsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3t8p3t8pfqsAAAAAAAABfqsB3t8p3t8oAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfqsB3t8pfqsAA
AAAAAABfqsB3t8pfqsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfqsBfqsBfqsBfqsAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAABfqsB3t8p3t8pfqsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3t8p3t8p3t8p3t8oAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXD70X
D70kHO0kHO0XD70AAAAsLCx/f38sLCwsLCwsLCwsLCwsLCwsLCwAAAAXD70kHO0kHO0XD70XD70AAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAXD70kHO0kHO0kHO0kHO0AAAB/f39/f39/f38sLCwkHO0sLCwkHO0s
LCwAAAAkHO0kHO0kHO0kHO0XD70AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYIScYIScYIScYIScYIScYIScYIScAAAAXD70kHO0kHO0kHO0A
AAAsLCx/f38sLCwsLCwsLCwsLCwsLCwsLCwAAAAkHO0kHO0kHO0XD70AAAAYIScYIScYIScYIScYIScY
IScYIScAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYIScYIScYIScYIScY
IScYIScAAAAAAAAAAAAXD70kHO0XD70AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXD70kHO0X
D70AAAAAAAAAAAAYIScYIScYIScYIScYIScYIScAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3t8p3
t8p3t8p3t8oAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXD70AAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAABfqsB3t8p3t8pfqsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAkHO0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXD70XD70AAAAAAAAAAABfqsB3t8p3t8p3t8p3t8p3t8p3
t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8pfqsAAAAAAAAAAAAAXD70X
D70AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkHO0kHO0AAAAA
AABfqsB3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3
t8p3t8p3t8p3t8pfqsAAAAAAAAAXD70kHO0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAXD70kHO0XD70AAAAAAABfqsBfqsB3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3
t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8pfqsBfqsAAAAAAAAAXD70kHO0XD70AAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkHO0kHO0AAAB3t8oAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAB3t8oAAAAkHO0kHO0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXD70k
HO0kHO0AAABfqsAAAABfqsBfqsB3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8p3
t8p3t8p3t8p3t8p3t8p3t8p3t8pfqsBfqsAAAABfqsAAAAAkHO0kHO0XD70AAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAkHO0kHO0XD70AAAAAAAAAAABfqsB3t8p3t8p3t8p3t8p3t8p3t8p3
t8p3t8pfqsBfqsBfqsBfqsBfqsBfqsB3t8p3t8p3t8p3t8p3t8p3t8p3t8p3t8pfqsAAAAAAAAAAAAAX
D70kHO0kHO0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXD70kHO0AAABfqsB3t8pf
qsAAAAAAAAB3t8p3t8p3t8p3t8p3t8p3t8pfqsAAAAAAAAAAAAAAAAAAAAAAAABfqsB3t8p3t8p3t8p3
t8p3t8p3t8oAAAAAAABfqsB3t8pfqsAAAAAkHO0XD70AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAABfqsB3t8p3t8p3t8pfqsAAAABfqsB3t8p3t8p3t8p3t8pfqsBfqsAAAABfqsB3
t8p3t8pfqsAAAABfqsBfqsB3t8p3t8p3t8p3t8pfqsAAAABfqsB3t8p3t8p3t8pfqsAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfqsB3t8p3t8pfqsAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfqsB3t8p3t8p3t8p3t8pfqsAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAYIScYIScYIScYIScYIScYIScYIScYIScYIScYIScYIScYIScYIScYIScAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYIScQGzAVAIgVAIgQGzAYIScYIScYIScYIScQGzAV
AIgVAIgQGzAYIScAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYIScVAIgk
HO0kHO0VAIgYIScYIScYIScYIScVAIgkHO0kHO0VAIgYIScAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAYIScVAIgkHO1EOu8VAIgYIScYIScYIScYIScVAIgkHO1EOu8VAIgYIScA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYIScQGzAVAIgVAIgQGzAYIScY
IScYIScYIScQGzAVAIgVAIgQGzAYIScAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAYIScYIScYIScYIScYIScYIScYIScYIScYIScYIScYIScYIScYIScYIScAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAkHO0kHO0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABEOu9EOu8AAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAD/AAAAAP8AAP8AAAAA/wAA/wAAAAD/AAD/AAAAAP8AAP8AAAAA/wAA/4AAAAH/
AAD//AAAP/8AAP/+AAB//wAA//8AAP//AAD//4AB//8AAP//4Af//wAA///gB///AAD//+AH//8AAP//
8A///wAA///4H///AAD///gf//8AAP//+B///wAA//gAAB//AAD/+AAAH/8AAP4AAAAAfwAA/AAAAAA/
AAD8AAAAAD8AAP4HCBDgfwAA/x/4H/j/AAD/GAAAGP8AAP4QAAAIfwAA/gAAAAB/AAD8AAAAAD8AAPwA
AAAAPwAA+AAAAAAfAAD4AAAAAB8AAPgAAAAAHwAA/AAAAAA/AAD/AAAAAP8AAP//+B///wAA///4H///
AAD///AP//8AAP//gAH//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//
AAD//wAA//+AAf//AAD///w///8AAP///D///wAA///+f///AAA=
</value>
</data>
</root>

96
BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs generated Normal file
View File

@ -0,0 +1,96 @@
namespace BizHawk.Client.EmuHawk
{
partial class BotControlsRow
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.ButtonNameLabel = new System.Windows.Forms.Label();
this.ProbabilityUpDown = new System.Windows.Forms.NumericUpDown();
this.ProbabilitySlider = new System.Windows.Forms.TrackBar();
((System.ComponentModel.ISupportInitialize)(this.ProbabilityUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ProbabilitySlider)).BeginInit();
this.SuspendLayout();
//
// ButtonNameLabel
//
this.ButtonNameLabel.AutoSize = true;
this.ButtonNameLabel.Location = new System.Drawing.Point(3, 0);
this.ButtonNameLabel.Name = "ButtonNameLabel";
this.ButtonNameLabel.Size = new System.Drawing.Size(35, 13);
this.ButtonNameLabel.TabIndex = 0;
this.ButtonNameLabel.Text = "label1";
//
// ProbabilityUpDown
//
this.ProbabilityUpDown.DecimalPlaces = 1;
this.ProbabilityUpDown.Increment = new decimal(new int[] {
1,
0,
0,
65536});
this.ProbabilityUpDown.Location = new System.Drawing.Point(92, 0);
this.ProbabilityUpDown.Name = "ProbabilityUpDown";
this.ProbabilityUpDown.Size = new System.Drawing.Size(49, 20);
this.ProbabilityUpDown.TabIndex = 1;
this.ProbabilityUpDown.ValueChanged += new System.EventHandler(this.ProbabilityUpDown_ValueChanged);
//
// ProbabilitySlider
//
this.ProbabilitySlider.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.ProbabilitySlider.Location = new System.Drawing.Point(147, -2);
this.ProbabilitySlider.Maximum = 100;
this.ProbabilitySlider.Name = "ProbabilitySlider";
this.ProbabilitySlider.Size = new System.Drawing.Size(111, 45);
this.ProbabilitySlider.TabIndex = 2;
this.ProbabilitySlider.TickFrequency = 25;
this.ProbabilitySlider.ValueChanged += new System.EventHandler(this.ProbabilitySlider_ValueChanged);
//
// BotControlsRow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.ProbabilitySlider);
this.Controls.Add(this.ProbabilityUpDown);
this.Controls.Add(this.ButtonNameLabel);
this.Name = "BotControlsRow";
this.Size = new System.Drawing.Size(258, 29);
this.Load += new System.EventHandler(this.BotControlsRow_Load);
((System.ComponentModel.ISupportInitialize)(this.ProbabilityUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ProbabilitySlider)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label ButtonNameLabel;
private System.Windows.Forms.NumericUpDown ProbabilityUpDown;
private System.Windows.Forms.TrackBar ProbabilitySlider;
}
}

58
BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.cs Normal file
View File

@ -0,0 +1,58 @@
using System;
using System.Windows.Forms;
namespace BizHawk.Client.EmuHawk
{
public partial class BotControlsRow : UserControl
{
private bool _programmaticallyChangingValues;
public BotControlsRow()
{
InitializeComponent();
}
public Action ProbabilityChangedCallback { get; set; }
public string ButtonName
{
get { return ButtonNameLabel.Text; }
set { ButtonNameLabel.Text = value; }
}
public double Probability
{
get { return (double)ProbabilityUpDown.Value; }
set { ProbabilityUpDown.Value = (decimal)value; }
}
private void BotControlsRow_Load(object sender, EventArgs e)
{
}
private void ProbabilityUpDown_ValueChanged(object sender, EventArgs e)
{
_programmaticallyChangingValues = true;
ProbabilitySlider.Value = (int)ProbabilityUpDown.Value;
ChangedCallback();
_programmaticallyChangingValues = false;
}
private void ProbabilitySlider_ValueChanged(object sender, EventArgs e)
{
_programmaticallyChangingValues = true;
ProbabilityUpDown.Value = ProbabilitySlider.Value;
ChangedCallback();
_programmaticallyChangingValues = false;
}
private void ChangedCallback()
{
if (ProbabilityChangedCallback != null)
{
ProbabilityChangedCallback();
}
}
}
}

Some files were not shown because too many files have changed in this diff Show More