Merge branch 'bug/null-ref-exception-fix' into feat/window-focus-foll…

…ows-cursor

GlazeWM.Domain/Containers/CommandHandlers/CenterCursorOnRectHandler.cs

@@ -0,0 +1,34 @@
+using GlazeWM.Domain.Containers.Commands;
+using GlazeWM.Domain.UserConfigs;
+
+using GlazeWM.Infrastructure.Bussing;
+using GlazeWM.Infrastructure.WindowsApi;
+using static GlazeWM.Infrastructure.WindowsApi.WindowsApiService;
+
+namespace GlazeWM.Domain.Containers.CommandHandlers
+{
+  internal class CenterCursorOnRectHandler : ICommandHandler<CenterCursorOnRectCommand>
+  {
+    private readonly UserConfigService _userConfigService;
+
+    public CenterCursorOnRectHandler(UserConfigService userConfigService)
+    {
+      _userConfigService = userConfigService;
+    }
+
+    public CommandResponse Handle(CenterCursorOnRectCommand command)
+    {
+      var enabled = _userConfigService.GeneralConfig.CursorFollowsFocus;
+      if (!enabled)
+        return CommandResponse.Ok;
+
+      Rect TargetRect = command.TargetRect;
+
+      // Calculate center point of focused window
+      var centerX = TargetRect.X + (TargetRect.Width / 2);
+      var centerY = TargetRect.Y + (TargetRect.Height / 2);
+      SetCursorPos(centerX, centerY);
+      return CommandResponse.Ok;
+    }
+  }
+}

GlazeWM.Domain/Containers/CommandHandlers/MoveContainerWithinTreeHandler.cs

@@ -44,7 +44,7 @@ public CommandResponse Handle(MoveContainerWithinTreeCommand command)
         );
 
         // Center cursor in focused window's new location
-        _bus.InvokeAsync(new CenterCursorOnContainerCommand(containerToMove));
+        _bus.InvokeAsync(new CenterCursorOnRectCommand(containerToMove.ToRect()));
 
         return CommandResponse.Ok;
       }
@@ -91,7 +91,7 @@ public CommandResponse Handle(MoveContainerWithinTreeCommand command)
         );
 
       // Center cursor in focused window's new location
-      _bus.InvokeAsync(new CenterCursorOnContainerCommand(containerToMove));
+      _bus.InvokeAsync(new CenterCursorOnRectCommand(containerToMove.ToRect()));
 
       return CommandResponse.Ok;
     }

GlazeWM.Domain/Containers/CommandHandlers/SetNativeFocusHandler.cs

@@ -42,7 +42,7 @@ public CommandResponse Handle(SetNativeFocusCommand command)
         _bus.Emit(new FocusChangedEvent(containerToFocus));
       }
 
-      _bus.InvokeAsync(new CenterCursorOnContainerCommand(containerToFocus));
+      _bus.InvokeAsync(new CenterCursorOnRectCommand(containerToFocus.ToRect()));
 
       return CommandResponse.Ok;
     }

GlazeWM.Domain/Containers/Commands/CenterCursorOnContainerCommand.cs → GlazeWM.Domain/Containers/Commands/CenterCursorOnRectCommand.cs

@@ -1,17 +1,18 @@
 using GlazeWM.Infrastructure.Bussing;
+using GlazeWM.Infrastructure.WindowsApi;
 
 namespace GlazeWM.Domain.Containers.Commands
 {
-  public class CenterCursorOnContainerCommand : Command
+  public class CenterCursorOnRectCommand : Command
   {
-    public Container TargetContainer { get; }
+    public Rect TargetRect { get; }
 
     /// <summary>
     ///  Center cursor in the middle of target container
     /// </summary>
-    public CenterCursorOnContainerCommand(Container target)
+    public CenterCursorOnRectCommand(Rect target)
     {
-      TargetContainer = target;
+      TargetRect = target;
     }
   }
 }

GlazeWM.Domain/DependencyInjection.cs

@@ -39,7 +39,7 @@ public static IServiceCollection AddDomainServices(this IServiceCollection servi
       services.AddSingleton<ICommandHandler<SetBindingModeCommand>, SetBindingModeHandler>();
       services.AddSingleton<ICommandHandler<AttachAndResizeContainerCommand>, AttachAndResizeContainerHandler>();
       services.AddSingleton<ICommandHandler<AttachContainerCommand>, AttachContainerHandler>();
-      services.AddSingleton<ICommandHandler<CenterCursorOnContainerCommand>, CenterCursorOnContainerHandler>();
+      services.AddSingleton<ICommandHandler<CenterCursorOnRectCommand>, CenterCursorOnRectHandler>();
       services.AddSingleton<ICommandHandler<ChangeContainerLayoutCommand>, ChangeContainerLayoutHandler>();
       services.AddSingleton<ICommandHandler<DetachAndResizeContainerCommand>, DetachAndResizeContainerHandler>();
       services.AddSingleton<ICommandHandler<DetachContainerCommand>, DetachContainerHandler>();

GlazeWM.Domain/Windows/CommandHandlers/ManageWindowHandler.cs

@@ -19,20 +19,25 @@ internal class ManageWindowHandler : ICommandHandler<ManageWindowCommand>
     private readonly ContainerService _containerService;
     private readonly ILogger<ManageWindowHandler> _logger;
     private readonly MonitorService _monitorService;
+    private readonly WindowService _windowService;
     private readonly UserConfigService _userConfigService;
 
     public ManageWindowHandler(
       Bus bus,
       ContainerService containerService,
       ILogger<ManageWindowHandler> logger,
       MonitorService monitorService,
+      WindowService windowService,
       UserConfigService userConfigService)
     {
       _bus = bus;
       _containerService = containerService;
       _logger = logger;
       _monitorService = monitorService;
+      _windowService = windowService;
+
       _userConfigService = userConfigService;
+
     }
 
     public CommandResponse Handle(ManageWindowCommand command)
@@ -70,6 +75,9 @@ public CommandResponse Handle(ManageWindowCommand command)
       var windowRules = _userConfigService.GetMatchingWindowRules(window);
       _bus.Invoke(new RunWindowRulesCommand(window, windowRules));
 
+      // Update window in case the reference changes.
+      window = _windowService.GetWindowByHandle(window.Handle);
+
       // Window might be detached if 'ignore' command has been invoked.
       if (window.IsDetached())
         return CommandResponse.Ok;