Merge branch 'develop' into docf-1179-fixedupdate-vs-update

Author: duckets

Assets/Tests/InputSystem/CoreTests_Devices.cs

@@ -4162,13 +4162,40 @@ public void Devices_RemovingAndReaddingDevice_DoesNotAllocateMemory()
         recorder.CollectFromAllThreads();
 #endif
 
-        // We expect a single allocation for each call to ReportNewInputDevice when there is one disconnected device
-        //
-        int numberOfRepeats = 2;
-        int numberOfDisconnectedDevices = 1;
-        int numberOfCallsToReportNewInputDevicePerRun = 2;
-        int expectedAllocations = numberOfRepeats * numberOfDisconnectedDevices * numberOfCallsToReportNewInputDevicePerRun;
-        Assert.AreEqual(expectedAllocations, recorder.sampleBlockCount);
+        // No allocations are expected.
+        Assert.AreEqual(0, recorder.sampleBlockCount);
+    }
+
+    // Regression test to cover having null descriptor fields for a device. Some non-desktop gamepad device types do this.
+    [Test]
+    [Category("Devices")]
+    public void Devices_RemovingAndReaddingDeviceWithNullDescriptorFields_DoesNotThrow()
+    {
+        // InputDeviceDescription.ToJson writes empty string fields and not null values, whereas reporting a device via an incomplete description string will fully omit the fields.
+        string description = @"{
+            ""type"": ""Gamepad"",
+            ""product"": ""TestProduct""
+        }";
+
+        var deviceId = runtime.ReportNewInputDevice(description);
+        InputSystem.Update();
+
+        // "Unplug" device.
+        var removeEvent1 = DeviceRemoveEvent.Create(deviceId);
+        InputSystem.QueueEvent(ref removeEvent1);
+        InputSystem.Update();
+
+        // "Plug" it back in.
+        deviceId = runtime.ReportNewInputDevice(description);
+        InputSystem.Update();
+
+        // Repeat that sequence.
+        var removeEvent2 = DeviceRemoveEvent.Create(deviceId);
+        InputSystem.QueueEvent(ref removeEvent2);
+        InputSystem.Update();
+
+        runtime.ReportNewInputDevice(description);
+        InputSystem.Update();
     }
 
     [Test]

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -10,6 +10,16 @@ however, it has to be formatted properly to pass verification tests.
 
 ## [Unreleased] - yyyy-mm-dd
 
+### Fixed
+- Fixed `NullReferenceException` from disconnecting and reconnecting a GXDKGamepad.
+
+### Added
+- Added the display of the device flag `CanRunInBackground` in device debug view.
+- Added analytics for programmatic `InputAction` setup via `InputActionSetupExtensions` when exiting play-mode.
+
+### Fixed
+- Fixed wrong mapping of Xbox Series S|X and Xbox One wireless controllers "View" button on macOS.[ISXB-385](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-385)
+
 ## [1.11.1] - 2024-09-26
 
 ### Fixed
@@ -47,7 +57,6 @@ however, it has to be formatted properly to pass verification tests.
 - Added tests for Input Action Editor UI for managing action maps (List, create, rename, delete) (ISX-2087)
 - Added automatic loading of custom extensions of InputProcessor, InputInteraction and InputBindingComposite [ISXB-856]](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-856).
 - Added an IME Input sample scene.
-- Added analytics for programmatic `InputAction` setup via `InputActionSetupExtensions`.
 
 ## [1.10.0] - 2024-07-24
 

Packages/com.unity.inputsystem/InputSystem/Devices/InputDevice.cs

@@ -255,6 +255,18 @@ public bool canRunInBackground
                     return !(this is Pointer || this is Keyboard); // Anything but pointers and keyboards considered as being able to run in background.
                 #endif
 
+                return canDeviceRunInBackground;
+            }
+        }
+        /// <summary>
+        /// In editor, it may differ from canRunInBackground depending on the gameViewFocus setting.
+        /// This property is used by Device Debug View
+        /// </summary>
+        /// <value>Whether the device should generate input while in the background.</value>
+        internal bool canDeviceRunInBackground
+        {
+            get
+            {
                 if ((m_DeviceFlags & DeviceFlags.CanRunInBackgroundHasBeenQueried) != 0)
                     return (m_DeviceFlags & DeviceFlags.CanRunInBackground) != 0;
 

Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDeviceDebuggerWindow.cs

@@ -347,6 +347,8 @@ private void UpdateDeviceFlags()
                 flags.Add("DisabledInRuntime");
             if (m_Device.disabledWhileInBackground)
                 flags.Add("DisabledWhileInBackground");
+            if (m_Device.canDeviceRunInBackground)
+                flags.Add("CanRunInBackground");
             m_DeviceFlags = m_Device.m_DeviceFlags;
             m_DeviceFlagsString = string.Join(", ", flags.ToArray());
         }

Packages/com.unity.inputsystem/InputSystem/InputManager.cs

@@ -2562,6 +2562,15 @@ private JsonParser.JsonString MakeEscapedJsonString(string theString)
             // To avoid a very costly escape-skipping character-by-character string comparison in JsonParser.Json.Equals() we
             // reconstruct an escaped string and make an escaped JsonParser.JsonString and use that for the comparison instead.
             //
+            if (string.IsNullOrEmpty(theString))
+            {
+                return new JsonParser.JsonString
+                {
+                    text = string.Empty,    // text should be an empty string and not null for consistency on property comparisons
+                    hasEscapes = false
+                };
+            }
+
             var builder = new StringBuilder();
             var length = theString.Length;
             var hasEscapes = false;
@@ -2893,22 +2902,8 @@ internal void AddAvailableDevicesThatAreNowRecognized()
 
         private bool ShouldRunDeviceInBackground(InputDevice device)
         {
-            var runDeviceInBackground =
-                m_Settings.backgroundBehavior != InputSettings.BackgroundBehavior.ResetAndDisableAllDevices &&
+            return m_Settings.backgroundBehavior != InputSettings.BackgroundBehavior.ResetAndDisableAllDevices &&
                 device.canRunInBackground;
-
-            // In editor, we may override canRunInBackground depending on the gameViewFocus setting.
-            #if UNITY_EDITOR
-            if (runDeviceInBackground)
-            {
-                if (m_Settings.editorInputBehaviorInPlayMode == InputSettings.EditorInputBehaviorInPlayMode.AllDevicesRespectGameViewFocus)
-                    runDeviceInBackground = false;
-                else if (m_Settings.editorInputBehaviorInPlayMode == InputSettings.EditorInputBehaviorInPlayMode.PointersAndKeyboardsRespectGameViewFocus)
-                    runDeviceInBackground = !(device is Pointer || device is Keyboard);
-            }
-            #endif
-
-            return runDeviceInBackground;
         }
 
         internal void OnFocusChanged(bool focus)

Packages/com.unity.inputsystem/InputSystem/Plugins/XInput/XboxGamepadMacOS.cs

@@ -111,7 +111,7 @@ internal struct XInputControllerWirelessOSXState : IInputStateTypeInfo
         public enum Button
         {
             Start = 11,
-            Select = 16,
+            Select = 10,
             LeftThumbstickPress = 13,
             RightThumbstickPress = 14,
             LeftShoulder = 6,