Switch to multithreading model

src/Whim.Bar.Tests/BarPluginTests.cs

@@ -16,7 +16,7 @@ public void MonitorManager_MonitorsChanged_RemovedMonitors(IContext context, IMo
 		NativeManagerUtils.SetupTryEnqueue(context);
 
 		// When MonitorManager_MonitorsChanged is called with a removed monitor which is not in the map
-		barPlugin.PreInitialize();
+		barPlugin.Subscribe();
 		context.MonitorManager.MonitorsChanged += Raise.EventWith(
 			new MonitorsChangedEventArgs()
 			{
@@ -28,6 +28,6 @@ public void MonitorManager_MonitorsChanged_RemovedMonitors(IContext context, IMo
 
 		// Then an exception is not thrown.
 		barPlugin.Dispose();
-		context.NativeManager.Received(1).TryEnqueue(Arg.Any<DispatcherQueueHandler>());
+		context.NativeManager.Received(1).InvokeOnUIThread(Arg.Any<DispatcherQueueHandler>());
 	}
 }

src/Whim.Bar/BarPlugin.cs

@@ -33,7 +33,6 @@ public BarPlugin(IContext context, BarConfig barConfig)
 	/// <inheritdoc />
 	public void PreInitialize()
 	{
-		_context.MonitorManager.MonitorsChanged += MonitorManager_MonitorsChanged;
 		_context.FilterManager.AddTitleMatchFilter("Whim Bar");
 		_context.WorkspaceManager.AddProxyLayoutEngine(layout => new BarLayoutEngine(_barConfig, layout));
 	}
@@ -56,7 +55,7 @@ private void MonitorManager_MonitorsChanged(object? sender, MonitorsChangedEvent
 		foreach (IMonitor monitor in e.RemovedMonitors)
 		{
 			_monitorBarMap.TryGetValue(monitor, out BarWindow? value);
-			_context.NativeManager.TryEnqueue(() => value?.Close());
+			_context.NativeManager.InvokeOnUIThread(() => value?.Close());
 			_monitorBarMap.Remove(monitor);
 		}
 
@@ -87,6 +86,12 @@ private void ShowAll()
 		}
 	}
 
+	/// <inheritdoc />
+	public void Subscribe()
+	{
+		_context.MonitorManager.MonitorsChanged += MonitorManager_MonitorsChanged;
+	}
+
 	/// <inheritdoc />
 	public void LoadState(JsonElement pluginSavedState) { }
 

src/Whim.CommandPalette/CommandPalettePlugin.cs

@@ -50,6 +50,9 @@
 		_commandPaletteWindow = new CommandPaletteWindow(_context, this);
 	}
 
+	/// <inheritdoc />
+	public void Subscribe() { }
+
 	/// <summary>
 	/// Activate the command palette.
 	/// </summary>

src/Whim.FloatingLayout.Tests/FloatingLayoutPluginTests.cs

@@ -136,6 +136,7 @@ IWorkspace activeWorkspace
 
 		// When
 		plugin.PreInitialize();
+		plugin.PostInitialize();
 		plugin.MarkWindowAsFloating(window);
 		context.WindowManager.WindowRemoved += Raise.EventWith(new WindowEventArgs() { Window = window });
 

src/Whim.FloatingLayout/FloatingLayoutPlugin.cs

@@ -31,11 +31,19 @@
 	public void PreInitialize()
 	{
 		_context.WorkspaceManager.AddProxyLayoutEngine(layout => new FloatingLayoutEngine(_context, this, layout));
+	}
+
+	/// <inheritdoc />
+	public void PostInitialize()
+	{
 		_context.WindowManager.WindowRemoved += WindowManager_WindowRemoved;
 	}
 
 	/// <inheritdoc />
-	public void PostInitialize() { }
+	public void Subscribe()
+	{
+		_context.WindowManager.WindowRemoved += WindowManager_WindowRemoved;
+	}
 
 	/// <inheritdoc />
 	public IPluginCommands PluginCommands => new FloatingLayoutCommands(this);

