back ported non-thread fakemainloop from v2

Author: tig

Terminal.Gui/ConsoleDrivers/FakeDriver/FakeMainLoop.cs

@@ -1,97 +1,34 @@
 using System;
-using System.Threading;
 
 namespace Terminal.Gui {
-	/// <summary>
-	/// Mainloop intended to be used with the .NET System.Console API, and can
-	/// be used on Windows and Unix, it is cross platform but lacks things like
-	/// file descriptor monitoring.
-	/// </summary>
-	/// <remarks>
-	/// This implementation is used for FakeDriver.
-	/// </remarks>
-	public class FakeMainLoop : IMainLoopDriver {
-		AutoResetEvent keyReady = new AutoResetEvent (false);
-		AutoResetEvent waitForProbe = new AutoResetEvent (false);
-		ConsoleKeyInfo? keyResult = null;
-		MainLoop mainLoop;
-		Func<ConsoleKeyInfo> consoleKeyReaderFn = () => FakeConsole.ReadKey (true);
+	internal class FakeMainLoop : IMainLoopDriver {
 
-		/// <summary>
-		/// Invoked when a Key is pressed.
-		/// </summary>
 		public Action<ConsoleKeyInfo> KeyPressed;
 
-		/// <summary>
-		/// Creates an instance of the FakeMainLoop. <paramref name="consoleDriver"/> is not used.
-		/// </summary>
-		/// <param name="consoleDriver"></param>
 		public FakeMainLoop (ConsoleDriver consoleDriver = null)
 		{
 			// consoleDriver is not needed/used in FakeConsole
 		}
 
-		void WindowsKeyReader ()
+		public void Setup (MainLoop mainLoop)
 		{
-			while (true) {
-				waitForProbe.WaitOne ();
-				keyResult = consoleKeyReaderFn ();
-				keyReady.Set ();
-			}
-		}
-
-		void IMainLoopDriver.Setup (MainLoop mainLoop)
-		{
-			this.mainLoop = mainLoop;
-			Thread readThread = new Thread (WindowsKeyReader);
-			readThread.Start ();
 		}
 
-		void IMainLoopDriver.Wakeup ()
+		public void Wakeup ()
 		{
+			// No implementation needed for FakeMainLoop
 		}
 
-		bool IMainLoopDriver.EventsPending (bool wait)
-		{
-			keyResult = null;
-			waitForProbe.Set ();
-
-			if (CheckTimers (wait, out var waitTimeout)) {
-				return true;
-			}
-
-			keyReady.WaitOne (waitTimeout);
-			return keyResult.HasValue;
-		}
-
-		bool CheckTimers (bool wait, out int waitTimeout)
+		public bool EventsPending (bool wait)
 		{
-			long now = DateTime.UtcNow.Ticks;
-
-			if (mainLoop.timeouts.Count > 0) {
-				waitTimeout = (int)((mainLoop.timeouts.Keys [0] - now) / TimeSpan.TicksPerMillisecond);
-				if (waitTimeout < 0)
-					return true;
-			} else {
-				waitTimeout = -1;
-			}
-
-			if (!wait)
-				waitTimeout = 0;
-
-			int ic;
-			lock (mainLoop.idleHandlers) {
-				ic = mainLoop.idleHandlers.Count;
-			}
-
-			return ic > 0;
+			// Always return true for FakeMainLoop
+			return true;
 		}
 
-		void IMainLoopDriver.MainIteration ()
+		public void MainIteration ()
 		{
-			if (keyResult.HasValue) {
-				KeyPressed?.Invoke (keyResult.Value);
-				keyResult = null;
+			if (FakeConsole.MockKeyPresses.Count > 0) {
+				KeyPressed?.Invoke (FakeConsole.MockKeyPresses.Pop ());
 			}
 		}
 	}