Refactor MainForm interfaces for LuaConsole

Author: YoshiRulz

src/BizHawk.Client.Common/IMainFormForApi.cs

@@ -22,7 +22,7 @@ public interface IMainFormForApi
 		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
 		bool IsSeeking { get; }
 
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
+		/// <remarks>referenced from <see cref="EmuClientApi"/> and <c>LuaConsole</c></remarks>
 		bool IsTurboing { get; }
 
 		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
@@ -59,7 +59,7 @@ public interface IMainFormForApi
 		void FrameAdvance(bool discardApiHawkSurfaces = true);
 
 		/// <param name="forceWindowResize">Override <see cref="Common.Config.ResizeWithFramebuffer"/></param>
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
+		/// <remarks>referenced from <see cref="EmuClientApi"/> and <c>LuaConsole</c></remarks>
 		void FrameBufferResized(bool forceWindowResize = false);
 
 		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>

src/BizHawk.Client.EmuHawk/Api/ApiManager.cs

@@ -34,7 +34,7 @@ static ApiManager()
 		private static ApiContainer Register(
 			IEmulatorServiceProvider serviceProvider,
 			Action<string> logCallback,
-			IMainFormForApi mainForm,
+			IMainFormForApiInit mainForm,
 			DisplayManagerBase displayManager,
 			InputManager inputManager,
 			IMovieSession movieSession,
@@ -47,7 +47,7 @@ private static ApiContainer Register(
 			{
 				[typeof(Action<string>)] = logCallback,
 				[typeof(IMainFormForApi)] = mainForm,
-				[typeof(IDialogController)] = ((MainForm) mainForm).DialogController,
+				[typeof(IDialogController)] = mainForm.DialogController,
 				[typeof(DisplayManagerBase)] = displayManager,
 				[typeof(InputManager)] = inputManager,
 				[typeof(IMovieSession)] = movieSession,
@@ -69,7 +69,7 @@ private static ApiContainer Register(
 
 		public static IExternalApiProvider Restart(
 			IEmulatorServiceProvider serviceProvider,
-			IMainFormForApi mainForm,
+			IMainFormForApiInit mainForm,
 			DisplayManagerBase displayManager,
 			InputManager inputManager,
 			IMovieSession movieSession,
@@ -86,7 +86,7 @@ public static IExternalApiProvider Restart(
 		public static ApiContainer RestartLua(
 			IEmulatorServiceProvider serviceProvider,
 			Action<string> logCallback,
-			IMainFormForApi mainForm,
+			IMainFormForApiInit mainForm,
 			DisplayManagerBase displayManager,
 			InputManager inputManager,
 			IMovieSession movieSession,

src/BizHawk.Client.EmuHawk/Api/IMainFormForApiInit.cs

@@ -0,0 +1,11 @@
+using BizHawk.Client.Common;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public interface IMainFormForApiInit : IMainFormForApi, IDialogParent
+	{
+		IMovieSession MovieSession { get; }
+
+		ToolManager Tools { get; }
+	}
+}

src/BizHawk.Client.EmuHawk/IMainFormForTools.cs

@@ -27,9 +27,6 @@ public interface IMainFormForTools : IDialogController
 		/// <remarks>only referenced from <see cref="BasicBot"/></remarks>
 		bool InvisibleEmulation { get; set; }
 
-		/// <remarks>only referenced from <see cref="LuaConsole"/></remarks>
-		bool IsTurboing { get; }
-
 		/// <remarks>only referenced from <see cref="TAStudio"/></remarks>
 		bool IsFastForwarding { get; }
 
@@ -54,10 +51,6 @@ public interface IMainFormForTools : IDialogController
 		/// <remarks>only referenced from <see cref="TAStudio"/></remarks>
 		void FrameAdvance(bool discardApiHawkSurfaces = true);
 
-		/// <remarks>only referenced from <see cref="LuaConsole"/></remarks>
-		/// <param name="forceWindowResize">Override <see cref="Common.Config.ResizeWithFramebuffer"/></param>
-		void FrameBufferResized(bool forceWindowResize = false);
-
 		/// <remarks>only referenced from <see cref="BasicBot"/></remarks>
 		bool LoadQuickSave(int slot, bool suppressOSD = false);
 

src/BizHawk.Client.EmuHawk/MainForm.cs

@@ -44,7 +44,8 @@
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class MainForm : FormBase, IDialogParent, IMainFormForApi, IMainFormForTools, IMainFormForRetroAchievements
+	public partial class MainForm : FormBase, IDialogParent,
+		IMainFormForApiInit, IMainFormForRetroAchievements, IMainFormForTools
 	{
 		private const string FMT_STR_DUMP_STATUS_MENUITEM_LABEL = "Dump Status Report{0}...";
 
@@ -1226,7 +1227,7 @@ private set
 
 		internal readonly ExternalToolManager ExtToolManager;
 
-		public readonly ToolManager Tools;
+		public ToolManager Tools { get; }
 
 		private IControlMainform ToolControllingSavestates => Tools.FirstOrNull<IControlMainform>(tool => tool.WantsToControlSavestates);
 		private IControlMainform ToolControllingRewind => Tools.FirstOrNull<IControlMainform>(tool => tool.WantsToControlRewind);

src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/FormsLuaLibrary.cs

@@ -27,7 +27,7 @@ public sealed class FormsLuaLibrary : LuaLibraryBase
 		public FormsLuaLibrary(ILuaLibraries luaLibsImpl, ApiContainer apiContainer, Action<string> logOutputCallback)
 			: base(luaLibsImpl, apiContainer, logOutputCallback) {}
 
-		public Form MainForm { get; set; }
+		public IDialogParent MainForm { get; set; }
 
 		public override string Name => "forms";
 
@@ -295,7 +295,7 @@ public long NewForm(
 			form.MaximizeBox = false;
 			form.FormBorderStyle = FormBorderStyle.FixedDialog;
 			form.Icon = SystemIcons.Application;
-			form.Owner = MainForm;
+			form.Owner = (Form) MainForm;
 			form.Show();
 
 			form.FormClosed += (o, e) =>
@@ -325,7 +325,7 @@ public string OpenFile(
 			string filter = null)
 		{
 			if (initialDirectory is null && fileName is not null) initialDirectory = Path.GetDirectoryName(fileName);
-			var result = ((IDialogParent) MainForm).ShowFileOpenDialog(
+			var result = MainForm.ShowFileOpenDialog(
 				filterStr: filter ?? FilesystemFilter.AllFilesEntry,
 				initDir: initialDirectory ?? PathEntries.LuaAbsolutePath(),
 				initFileName: fileName);

src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs

@@ -50,6 +50,9 @@ public static Icon ToolIcon
 
 		public ToolDialogSettings.ColumnList Columns { get; set; }
 
+		[RequiredService]
+		private new IMainFormForApiInit MainForm { get; set; }
+
 		public class LuaConsoleSettings
 		{
 			public LuaConsoleSettings()
@@ -214,7 +217,7 @@ public override void Restart()
 				newScripts,
 				registeredFuncList,
 				Emulator.ServiceProvider,
-				(MainForm) MainForm, //HACK
+				MainForm,
 				DisplayManager,
 				InputManager,
 				Config,

src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs

@@ -23,7 +23,7 @@ public LuaLibraries(
 			LuaFileList scriptList,
 			LuaFunctionList registeredFuncList,
 			IEmulatorServiceProvider serviceProvider,
-			MainForm mainForm,
+			IMainFormForApiInit mainForm,
 			DisplayManagerBase displayManager,
 			InputManager inputManager,
 			Config config,
@@ -165,7 +165,7 @@ void EnumerateLuaFunctions(string name, Type type, LuaLibraryBase instance)
 
 		private readonly InputManager _inputManager;
 
-		private readonly MainForm _mainForm;
+		private readonly IMainFormForApiInit _mainForm;
 
 		private Lua _lua = new();
 		private LuaThread _currThread;