further pointer/target work and organization

Author: domportera

sources/Input/Input/DualReadOnlyList.cs

@@ -12,12 +12,11 @@ namespace Silk.NET.Input;
     /// <summary>
     /// Represents a list that has exactly two elements.
     /// </summary>
-    /// <typeparam name="T">The element type.</typeparam>
 
-    public DualReadOnlyList(Func<T> left, Func<T> right)
+    public DualReadOnlyList(Func<T> getLeft, Func<T> getRight)
     {
-        _left = left;
-        _right = right;
+        _getLeft = getLeft;
+        _getRight = getRight;
     }
 
     /// <summary>
@@ -26,7 +25,7 @@ public DualReadOnlyList(Func<T> left, Func<T> right)
     public T Left
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        get => _left();
+        get => _getLeft();
     }
 
     /// <summary>
@@ -35,15 +34,15 @@ public T Left
     public T Right
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        get => _right();
+        get => _getRight();
     }
 
 
     /// <inheritdoc />
     public IEnumerator<T> GetEnumerator()
     {
-        yield return _left();
-        yield return _right();
+        yield return _getLeft();
+        yield return _getRight();
     }
 
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
@@ -55,12 +54,12 @@ public IEnumerator<T> GetEnumerator()
     public T this[int index] =>
         index switch
         {
-            0 => _left(),
-            1 => _right(),
+            0 => _getLeft(),
+            1 => _getRight(),
             _ => throw new IndexOutOfRangeException(),
         };
 
 
-    private readonly Func<T> _left;
-    private readonly Func<T> _right;
+    private readonly Func<T> _getLeft;
+    private readonly Func<T> _getRight;
 }

sources/Input/Input/GamepadState.cs

@@ -7,36 +7,26 @@ namespace Silk.NET.Input;
 /// </summary>
 public class GamepadState
 {
-    /// <summary>
-    /// The constructor for a new GamepadState object
-    /// </summary>
-    /// <param name="buttons">The list of buttons</param>
-    /// <param name="axisStates">The list of states of the controllers axes that the triggers and joysticks will
-    /// be read from via their specific indices in this array</param>
-    /// <param name="joystickXAxisIndicesLR">The joystick X axes.</param>
-    /// <param name="joystickYAxisIndicesDU">The Joystick Y axes. </param>
-    /// <param name="joystickTriggerIndicesLR"></param>
-    /// <remarks>
-    /// For <see cref="joystickXAxisIndicesLR"/> and <see cref="joystickYAxisIndicesDU"/>, the must be either of length
-    /// 2 or 4.
-    ///
-    /// If two are provided, the first is assumed to be the left stick, and the second is assumed to be the right stick
-    ///
-    /// if 4 are provided, it is assumed that the first two are - and + sides of the first axis, and so on.
-    ///<example>[leftX, rightX] OR [-leftX, +leftX, -rightX, +rightX]</example>
-    /// </remarks>
-    /// <exception cref="ArgumentException"></exception>
-    /// <exception cref="ArgumentOutOfRangeException"></exception>
+    ///  <summary>
+    ///  The constructor for a new GamepadState object
+    ///  </summary>
+    ///  <param name="buttons">The list of buttons</param>
+    ///  <param name="axisStates">The list of states of the controllers axes that the triggers and joysticks will
+    ///  be read from via their specific indices in this array</param>
+    ///  <remarks>
+    ///  </remarks>
+    ///  <exception cref="ArgumentException"></exception>
+    ///  <exception cref="ArgumentOutOfRangeException"></exception>
     public GamepadState(IReadOnlyList<Button<JoystickButton>> buttons, IReadOnlyList<float> axisStates)
     {
         _axisStates = axisStates;
         Buttons = new ButtonReadOnlyList<JoystickButton>(buttons);
         Triggers = new DualReadOnlyList<float>(
-            left: () => _axisStates[JoystickAxis.LeftTrigger.Index()],
-            right: () =>_axisStates[JoystickAxis.RightTrigger.Index()]);
+            getLeft: () => _axisStates[JoystickAxis.LeftTrigger.Index()],
+            getRight: () =>_axisStates[JoystickAxis.RightTrigger.Index()]);
         Thumbsticks = new DualReadOnlyList<Vector2>(
-            left: () => new Vector2(_axisStates[JoystickAxis.LeftX.Index()], _axisStates[JoystickAxis.LeftY.Index()]),
-            right: () => new Vector2(_axisStates[JoystickAxis.RightX.Index()], _axisStates[JoystickAxis.RightY.Index()]));
+            getLeft: () => new Vector2(_axisStates[JoystickAxis.LeftX.Index()], _axisStates[JoystickAxis.LeftY.Index()]),
+            getRight: () => new Vector2(_axisStates[JoystickAxis.RightX.Index()], _axisStates[JoystickAxis.RightY.Index()]));
     }
 
     /// <summary>