src/Whim.FocusIndicator/FocusIndicatorPlugin.cs

@@ -37,9 +37,6 @@ public FocusIndicatorPlugin(IContext context, FocusIndicatorConfig focusIndicato
 	public void PreInitialize()
 	{
 		_context.FilterManager.AddTitleMatchFilter(FocusIndicatorConfig.Title);
-
-		_context.WindowManager.WindowMoveStart += WindowManager_WindowMoveStart;
-		_context.WindowManager.WindowFocused += WindowManager_WindowFocused;
 	}
 
 	/// <inheritdoc/>
@@ -51,6 +48,13 @@ public void PostInitialize()
 		// Activate the window so it renders.
 		_focusIndicatorWindow.Activate();
 		_focusIndicatorWindow.Hide(_context);
+	}
+
+	/// <inheritdoc/>
+	public void Subscribe()
+	{
+		_context.WindowManager.WindowMoveStart += WindowManager_WindowMoveStart;
+		_context.WindowManager.WindowFocused += WindowManager_WindowFocused;
 
 		// Only subscribe to workspace changes once the indicator window has been created - we shouldn't
 		// show a window which doesn't yet exist (it'll just crash Whim).

src/Whim.Gaps/GapsPlugin.cs

@@ -37,6 +37,9 @@
 	/// <inheritdoc />
 	public void PostInitialize() { }
 
+	/// <inheritdoc />
+	public void Subscribe() { }
+
 	/// <summary>
 	/// Update the gap between the parent layout engine and the area where windows are placed by
 	/// the <paramref name="delta"/>.

src/Whim.LayoutPreview.Tests/LayoutPreviewPluginTests.cs

@@ -60,7 +60,6 @@ public void PluginCommands(IContext ctx)
 	}
 
 	[Theory, AutoSubstituteData<LayoutPreviewPluginCustomization>]
-	[SuppressMessage("Usage", "NS5000:Received check.")]
 	public void PreInitialize(IContext ctx)
 	{
 		// Given
@@ -70,24 +69,24 @@ public void PreInitialize(IContext ctx)
 		plugin.PreInitialize();
 
 		// Then
-		ctx.WindowManager.Received(1).WindowMoveStart += Arg.Any<EventHandler<WindowMovedEventArgs>>();
-		ctx.WindowManager.Received(1).WindowMoved += Arg.Any<EventHandler<WindowMovedEventArgs>>();
-		ctx.WindowManager.Received(1).WindowMoveEnd += Arg.Any<EventHandler<WindowMovedEventArgs>>();
-		ctx.WindowManager.Received(1).WindowRemoved += Arg.Any<EventHandler<WindowEventArgs>>();
 		ctx.FilterManager.Received(1).AddTitleMatchFilter(LayoutPreviewWindow.WindowTitle);
 	}
 
 	[Theory, AutoSubstituteData<LayoutPreviewPluginCustomization>]
-	public void PostInitialize(IContext ctx)
+	[SuppressMessage("Usage", "NS5000:Received check.")]
+	public void Subscribe(IContext ctx)
 	{
 		// Given
 		using LayoutPreviewPlugin plugin = new(ctx);
 
 		// When
-		plugin.PostInitialize();
+		plugin.Subscribe();
 
 		// Then
-		Assert.True(true);
+		ctx.WindowManager.Received(1).WindowMoveStart += Arg.Any<EventHandler<WindowMovedEventArgs>>();
+		ctx.WindowManager.Received(1).WindowMoved += Arg.Any<EventHandler<WindowMovedEventArgs>>();
+		ctx.WindowManager.Received(1).WindowMoveEnd += Arg.Any<EventHandler<WindowMovedEventArgs>>();
+		ctx.WindowManager.Received(1).WindowRemoved += Arg.Any<EventHandler<WindowEventArgs>>();
 	}
 
 	[Theory, AutoSubstituteData<LayoutPreviewPluginCustomization>]
