FIX: controls excluded from rebinding could be still suppressed during interactive rebinding (#1620)

* FIX: controls excluded from rebinding could be still suppressed during interactive rebinding.

* move changelog to correct location

Author: jamesmcgill

Assets/Tests/InputSystem/CoreTests_Actions_Rebinding.cs

@@ -1152,13 +1152,23 @@ public void Actions_InteractiveRebinding_CanSuppressEventsWhileListening()
         using (new InputActionRebindingExtensions.RebindingOperation()
                .WithAction(action)
                .WithControlsExcluding("<Pointer>/position")
-               .WithMatchingEventsBeingSuppressed().Start())
+               .WithControlsExcluding("<Pointer>/press")
+               .WithControlsExcluding("<Mouse>/leftButton")
+               .WithControlsExcluding("<Gamepad>/buttonEast")
+               .WithMatchingEventsBeingSuppressed()
+               .Start()
+        )
         {
+            // Non-bindable controls should not be suppressed and continue working as normal
             Set(mouse.position, new Vector2(123, 234));
-            Press(gamepad.buttonSouth);
+            Press(mouse.leftButton);
+            Press(gamepad.buttonEast);
 
+            Press(gamepad.buttonSouth);
             Assert.That(action.bindings[0].overridePath, Is.EqualTo("<Gamepad>/buttonSouth"));
+            Assert.That(mouse.leftButton.isPressed, Is.True);
             Assert.That(gamepad.buttonSouth.isPressed, Is.False);
+            Assert.That(gamepad.buttonEast.isPressed, Is.True);
             Assert.That(mouse.position.ReadValue(), Is.EqualTo(new Vector2(123, 234)).Using(Vector2EqualityComparer.Instance));
         }
     }

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -21,6 +21,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed an issue on PS5 where device disconnected events that happen while the app is in the background are missed causing orphaned devices to hang around forever and exceptions when the same device is added again ([case UUM-7842](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-6744)).
 - Fixed Switch Pro, DualShock 4, DualSense gamepads becoming current on PC/macOS when no controls are changing ([case ISXB-223](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-223))).
 - Fixed an issue that made OnScreenStick unusable when used in conjunction with PlayerInput in Auto-Switch devices mode, or with any code that changes user/device pairing on unsued device activity being detected ([case ISXB-48](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-48)).
+- Fixed issue where input events were being suppressed during interactive action rebinding even when when their controls were excluded ([case ISXB-367](https://issuetracker.unity3d.com/issues/mouse-position-and-mouse-click-input-not-recognized-when-rebinding-is-active)).
 
 ### Actions
 - Extended input action code generator (`InputActionCodeGenerator.cs`) to support optional registration and unregistration of callbacks for multiple callback instances via `AddCallbacks(...)` and `RemoveCallbacks(...)` part of the generated code. Contribution by [Ramobo](https://github.com/Ramobo) in [#889](https://github.com/Unity-Technologies/InputSystem/pull/889).

Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs

@@ -2304,9 +2304,6 @@ private unsafe void OnEvent(InputEventPtr eventPtr, InputDevice device)
                     if (m_ExcludePathCount > 0 && HavePathMatch(control, m_ExcludePaths, m_ExcludePathCount))
                         continue;
 
-                    // The control is not explicitly excluded so we suppress the event, if that's enabled.
-                    suppressEvent = true;
-
                     // If controls have to match a certain path, check if this one does.
                     if (m_IncludePathCount > 0 && !HavePathMatch(control, m_IncludePaths, m_IncludePathCount))
                         continue;
@@ -2347,6 +2344,9 @@ private unsafe void OnEvent(InputEventPtr eventPtr, InputDevice device)
                         continue;
                     }
 
+                    // At this point the control is a potential candidate for rebinding and therefore the event may need to be suppressed, if that's enabled.
+                    suppressEvent = true;
+
                     var magnitude = control.EvaluateMagnitude(statePtr);
                     if (magnitude >= 0)
                     {