@@ -47,12 +37,12 @@ public GamepadState(IReadOnlyList<Button<JoystickButton>> buttons, IReadOnlyList
     /// <summary>
     /// Gets the state of the twin sticks on the gamepad.
     /// </summary>
-    public DualReadOnlyList<Vector2> Thumbsticks { get; internal set; }
+    public DualReadOnlyList<Vector2> Thumbsticks { get; }
 
     /// <summary>
     /// Gets the state of the triggers on the gamepad.
     /// </summary>
-    public DualReadOnlyList<float> Triggers { get; internal set; }
+    public DualReadOnlyList<float> Triggers { get; }
 
     // ReSharper disable PrivateFieldCanBeConvertedToLocalVariable <- keeps closures consistent
     private readonly IReadOnlyList<float> _axisStates;

sources/Input/Input/Handlers/Pointers.cs

@@ -1,7 +1,6 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace Silk.NET.Input;
@@ -103,14 +102,11 @@ internal void HandleButtonChanged(ButtonChangedEvent<PointerButton> @event)
         }
     }
 
-    void IMouseInputHandler.HandleScroll(MouseScrollEvent @event) => HandleScroll(@event);
+    /// <inheritdoc/>
+    public void HandleScroll(MouseScrollEvent @event) => MouseScroll?.Invoke(@event);
 
-    internal void HandleScroll(MouseScrollEvent @event) => MouseScroll?.Invoke(@event);
-
-    void IPointerInputHandler.HandleTargetChanged(PointerTargetChangedEvent @event) =>
-        HandleTargetChanged(@event);
-
-    internal void HandleTargetChanged(PointerTargetChangedEvent @event)
+    /// <inheritdoc/>
+    public void HandleTargetChanged(PointerTargetChangedEvent @event)
     {
         TargetChanged?.Invoke(@event);
         if (_clicks is null || @event.IsAdded is not false)
@@ -136,10 +132,8 @@ internal void HandleTargetChanged(PointerTargetChangedEvent @event)
         }
     }
 
-    void IPointerInputHandler.HandlePointChanged(PointChangedEvent @event) =>
-        HandlePointChanged(@event);
-
-    internal void HandlePointChanged(PointChangedEvent @event)
+    /// <inheritdoc/>
+    public void HandlePointChanged(PointChangedEvent @event)
     {
         try
         {
@@ -175,10 +169,8 @@ internal void HandlePointChanged(PointChangedEvent @event)
         }
     }
 
-    void IPointerInputHandler.HandleGripChanged(PointerGripChangedEvent @event) =>
-        HandleGripChanged(@event);
-
-    internal void HandleGripChanged(PointerGripChangedEvent @event) => GripChanged?.Invoke(@event);
+    /// <inheritdoc/>
+    public void HandleGripChanged(PointerGripChangedEvent @event) => GripChanged?.Invoke(@event);
 
     private record struct ClickData(
         IPointerDevice Device,
@@ -365,15 +357,6 @@ private void InvokeClick(PointerClickEvent evt)
         }
     }
 
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    void IInputHandler<PointerTargetChangedEvent>.Handle(PointerTargetChangedEvent @event) => HandleTargetChanged(@event);
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    void IInputHandler<PointChangedEvent>.Handle(PointChangedEvent @event) => HandlePointChanged(@event);
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    void IInputHandler<PointerGripChangedEvent>.Handle(PointerGripChangedEvent @event) => HandleGripChanged(@event);
-
     /// <inheritdoc />
     protected internal override void HandleDeviceConnectionChanged(ConnectionEvent @event)
     {

sources/Input/Input/IPointerInputHandler.cs

@@ -1,3 +1,5 @@
+using System.Runtime.CompilerServices;
+
 namespace Silk.NET.Input;
 
 /// <summary>
@@ -23,4 +25,14 @@ public interface IPointerInputHandler : IButtonInputHandler<PointerButton>, IInp
     /// </summary>
     /// <param name="event">The event details.</param>
     void HandleGripChanged(PointerGripChangedEvent @event);
+
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    void IInputHandler<PointerTargetChangedEvent>.Handle(PointerTargetChangedEvent @event) => HandleTargetChanged(@event);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    void IInputHandler<PointChangedEvent>.Handle(PointChangedEvent @event) => HandlePointChanged(@event);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    void IInputHandler<PointerGripChangedEvent>.Handle(PointerGripChangedEvent @event) => HandleGripChanged(@event);
 }

sources/Input/Input/IPointerTarget.cs

@@ -38,4 +38,4 @@ public interface IPointerTarget
     /// </param>
     /// <returns>The point at the given index with which the given pointer device is pointing at the target.</returns>
     TargetPoint GetPoint(IPointerDevice pointer, int point);
-}
+}

sources/Input/Input/Implementations/SDL3/DataStructures/SdlArray.cs

@@ -27,7 +27,7 @@ namespace Silk.NET.Input.SDL3.DataStructures;
 
     public static SdlArray<T> Null => default;
 
