port some lua libraries to client.common

BizHawk.Client.Common/BizHawk.Client.Common.csproj

@@ -102,6 +102,10 @@
     <Compile Include="helpers\InputValidate.cs" />
     <Compile Include="KeyTurbo.cs" />
     <Compile Include="lua\EmuLuaLibrary.Bit.cs" />
+    <Compile Include="lua\EmuLuaLibrary.Emu.cs" />
+    <Compile Include="lua\EmuLuaLibrary.Events.cs" />
+    <Compile Include="lua\EmuLuaLibrary.MainMemory.cs" />
+    <Compile Include="lua\EmuLuaLibrary.Memory.cs" />
     <Compile Include="lua\LuaDocumentation.cs" />
     <Compile Include="lua\LuaFile.cs" />
     <Compile Include="lua\LuaFunctionList.cs" />

BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs

@@ -1,9 +1,9 @@
 using System;
+
 using LuaInterface;
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.Nintendo;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public partial class EmulatorLuaLibrary : LuaLibraryBase
 	{
@@ -75,7 +75,6 @@ namespace BizHawk.MultiClient
 				{
 					Global.Config.VSyncThrottle = true;
 				}
-				GlobalWinF.MainForm.VsyncMessage();
 			}
 		}
 
@@ -117,7 +116,6 @@ namespace BizHawk.MultiClient
 				{
 					Global.Config.ClockThrottle = true;
 				}
-				GlobalWinF.MainForm.LimitFrameRateMessage();
 			}
 		}
 
@@ -134,7 +132,6 @@ namespace BizHawk.MultiClient
 				{
 					Global.Config.AutoMinimizeSkipping = true;
 				}
-				GlobalWinF.MainForm.MinimizeFrameskipMessage();
 			}
 		}
 

BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs

@@ -2,12 +2,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using LuaInterface;
-using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public class EventLuaLibrary : LuaLibraryBase
 	{
+		public EventLuaLibrary(Action<string> logOutputCallback)
+			: base()
+		{
+			LogOutputCallback = logOutputCallback;
+		}
+
 		public override string Name { get { return "event"; } }
 		public override string[] Functions
 		{
@@ -28,6 +33,8 @@ namespace BizHawk.MultiClient
 			}
 		}
 
+		public Action<string> LogOutputCallback = null;
+
 		#region Events Library Helpers
 
 		private readonly LuaFunctionList lua_functions = new LuaFunctionList();
@@ -48,9 +55,10 @@ namespace BizHawk.MultiClient
 				}
 				catch (SystemException e)
 				{
-					GlobalWinF.MainForm.LuaConsole1.WriteToOutputWindow(
-						"error running function attached by lua function savestate.registersave" +
-						"\nError message: " + e.Message);
+					LogOutputCallback(
+						"error running function attached by lua function event.onsavestate" +
+						"\nError message: " +
+						e.Message);
 				}
 			}
 		}
@@ -69,9 +77,10 @@ namespace BizHawk.MultiClient
 				}
 				catch (SystemException e)
 				{
-					GlobalWinF.MainForm.LuaConsole1.WriteToOutputWindow(
-						"error running function attached by lua function savestate.registerload" +
-						"\nError message: " + e.Message);
+					LogOutputCallback(
+						"error running function attached by lua function event.onloadstate" +
+						"\nError message: " +
+						e.Message);
 				}
 			}
 		}
@@ -90,9 +99,10 @@ namespace BizHawk.MultiClient
 				}
 				catch (SystemException e)
 				{
-					GlobalWinF.MainForm.LuaConsole1.WriteToOutputWindow(
-						"error running function attached by lua function emu.registerbefore" +
-						"\nError message: " + e.Message);
+					LogOutputCallback(
+						"error running function attached by lua function event.onframestart" +
+						"\nError message: " +
+						e.Message);
 				}
 			}
 		}
