aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Ava/Input
diff options
context:
space:
mode:
Diffstat (limited to 'src/Ryujinx.Ava/Input')
-rw-r--r--src/Ryujinx.Ava/Input/AvaloniaKeyboard.cs28
-rw-r--r--src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs20
-rw-r--r--src/Ryujinx.Ava/Input/AvaloniaKeyboardMappingHelper.cs4
-rw-r--r--src/Ryujinx.Ava/Input/AvaloniaMouse.cs10
-rw-r--r--src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs44
5 files changed, 54 insertions, 52 deletions
diff --git a/src/Ryujinx.Ava/Input/AvaloniaKeyboard.cs b/src/Ryujinx.Ava/Input/AvaloniaKeyboard.cs
index d40ebbd2..d07c8134 100644
--- a/src/Ryujinx.Ava/Input/AvaloniaKeyboard.cs
+++ b/src/Ryujinx.Ava/Input/AvaloniaKeyboard.cs
@@ -12,25 +12,25 @@ namespace Ryujinx.Ava.Input
internal class AvaloniaKeyboard : IKeyboard
{
private readonly List<ButtonMappingEntry> _buttonsUserMapping;
- private readonly AvaloniaKeyboardDriver _driver;
- private StandardKeyboardInputConfig _configuration;
+ private readonly AvaloniaKeyboardDriver _driver;
+ private StandardKeyboardInputConfig _configuration;
private readonly object _userMappingLock = new();
- public string Id { get; }
+ public string Id { get; }
public string Name { get; }
- public bool IsConnected => true;
- public GamepadFeaturesFlag Features => GamepadFeaturesFlag.None;
+ public bool IsConnected => true;
+ public GamepadFeaturesFlag Features => GamepadFeaturesFlag.None;
private class ButtonMappingEntry
{
- public readonly Key From;
+ public readonly Key From;
public readonly GamepadButtonInputId To;
public ButtonMappingEntry(GamepadButtonInputId to, Key from)
{
- To = to;
+ To = to;
From = from;
}
}
@@ -40,8 +40,8 @@ namespace Ryujinx.Ava.Input
_buttonsUserMapping = new List<ButtonMappingEntry>();
_driver = driver;
- Id = id;
- Name = name;
+ Id = id;
+ Name = name;
}
public KeyboardStateSnapshot GetKeyboardStateSnapshot()
@@ -52,7 +52,7 @@ namespace Ryujinx.Ava.Input
public GamepadStateSnapshot GetMappedStateSnapshot()
{
KeyboardStateSnapshot rawState = GetKeyboardStateSnapshot();
- GamepadStateSnapshot result = default;
+ GamepadStateSnapshot result = default;
lock (_userMappingLock)
{
@@ -75,10 +75,10 @@ namespace Ryujinx.Ava.Input
}
}
- (short leftStickX, short leftStickY) = GetStickValues(ref rawState, _configuration.LeftJoyconStick);
+ (short leftStickX, short leftStickY) = GetStickValues(ref rawState, _configuration.LeftJoyconStick);
(short rightStickX, short rightStickY) = GetStickValues(ref rawState, _configuration.RightJoyconStick);
- result.SetStick(StickInputId.Left, ConvertRawStickValue(leftStickX), ConvertRawStickValue(leftStickY));
+ result.SetStick(StickInputId.Left, ConvertRawStickValue(leftStickX), ConvertRawStickValue(leftStickY));
result.SetStick(StickInputId.Right, ConvertRawStickValue(rightStickX), ConvertRawStickValue(rightStickY));
}
@@ -120,6 +120,7 @@ namespace Ryujinx.Ava.Input
_buttonsUserMapping.Clear();
+#pragma warning disable IDE0055 // Disable formatting
// Left JoyCon
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftStick, (Key)_configuration.LeftJoyconStick.StickButton));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadUp, (Key)_configuration.LeftJoycon.DpadUp));
@@ -143,6 +144,7 @@ namespace Ryujinx.Ava.Input
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightTrigger, (Key)_configuration.RightJoycon.ButtonZr));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger1, (Key)_configuration.RightJoycon.ButtonSr));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger1, (Key)_configuration.RightJoycon.ButtonSl));
+#pragma warning restore IDE0055
}
}
@@ -198,4 +200,4 @@ namespace Ryujinx.Ava.Input
public void Dispose() { }
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs b/src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs
index edcdb52f..f12d0214 100644
--- a/src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs
+++ b/src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs
@@ -13,23 +13,23 @@ namespace Ryujinx.Ava.Input
internal class AvaloniaKeyboardDriver : IGamepadDriver
{
private static readonly string[] _keyboardIdentifers = new string[1] { "0" };
- private readonly Control _control;
+ private readonly Control _control;
private readonly HashSet<AvaKey> _pressedKeys;
public event EventHandler<KeyEventArgs> KeyPressed;
public event EventHandler<KeyEventArgs> KeyRelease;
- public event EventHandler<string> TextInput;
+ public event EventHandler<string> TextInput;
- public string DriverName => "AvaloniaKeyboardDriver";
+ public string DriverName => "AvaloniaKeyboardDriver";
public ReadOnlySpan<string> GamepadsIds => _keyboardIdentifers;
public AvaloniaKeyboardDriver(Control control)
{
- _control = control;
+ _control = control;
_pressedKeys = new HashSet<AvaKey>();
- _control.KeyDown += OnKeyPress;
- _control.KeyUp += OnKeyRelease;
+ _control.KeyDown += OnKeyPress;
+ _control.KeyUp += OnKeyRelease;
_control.TextInput += Control_TextInput;
_control.AddHandler(InputElement.TextInputEvent, Control_LastChanceTextInput, RoutingStrategies.Bubble);
}
@@ -47,13 +47,13 @@ namespace Ryujinx.Ava.Input
public event Action<string> OnGamepadConnected
{
- add { }
+ add { }
remove { }
}
public event Action<string> OnGamepadDisconnected
{
- add { }
+ add { }
remove { }
}
@@ -71,7 +71,7 @@ namespace Ryujinx.Ava.Input
{
if (disposing)
{
- _control.KeyUp -= OnKeyPress;
+ _control.KeyUp -= OnKeyPress;
_control.KeyDown -= OnKeyRelease;
}
}
@@ -112,4 +112,4 @@ namespace Ryujinx.Ava.Input
Dispose(true);
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Ava/Input/AvaloniaKeyboardMappingHelper.cs b/src/Ryujinx.Ava/Input/AvaloniaKeyboardMappingHelper.cs
index 0cc04d0a..d30a7566 100644
--- a/src/Ryujinx.Ava/Input/AvaloniaKeyboardMappingHelper.cs
+++ b/src/Ryujinx.Ava/Input/AvaloniaKeyboardMappingHelper.cs
@@ -143,7 +143,7 @@ namespace Ryujinx.Ava.Input
AvaKey.OemBackslash,
// NOTE: invalid
- AvaKey.None
+ AvaKey.None,
};
private static readonly Dictionary<AvaKey, Key> _avaKeyMapping;
@@ -182,4 +182,4 @@ namespace Ryujinx.Ava.Input
return _avaKeyMapping.GetValueOrDefault(key, Key.Unknown);
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Ava/Input/AvaloniaMouse.cs b/src/Ryujinx.Ava/Input/AvaloniaMouse.cs
index 3a9c91c0..1aa2d586 100644
--- a/src/Ryujinx.Ava/Input/AvaloniaMouse.cs
+++ b/src/Ryujinx.Ava/Input/AvaloniaMouse.cs
@@ -10,12 +10,12 @@ namespace Ryujinx.Ava.Input
{
private AvaloniaMouseDriver _driver;
- public string Id => "0";
+ public string Id => "0";
public string Name => "AvaloniaMouse";
- public bool IsConnected => true;
- public GamepadFeaturesFlag Features => throw new NotImplementedException();
- public bool[] Buttons => _driver.PressedButtons;
+ public bool IsConnected => true;
+ public GamepadFeaturesFlag Features => throw new NotImplementedException();
+ public bool[] Buttons => _driver.PressedButtons;
public AvaloniaMouse(AvaloniaMouseDriver driver)
{
@@ -84,4 +84,4 @@ namespace Ryujinx.Ava.Input
_driver = null;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs b/src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs
index b7e5a4d9..e71bbf64 100644
--- a/src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs
+++ b/src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs
@@ -11,16 +11,16 @@ namespace Ryujinx.Ava.Input
{
internal class AvaloniaMouseDriver : IGamepadDriver
{
- private Control _widget;
- private bool _isDisposed;
- private Size _size;
+ private Control _widget;
+ private bool _isDisposed;
+ private Size _size;
private readonly TopLevel _window;
- public bool[] PressedButtons { get; }
+ public bool[] PressedButtons { get; }
public Vector2 CurrentPosition { get; private set; }
- public Vector2 Scroll { get; private set; }
+ public Vector2 Scroll { get; private set; }
- public string DriverName => "AvaloniaMouseDriver";
+ public string DriverName => "AvaloniaMouseDriver";
public ReadOnlySpan<string> GamepadsIds => new[] { "0" };
public AvaloniaMouseDriver(TopLevel window, Control parent)
@@ -28,14 +28,14 @@ namespace Ryujinx.Ava.Input
_widget = parent;
_window = window;
- _widget.PointerMoved += Parent_PointerMovedEvent;
- _widget.PointerPressed += Parent_PointerPressedEvent;
- _widget.PointerReleased += Parent_PointerReleasedEvent;
+ _widget.PointerMoved += Parent_PointerMovedEvent;
+ _widget.PointerPressed += Parent_PointerPressedEvent;
+ _widget.PointerReleased += Parent_PointerReleasedEvent;
_widget.PointerWheelChanged += Parent_PointerWheelChanged;
-
- _window.PointerMoved += Parent_PointerMovedEvent;
- _window.PointerPressed += Parent_PointerPressedEvent;
- _window.PointerReleased += Parent_PointerReleasedEvent;
+
+ _window.PointerMoved += Parent_PointerMovedEvent;
+ _window.PointerPressed += Parent_PointerPressedEvent;
+ _window.PointerReleased += Parent_PointerReleasedEvent;
_window.PointerWheelChanged += Parent_PointerWheelChanged;
PressedButtons = new bool[(int)MouseButton.Count];
@@ -47,13 +47,13 @@ namespace Ryujinx.Ava.Input
public event Action<string> OnGamepadConnected
{
- add { }
+ add { }
remove { }
}
public event Action<string> OnGamepadDisconnected
{
- add { }
+ add { }
remove { }
}
@@ -143,17 +143,17 @@ namespace Ryujinx.Ava.Input
_isDisposed = true;
- _widget.PointerMoved -= Parent_PointerMovedEvent;
- _widget.PointerPressed -= Parent_PointerPressedEvent;
- _widget.PointerReleased -= Parent_PointerReleasedEvent;
+ _widget.PointerMoved -= Parent_PointerMovedEvent;
+ _widget.PointerPressed -= Parent_PointerPressedEvent;
+ _widget.PointerReleased -= Parent_PointerReleasedEvent;
_widget.PointerWheelChanged -= Parent_PointerWheelChanged;
- _window.PointerMoved -= Parent_PointerMovedEvent;
- _window.PointerPressed -= Parent_PointerPressedEvent;
- _window.PointerReleased -= Parent_PointerReleasedEvent;
+ _window.PointerMoved -= Parent_PointerMovedEvent;
+ _window.PointerPressed -= Parent_PointerPressedEvent;
+ _window.PointerReleased -= Parent_PointerReleasedEvent;
_window.PointerWheelChanged -= Parent_PointerWheelChanged;
_widget = null;
}
}
-} \ No newline at end of file
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-10 16:29:51 +0000