-    public SdlArray(Ptr<T> ptr, int count, ISdl? sdl, bool consumerCanDispose = true)
+    public SdlArray(Ptr<T> ptr, int count, ISdl? sdl, bool consumerCanDispose)
     {
         if (consumerCanDispose)
         {

sources/Input/Input/Implementations/SDL3/DataStructures/SdlInputEventQueue.cs

@@ -41,7 +41,7 @@ public void Enqueue(in T item, ulong sdlTimestamp)
     }
 
 
-    /// <Summary>
+    /// <summary>
     /// Returns a reference to our data as two spans and clears the inner count of our buffers
     /// (the functional equivalent of calling <see cref="List{T}.Clear()"/>)
     /// </summary>

sources/Input/Input/Implementations/SDL3/Devices/Joysticks/SdlGamepad.cs

@@ -7,7 +7,7 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using Silk.NET.Input.SDL3.DataStructures;
-using Silk.NET.Input.SDL3.Devices.Pointers;
+using Silk.NET.Input.SDL3.Extensions;
 using Silk.NET.Maths;
 using Silk.NET.SDL;
 
@@ -640,10 +640,6 @@ typedef struct SDL_GamepadTouchpadEvent
             return;
         }
 
-        Debug.Assert(surface.IsSimulated);
-        Debug.Assert(surface.Targets.Count == 1);
-        Debug.Assert(surface.Targets[0] == target);
-
         target.SetBounds(bounds);
         var fingerId = evt.Finger;
 

sources/Input/Input/Implementations/SDL3/Devices/Joysticks/SdlJoystick.cs

@@ -4,6 +4,7 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using Silk.NET.Input.SDL3.DataStructures;
+using Silk.NET.Input.SDL3.Extensions;
 using Silk.NET.SDL;
 
 namespace Silk.NET.Input.SDL3.Devices.Joysticks;

sources/Input/Input/Implementations/SDL3/Devices/Pointers/SdlMouse.cs

@@ -3,6 +3,7 @@
 
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using Silk.NET.Input.SDL3.Extensions;
 using Silk.NET.SDL;
 
 namespace Silk.NET.Input.SDL3.Devices.Pointers;
@@ -32,24 +33,10 @@ protected internal override void Initialize(long timestamp, ulong sdlTimestamp)
         ApplyMouseButtonState(mouseInputFlags, sdlTimestamp, timestamp);
 
         var window = NativeBackend.GetMouseFocus();
-        uint windowId;
-        if (window == nullptr)
+        if (Backend.TryGetOrCreatePointerTargetForWindow(window, out var target))
         {
-            windowId = 0;
+            AddOrUpdatePoint(null, target, new Vector3(x, y, 0), null, DownState, null, true, sdlTimestamp, timestamp);
         }
-        else
-        {
-            windowId = NativeBackend.GetWindowID(window);
-            if (windowId == 0)
-            {
-                SdlLog.Error("Mouse has no window");
-            }
-        }
-
-
-        // var pressure = _state.Buttons[PointerButton.Primary].Pressure;
-        Backend.TryGetPointerTargetForWindow(windowId, out var target);
-        AddOrUpdatePoint(null, target, new Vector3(x, y, 0), null, DownState, null, true, sdlTimestamp, timestamp);
         // var point = _unboundedPointerTarget.GetPoint(this, 0);
     }
 
@@ -184,13 +171,8 @@ public bool TrySetPosition(Vector2 position)
     /// </summary>
     public bool NeedsPump { get; private set; }
 
-    public void AddMotion(in MouseMotionEvent evtMotion, long timestamp)
+    public void AddMotion(in MouseMotionEvent evtMotion, IPointerTarget target, long timestamp)
     {
-        if (!Backend.TryGetPointerTargetForWindow(evtMotion.WindowID, out var target))
-        {
-            throw new InvalidOperationException("Failed to get pointer target for window");
-        }
-
         AddOrUpdatePoint(null, target, new Vector3(evtMotion.X, evtMotion.Y, 0), 1, null, null,
             evtMotion.WindowID != 0, evtMotion.Timestamp, timestamp);
     }
@@ -211,7 +193,7 @@ public void AddButtonEvent(in MouseButtonEvent evtButton, long timestamp)
         AddButtonEvent(button, timestamp, evtButton.Timestamp, evtButton.Down > 0, evtButton.Down * mult);
     }
 
-    public void AddWheelEvent(in MouseWheelEvent evtWheel, long timestamp)
+    public void AddWheelEvent(in MouseWheelEvent evtWheel, IPointerTarget target, long timestamp)
     {
         var pWheelPosition = _state.WheelPosition;
         const float max = 100f;
@@ -230,7 +212,7 @@ public void AddWheelEvent(in MouseWheelEvent evtWheel, long timestamp)
         AddMouseScrollEvent(
             scrollWheelPosition: _state.WheelPosition = pWheelPosition + delta,
             scrollWheelDelta: delta,
-            windowId: evtWheel.WindowID,
+            target: target,
             sdlTimestamp: evtWheel.Timestamp,
             mousePos: new Vector3(evtWheel.X, evtWheel.Y, 0),
             timestamp: timestamp);