@@ -111,9 +121,10 @@ namespace BizHawk.MultiClient
 				}
 				catch (SystemException e)
 				{
-					GlobalWinF.MainForm.LuaConsole1.WriteToOutputWindow(
-						"error running function attached by lua function emu.registerafter" +
-						"\nError message: " + e.Message);
+					LogOutputCallback(
+						"error running function attached by lua function event.onframeend" +
+						"\nError message: " +
+						e.Message);
 				}
 			}
 		}
@@ -146,9 +157,10 @@ namespace BizHawk.MultiClient
 					}
 					catch (SystemException e)
 					{
-						GlobalWinF.MainForm.LuaConsole1.WriteToOutputWindow(
-							"error running function attached by lua function emu.on_snoop" +
-							"\nError message: " + e.Message);
+						LogOutputCallback(
+							"error running function attached by lua function event.oninputpoll" +
+							"\nError message: "
+							+ e.Message);
 					}
 				};
 			}
@@ -189,12 +201,12 @@ namespace BizHawk.MultiClient
 					}
 					catch (SystemException e)
 					{
-						GlobalWinF.MainForm.LuaConsole1.WriteToOutputWindow(
+						LogOutputCallback(
 							"error running function attached by lua function event.onmemoryread" +
-							"\nError message: " + e.Message);
+							"\nError message: " +
+							e.Message);
 					}
 				});
-
 			}
 			else
 			{
@@ -226,9 +238,10 @@ namespace BizHawk.MultiClient
 					}
 					catch (SystemException e)
 					{
-						GlobalWinF.MainForm.LuaConsole1.WriteToOutputWindow(
+						LogOutputCallback(
 							"error running function attached by lua function event.onmemoryread" +
-							"\nError message: " + e.Message);
+							"\nError message: " +
+							e.Message);
 					}
 				});
 			}
@@ -247,7 +260,6 @@ namespace BizHawk.MultiClient
 
 		public bool event_unregisterbyid(object guid)
 		{
-			//Iterating every possible event type is not very scalable
 			foreach (NamedLuaFunction nlf in lua_functions)
 			{
 				if (nlf.GUID.ToString() == guid.ToString())
@@ -262,7 +274,6 @@ namespace BizHawk.MultiClient
 
 		public bool event_unregisterbyname(object name)
 		{
-			//Horribly redundant to the function above!
 			foreach (NamedLuaFunction nlf in lua_functions)
 			{
 				if (nlf.Name == name.ToString())

BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs

@@ -1,8 +1,8 @@
 using System;
-using LuaInterface;
-using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+using LuaInterface;
+
+namespace BizHawk.Client.Common
 {
 	//TODO: this needs a major refactor, as well as MemoryLuaLibrary, and this shoudl inherit memorylua library and extend it
 	public class MainMemoryLuaLibrary : LuaLibraryBase

BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Linq;
-using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public class MemoryLuaLibrary : LuaLibraryBase
 	{

BizHawk.MultiClient/BizHawk.MultiClient.csproj

@@ -446,14 +446,10 @@
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Client.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Console.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.cs" />
-    <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Emu.cs" />
-    <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Events.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Forms.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Gui.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Input.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Joypad.cs" />
-    <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.MainMemory.cs" />
-    <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Memory.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Movie.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.NES.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Savestate.cs" />

BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.cs

@@ -12,7 +12,7 @@ namespace BizHawk.MultiClient
 		private readonly LuaConsole _caller;
 		private Lua currThread;
 		private FormsLuaLibrary _formsLibrary = new FormsLuaLibrary();
-		private EventLuaLibrary _eventLibrary = new EventLuaLibrary();
+		private EventLuaLibrary _eventLibrary = new EventLuaLibrary(ConsoleLuaLibrary.console_log);
 		private GuiLuaLibrary _guiLibrary = new GuiLuaLibrary();
 
 		public LuaDocumentation Docs = new LuaDocumentation();
@@ -22,10 +22,7 @@ namespace BizHawk.MultiClient
 
 		public GuiLuaLibrary GuiLibrary
 		{
-			get
-			{
-				return _guiLibrary;
-			}
+			get { return _guiLibrary; }
 		}
 
 		public void WindowClosed(IntPtr handle)