Force renew listener instances on arming mappings

Core/Key2Joy.Core/Key2JoyManager.cs

@@ -154,17 +154,17 @@ public void ArmMappings(MappingProfile profile, bool withExplicitTriggerListener
 
         if (withExplicitTriggerListeners)
         {
-            allListeners.AddRange(new List<AbstractTriggerListener> {
+            allListeners.AddRange([
                 // Trigger listeners that should explicitly loaded. This ensures that they're available for scripts
                 // even if no mapping option is mapped to be triggered by it.
                 // Always add these listeners so scripts can ask them if stuff has happened.
-                KeyboardTriggerListener.Instance,
-                MouseButtonTriggerListener.Instance,
-                MouseMoveTriggerListener.Instance,
-                GamePadButtonTriggerListener.Instance,
-                GamePadStickTriggerListener.Instance,
-                GamePadTriggerTriggerListener.Instance,
-            });
+                KeyboardTriggerListener.NewInstance(),
+                MouseButtonTriggerListener.NewInstance(),
+                MouseMoveTriggerListener.NewInstance(),
+                GamePadButtonTriggerListener.NewInstance(),
+                GamePadStickTriggerListener.NewInstance(),
+                GamePadTriggerTriggerListener.NewInstance(),
+            ]);
         }
 
         var allActions = (IList<AbstractAction>)profile.MappedOptions.Select(m => m.Action).ToList();

Core/Key2Joy.Core/Mapping/Triggers/GamePad/GamePadButtonTriggerListener.cs

@@ -3,6 +3,7 @@
 using Key2Joy.Contracts.Mapping;
 using Key2Joy.Contracts.Mapping.Triggers;
 using Key2Joy.LowLevelInput.XInput;
+using Key2Joy.Mapping.Triggers.Mouse;
 
 namespace Key2Joy.Mapping.Triggers.GamePad;
 
@@ -20,6 +21,13 @@ public static GamePadButtonTriggerListener Instance
         }
     }
 
+    /// <summary>
+    /// Force a new instance to be created, used to reset the listener when mappings
+    /// are re-armed.
+    /// </summary>
+    /// <returns></returns>
+    public static GamePadButtonTriggerListener NewInstance() => instance = new GamePadButtonTriggerListener();
+
     private readonly IXInputService xInputService;
     private readonly Dictionary<GamePadButton, bool> currentKeysDown = new();
 

Core/Key2Joy.Core/Mapping/Triggers/GamePad/GamePadStickTriggerListener.cs

@@ -23,6 +23,13 @@ public static GamePadStickTriggerListener Instance
         }
     }
 
+    /// <summary>
+    /// Force a new instance to be created, used to reset the listener when mappings
+    /// are re-armed.
+    /// </summary>
+    /// <returns></returns>
+    public static GamePadStickTriggerListener NewInstance() => instance = new GamePadStickTriggerListener();
+
     private readonly Dictionary<GamePadSide, GamePadStickLookup> stickAxisLookups;
     private readonly IXInputService xInputService;
 

Core/Key2Joy.Core/Mapping/Triggers/GamePad/GamePadTriggerTriggerListener.cs

@@ -20,6 +20,13 @@ public static GamePadTriggerTriggerListener Instance
         }
     }
 
+    /// <summary>
+    /// Force a new instance to be created, used to reset the listener when mappings
+    /// are re-armed.
+    /// </summary>
+    /// <returns></returns>
+    public static GamePadTriggerTriggerListener NewInstance() => instance = new GamePadTriggerTriggerListener();
+
     private readonly Dictionary<GamePadSide, List<AbstractMappedOption>> triggerLookup;
     private readonly IXInputService xInputService;
 

Core/Key2Joy.Core/Mapping/Triggers/Keyboard/KeyboardTriggerListener.cs

@@ -22,6 +22,13 @@ public static KeyboardTriggerListener Instance
         }
     }
 
+    /// <summary>
+    /// Force a new instance to be created, used to reset the listener when mappings
+    /// are re-armed.
+    /// </summary>
+    /// <returns></returns>
+    public static KeyboardTriggerListener NewInstance() => instance = new KeyboardTriggerListener();
+
     private GlobalInputHook globalKeyboardHook;
     private readonly VirtualKeyConverter virtualKeyConverter = new();
     private readonly Dictionary<Keys, bool> currentKeysPressed = new();

Core/Key2Joy.Core/Mapping/Triggers/Mouse/MouseButtonTriggerListener.cs

@@ -3,6 +3,7 @@
 using Key2Joy.Config;
 using Key2Joy.Contracts.Mapping.Triggers;
 using Key2Joy.LowLevelInput;
+using Key2Joy.Mapping.Triggers.Keyboard;
 
 namespace Key2Joy.Mapping.Triggers.Mouse;
 
@@ -20,6 +21,13 @@ public static MouseButtonTriggerListener Instance
         }
     }
 
+    /// <summary>
+    /// Force a new instance to be created, used to reset the listener when mappings
+    /// are re-armed.
+    /// </summary>
+    /// <returns></returns>
+    public static MouseButtonTriggerListener NewInstance() => instance = new MouseButtonTriggerListener();
+
     private GlobalInputHook globalMouseButtonHook;
     private readonly Dictionary<LowLevelInput.Mouse.Buttons, bool> currentButtonsDown = new();
 

Core/Key2Joy.Core/Mapping/Triggers/Mouse/MouseMoveTriggerListener.cs

@@ -23,6 +23,13 @@ public static MouseMoveTriggerListener Instance
         }
     }
 
+    /// <summary>
+    /// Force a new instance to be created, used to reset the listener when mappings
+    /// are re-armed.
+    /// </summary>
+    /// <returns></returns>
+    public static MouseMoveTriggerListener NewInstance() => instance = new MouseMoveTriggerListener();
+
     private static readonly TimeSpan IS_MOVING_TOLERANCE = TimeSpan.FromMilliseconds(10);
 
     private readonly Dictionary<int, List<AbstractMappedOption>> lookupAxis;