@@ -199,7 +198,7 @@ public void WindowMoved_Dragged_CannotFindWorkspace(IContext ctx, IWorkspace wor
 		workspace.ActiveLayoutEngine.ClearReceivedCalls();
 
 		// When
-		plugin.PreInitialize();
+		plugin.Subscribe();
 		ctx.WindowManager.WindowMoved += Raise.Event<EventHandler<WindowMovedEventArgs>>(ctx.WindowManager, e);
 
 		// Then
@@ -225,7 +224,7 @@ public void WindowMoved_Dragged_Success(IContext ctx, IWindow window, IWorkspace
 		workspace.ActiveLayoutEngine.ClearReceivedCalls();
 
 		// When
-		plugin.PreInitialize();
+		plugin.Subscribe();
 		ctx.WindowManager.WindowMoved += Raise.Event<EventHandler<WindowMovedEventArgs>>(ctx.WindowManager, e);
 
 		// Then
@@ -274,7 +273,7 @@ public void WindowManager_WindowRemoved_NotHidden(IContext ctx, IWindow movedWin
 		WindowEventArgs removeArgs = new() { Window = removedWindow };
 
 		// When
-		plugin.PreInitialize();
+		plugin.Subscribe();
 		ctx.WindowManager.WindowMoved += Raise.Event<EventHandler<WindowMovedEventArgs>>(ctx.WindowManager, moveArgs);
 		ctx.WindowManager.WindowRemoved += Raise.Event<EventHandler<WindowEventArgs>>(ctx.WindowManager, removeArgs);
 

src/Whim.LayoutPreview.Tests/LayoutPreviewWindowTests.cs

@@ -181,8 +181,6 @@ IMonitor monitor
 	{
 		// Given
 		ctx.NativeManager.DeferWindowPos().Returns(new DeferWindowPosHandle(ctx, internalCtx));
-		internalCtx.DeferWindowPosManager.CanDoLayout().Returns(true);
-		internalCtx.DeferWindowPosManager.ParallelOptions.Returns(new ParallelOptions { MaxDegreeOfParallelism = 1 });
 
 		// When
 		LayoutPreviewWindow.Activate(ctx, layoutWindow, movingWindow, monitor);

src/Whim.LayoutPreview/LayoutPreviewPlugin.cs

@@ -36,18 +36,23 @@
 
 	/// <inheritdoc	/>
 	public void PreInitialize()
+	{
+		_context.FilterManager.AddTitleMatchFilter(LayoutPreviewWindow.WindowTitle);
+	}
+
+	/// <inheritdoc	/>
+	public void PostInitialize() { }
+
+	/// <inheritdoc	/>
+	public void Subscribe()
 	{
 		_context.WindowManager.WindowMoveStart += WindowManager_WindowMoveStart;
 		_context.WindowManager.WindowMoved += WindowMoved;
 		_context.WindowManager.WindowMoveEnd += WindowManager_WindowMoveEnd;
 		_context.WindowManager.WindowRemoved += WindowManager_WindowRemoved;
 		_context.WindowManager.WindowFocused += WindowManager_WindowFocused;
-		_context.FilterManager.AddTitleMatchFilter(LayoutPreviewWindow.WindowTitle);
 	}
 
-	/// <inheritdoc	/>
-	public void PostInitialize() { }
-
 	/// <inheritdoc />
 	public void LoadState(JsonElement state) { }
 

src/Whim.SliceLayout/SliceLayoutPlugin.cs

@@ -45,6 +45,9 @@
 	/// <inheritdoc />
 	public void PostInitialize() { }
 
+	/// <inheritdoc />
+	public void Subscribe() { }
+
 	/// <inheritdoc />
 	public void LoadState(JsonElement state) { }
 

src/Whim.TestUtils/Assert.cs

@@ -1,24 +1,26 @@
 using System;
 using System.ComponentModel;
+using System.Threading.Tasks;
 using NSubstitute;
 using Xunit;
 using Xunit.Sdk;
 
 namespace Whim.TestUtils;
 
 /// <summary>
-/// Exception thrown when an event is raised when it should not have been.
+/// Exception thrown when an event is not raises when it should have been (or vice versa).
 /// </summary>
 #pragma warning disable CA1032 // Implement standard exception constructors
-public class DoesNotRaiseException : XunitException
+public class ShouldRaiseException : XunitException
 #pragma warning restore CA1032 // Implement standard exception constructors
 {
 	/// <summary>
-	/// Creates a new instance of the <see cref="DoesNotRaiseException"/> class.
+	/// Creates a new instance of the <see cref="ShouldRaiseException"/> class.
 	/// </summary>
 	/// <param name="type"></param>
-	public DoesNotRaiseException(Type type)
-		: base($"Expected event of type {type} to not be raised.") { }
+	/// <param name="expected">Whether it was expected that the exception was raised.</param>
+	public ShouldRaiseException(Type type, bool expected)
+		: base($"Expected event of type {type} to {(expected ? "not" : "")} be raised.") { }
 }
 
 /// <summary>
@@ -33,7 +35,7 @@
 	/// <param name="attach">The method to attach the event handler.</param>
 	/// <param name="detach">The method to detach the event handler.</param>
 	/// <param name="action">The action to perform.</param>
-	/// <exception cref="DoesNotRaiseException">Thrown when the event is raised.</exception>
+	/// <exception cref="ShouldRaiseException">Thrown when the event is raised.</exception>
 	public static void DoesNotRaise<T>(Action<EventHandler<T>> attach, Action<EventHandler<T>> detach, Action action)
 	{
 		bool raised = false;
@@ -53,7 +55,45 @@
 
 		if (raised)
 		{
-			throw new DoesNotRaiseException(typeof(T));
+			throw new ShouldRaiseException(typeof(T), expected: false);
+		}
+	}
+
+	/// <summary>
+	/// Asserts that an event is not raised.
+	/// </summary>
+	/// <typeparam name="T">The type of event to check.</typeparam>
+	/// <param name="attach">The method to attach the event handler.</param>
+	/// <param name="detach">The method to detach the event handler.</param>
+	/// <param name="action">The action to perform.</param>
+	/// <param name="delayMs">The delay in milliseconds to wait.</param>
+	/// <exception cref="ShouldRaiseException">Thrown when the event is raised.</exception>
+	public static async Task RaisesAsync<T>(
+		Action<EventHandler<T>> attach,
+		Action<EventHandler<T>> detach,
+		Action action,
+		int delayMs
+	)
+	{
+		bool raised = false;
+		void handler(object? sender, T e)
+		{
+			raised = true;
+		}
+		attach(handler);
+		try
+		{
+			action();
+			await Task.Delay(delayMs).ConfigureAwait(true);
+		}
+		finally
+		{
+			detach(handler);
+		}
+
+		if (!raised)
+		{
+			throw new ShouldRaiseException(typeof(T), expected: true);
 		}
 	}
 
@@ -63,7 +103,7 @@
 	/// <param name="attach">The method to attach the event handler.</param>
 	/// <param name="detach">The method to detach the event handler.</param>
 	/// <param name="action">The action to perform.</param>
-	/// <exception cref="DoesNotRaiseException">Thrown when the event is raised.</exception>
+	/// <exception cref="ShouldRaiseException">Thrown when the event is raised.</exception>
 	public static void DoesNotPropertyChange(
 		Action<PropertyChangedEventHandler> attach,
 		Action<PropertyChangedEventHandler> detach,
@@ -87,7 +127,7 @@
 
 		if (raised)
 		{
-			throw new DoesNotRaiseException(typeof(PropertyChangedEventArgs));
+			throw new ShouldRaiseException(typeof(PropertyChangedEventArgs), expected: false);
 		}
 	}
 
@@ -116,6 +156,5 @@
 		Assert.Empty(internalCtx.WindowManager.ReceivedCalls());
 		Assert.Empty(internalCtx.KeybindHook.ReceivedCalls());
 		Assert.Empty(internalCtx.MouseHook.ReceivedCalls());
-		Assert.Empty(internalCtx.DeferWindowPosManager.ReceivedCalls());
 	}
 }