Undo a testing change

src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Common.Logging;
 using Ryujinx.SDL2.Common;
 using System;
 using System.Collections.Generic;
@@ -12,7 +11,6 @@ namespace Ryujinx.Input.SDL2
         private readonly Dictionary<int, string> _gamepadsInstanceIdsMapping;
         private readonly List<string> _gamepadsIds;
         private readonly Lock _lock = new();
-        private readonly SDL2JoyConPair _joyConPair;
 
         public ReadOnlySpan<string> GamepadsIds
         {
@@ -38,7 +36,7 @@ namespace Ryujinx.Input.SDL2
             SDL2Driver.Instance.Initialize();
             SDL2Driver.Instance.OnJoyStickConnected += HandleJoyStickConnected;
             SDL2Driver.Instance.OnJoystickDisconnected += HandleJoyStickDisconnected;
-            _joyConPair = new SDL2JoyConPair();
+
             // Add already connected gamepads
             int numJoysticks = SDL_NumJoysticks();
 
@@ -91,10 +89,6 @@ namespace Ryujinx.Input.SDL2
             lock (_lock)
             {
                 _gamepadsIds.Remove(id);
-                if (_joyConPair.GetGamepad(_gamepadsIds) == null)
-                {
-                    _gamepadsIds.Remove(_joyConPair.Id);
-                }
             }
 
             OnGamepadDisconnected?.Invoke(id);
@@ -126,13 +120,6 @@ namespace Ryujinx.Input.SDL2
                             _gamepadsIds.Insert(joystickDeviceId, id);
                         else
                             _gamepadsIds.Add(id);
-                        var powerLevel = SDL_JoystickCurrentPowerLevel(GetJoystickIndexByGamepadId(id));
-                        Logger.Info?.Print(LogClass.Hid, $"Gamepad connected: {id}, power level: {powerLevel}");
-                        if (_joyConPair.GetGamepad(_gamepadsIds) != null)
-                        {
-                            _gamepadsIds.Remove(_joyConPair.Id);
-                            _gamepadsIds.Add(_joyConPair.Id);
-                        }
                     }
 
                     OnGamepadConnected?.Invoke(id);
@@ -170,14 +157,6 @@ namespace Ryujinx.Input.SDL2
 
         public IGamepad GetGamepad(string id)
         {
-            if (id == _joyConPair.Id)
-            {
-                lock (_lock)
-                {
-                    return _joyConPair.GetGamepad(_gamepadsIds);
-                }
-            }
-
             int joystickIndex = GetJoystickIndexByGamepadId(id);
 
             if (joystickIndex == -1)

src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs

@@ -1,233 +0,0 @@
-using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.Common.Configuration.Hid.Controller;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.Threading;
-using static SDL2.SDL;
-
-namespace Ryujinx.Input.SDL2
-{
-    internal class SDL2JoyConPair : IGamepad
-    {
-        private IGamepad _left;
-        private IGamepad _right;
-
-        private StandardControllerInputConfig _configuration;
-        private readonly StickInputId[] _stickUserMapping =
-        [
-            StickInputId.Unbound,
-            StickInputId.Left,
-            StickInputId.Right
-        ];
-        private readonly record struct ButtonMappingEntry(GamepadButtonInputId To, GamepadButtonInputId From)
-        {
-            public bool IsValid => To is not GamepadButtonInputId.Unbound && From is not GamepadButtonInputId.Unbound;
-        }
-
-        private readonly List<ButtonMappingEntry> _buttonsUserMapping = new(20);
-
-        private readonly Lock _userMappingLock = new();
-
-        public GamepadFeaturesFlag Features => (_left?.Features ?? GamepadFeaturesFlag.None) | (_right?.Features ?? GamepadFeaturesFlag.None);
-
-        public string Id => "JoyConPair";
-
-        public string Name => "Nintendo Switch Joy-Con (L/R)";
-        private const string _leftName = "Nintendo Switch Joy-Con (L)";
-        private const string _rightName = "Nintendo Switch Joy-Con (R)";
-        public bool IsConnected => _left is { IsConnected: true } && _right is { IsConnected: true };
-
-        public void Dispose()
-        {
-            _left?.Dispose();
-            _right?.Dispose();
-        }
-        public GamepadStateSnapshot GetMappedStateSnapshot()
-        {
-            GamepadStateSnapshot rawState = GetStateSnapshot();
-            GamepadStateSnapshot result = default;
-
-            lock (_userMappingLock)
-            {
-                if (_buttonsUserMapping.Count == 0)
-                    return rawState;
-
-
-                // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
-                foreach (ButtonMappingEntry entry in _buttonsUserMapping)
-                {
-                    if (!entry.IsValid)
-                        continue;
-
-                    // Do not touch state of button already pressed
-                    if (!result.IsPressed(entry.To))
-                    {
-                        result.SetPressed(entry.To, rawState.IsPressed(entry.From));
-                    }
-                }
-
-                (float leftStickX, float leftStickY) = rawState.GetStick(_stickUserMapping[(int)StickInputId.Left]);
-                (float rightStickX, float rightStickY) = rawState.GetStick(_stickUserMapping[(int)StickInputId.Right]);
-
-                result.SetStick(StickInputId.Left, leftStickX, leftStickY);
-                result.SetStick(StickInputId.Right, rightStickX, rightStickY);
-            }
-
-            return result;
-        }
-
-        public Vector3 GetMotionData(MotionInputId inputId)
-        {
-            return inputId switch
-            {
-                MotionInputId.SecondAccelerometer => _right.GetMotionData(MotionInputId.Accelerometer),
-                MotionInputId.SecondGyroscope => _right.GetMotionData(MotionInputId.Gyroscope),
-                _ => _left.GetMotionData(inputId)
-            };
-        }
-
-        public GamepadStateSnapshot GetStateSnapshot()
-        {
-            return IGamepad.GetStateSnapshot(this);
-        }
-
-        public (float, float) GetStick(StickInputId inputId)
-        {
-            switch (inputId)
-            {
-                case StickInputId.Left:
-                    {
-                        (float x, float y) = _left.GetStick(StickInputId.Left);
-                        return (y, -x);
-                    }
-                case StickInputId.Right:
-                    {
-                        (float x, float y) = _right.GetStick(StickInputId.Left);
-                        return (-y, x);
-                    }
-                case StickInputId.Unbound:
-                case StickInputId.Count:
-                default:
-                    return (0, 0);
-            }
-        }
-
-        public bool IsPressed(GamepadButtonInputId inputId)
-        {
-            return inputId switch
-            {
-                GamepadButtonInputId.LeftStick => _left.IsPressed(GamepadButtonInputId.LeftStick),
-                GamepadButtonInputId.DpadUp => _left.IsPressed(GamepadButtonInputId.Y),
-                GamepadButtonInputId.DpadDown => _left.IsPressed(GamepadButtonInputId.A),
-                GamepadButtonInputId.DpadLeft => _left.IsPressed(GamepadButtonInputId.B),
-                GamepadButtonInputId.DpadRight => _left.IsPressed(GamepadButtonInputId.X),
-                GamepadButtonInputId.Minus => _left.IsPressed(GamepadButtonInputId.Start),
-                GamepadButtonInputId.LeftShoulder => _left.IsPressed(GamepadButtonInputId.Paddle2),
-                GamepadButtonInputId.LeftTrigger => _left.IsPressed(GamepadButtonInputId.Paddle4),
-                GamepadButtonInputId.SingleRightTrigger0 => _left.IsPressed(GamepadButtonInputId.LeftShoulder),
-                GamepadButtonInputId.SingleLeftTrigger0 => _left.IsPressed(GamepadButtonInputId.RightShoulder),
-
-                GamepadButtonInputId.RightStick => _right.IsPressed(GamepadButtonInputId.LeftStick),
-                GamepadButtonInputId.A => _right.IsPressed(GamepadButtonInputId.B),
-                GamepadButtonInputId.B => _right.IsPressed(GamepadButtonInputId.Y),
-                GamepadButtonInputId.X => _right.IsPressed(GamepadButtonInputId.A),
-                GamepadButtonInputId.Y => _right.IsPressed(GamepadButtonInputId.X),
-                GamepadButtonInputId.Plus => _right.IsPressed(GamepadButtonInputId.Start),
-                GamepadButtonInputId.RightShoulder => _right.IsPressed(GamepadButtonInputId.Paddle1),
-                GamepadButtonInputId.RightTrigger => _right.IsPressed(GamepadButtonInputId.Paddle3),
-                GamepadButtonInputId.SingleRightTrigger1 => _right.IsPressed(GamepadButtonInputId.LeftShoulder),
-                GamepadButtonInputId.SingleLeftTrigger1 => _right.IsPressed(GamepadButtonInputId.RightShoulder),
-
-                _ => false
-            };
-        }
-
-        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
-        {
-            if (lowFrequency != 0)
-            {
-                _right.Rumble(lowFrequency, lowFrequency, durationMs);
-            }
-            if (highFrequency != 0)
-            {
-                _left.Rumble(highFrequency, highFrequency, durationMs);
-            }
-            if (lowFrequency == 0 && highFrequency == 0)
-            {
-                _left.Rumble(0, 0, durationMs);
-                _right.Rumble(0, 0, durationMs);
-            }
-        }
-
-        public void SetConfiguration(InputConfig configuration)
-        {
-            lock (_userMappingLock)
-            {
-
-                _configuration = (StandardControllerInputConfig)configuration;
-                _left.SetConfiguration(configuration);
-                _right.SetConfiguration(configuration);
-
-                _buttonsUserMapping.Clear();
-
-                // First update sticks
-                _stickUserMapping[(int)StickInputId.Left] = (StickInputId)_configuration.LeftJoyconStick.Joystick;
-                _stickUserMapping[(int)StickInputId.Right] = (StickInputId)_configuration.RightJoyconStick.Joystick;
-
-                // Then left joycon
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftStick, (GamepadButtonInputId)_configuration.LeftJoyconStick.StickButton));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadUp, (GamepadButtonInputId)_configuration.LeftJoycon.DpadUp));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadDown, (GamepadButtonInputId)_configuration.LeftJoycon.DpadDown));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadLeft, (GamepadButtonInputId)_configuration.LeftJoycon.DpadLeft));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadRight, (GamepadButtonInputId)_configuration.LeftJoycon.DpadRight));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Minus, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonMinus));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftShoulder, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonL));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftTrigger, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonZl));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger0, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonSr));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger0, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonSl));
-
-                // Finally right joycon
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightStick, (GamepadButtonInputId)_configuration.RightJoyconStick.StickButton));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.A, (GamepadButtonInputId)_configuration.RightJoycon.ButtonA));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.B, (GamepadButtonInputId)_configuration.RightJoycon.ButtonB));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.X, (GamepadButtonInputId)_configuration.RightJoycon.ButtonX));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Y, (GamepadButtonInputId)_configuration.RightJoycon.ButtonY));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Plus, (GamepadButtonInputId)_configuration.RightJoycon.ButtonPlus));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightShoulder, (GamepadButtonInputId)_configuration.RightJoycon.ButtonR));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightTrigger, (GamepadButtonInputId)_configuration.RightJoycon.ButtonZr));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger1, (GamepadButtonInputId)_configuration.RightJoycon.ButtonSr));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger1, (GamepadButtonInputId)_configuration.RightJoycon.ButtonSl));
-
-                SetTriggerThreshold(_configuration.TriggerThreshold);
-            }
-
-        }
-
-        public void SetTriggerThreshold(float triggerThreshold)
-        {
-            _left.SetTriggerThreshold(triggerThreshold);
-            _right.SetTriggerThreshold(triggerThreshold);
-        }
-
-        public IGamepad GetGamepad(List<string> gamepadsIds)
-        {
-            this.Dispose();
-            var gamepadNames = gamepadsIds.Where(gamepadId => gamepadId != Id)
-                .Select((_, index) => SDL_GameControllerNameForIndex(index)).ToList();
-            int leftIndex = gamepadNames.IndexOf(_leftName);
-            int rightIndex = gamepadNames.IndexOf(_rightName);
-
-            if (leftIndex == -1 || rightIndex == -1)
-            {
-                return null;
-            }
-
-            nint leftGamepadHandle = SDL_GameControllerOpen(leftIndex);
-            nint rightGamepadHandle = SDL_GameControllerOpen(rightIndex);
-            _left = new SDL2Gamepad(leftGamepadHandle, gamepadsIds[leftIndex]);
-            _right = new SDL2Gamepad(rightGamepadHandle, gamepadsIds[leftIndex]);
-            return this;
-        }
-    }
-}

src/Ryujinx.Input/HLE/NpadController.cs

@@ -266,7 +266,6 @@ namespace Ryujinx.Input.HLE
             if (motionConfig.MotionBackend != MotionInputBackendType.CemuHook)
             {
                 _leftMotionInput = new MotionInput();
-                _rightMotionInput = new MotionInput();
             }
             else
             {
@@ -299,20 +298,7 @@ namespace Ryujinx.Input.HLE
 
                             if (controllerConfig.ControllerType == ConfigControllerType.JoyconPair)
                             {
-                                if (gamepad.Id== "JoyConPair")
-                                {
-                                    Vector3 rightAccelerometer = gamepad.GetMotionData(MotionInputId.SecondAccelerometer);
-                                    Vector3 rightGyroscope = gamepad.GetMotionData(MotionInputId.SecondGyroscope);
-
-                                    rightAccelerometer = new Vector3(rightAccelerometer.X, -rightAccelerometer.Z, rightAccelerometer.Y);
-                                    rightGyroscope = new Vector3(rightGyroscope.X, -rightGyroscope.Z, rightGyroscope.Y);
-
-                                    _rightMotionInput.Update(rightAccelerometer, rightGyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
-                                }
-                                else
-                                {
-                                    _rightMotionInput = _leftMotionInput;
-                                }
+                                _rightMotionInput = _leftMotionInput;
                             }
                         }
                     }
@@ -347,7 +333,6 @@ namespace Ryujinx.Input.HLE
                 // Reset states
                 State = default;
                 _leftMotionInput = null;
-                _rightMotionInput = null;
             }
         }
 

src/Ryujinx.Input/MotionInputId.cs

@@ -21,17 +21,5 @@ namespace Ryujinx.Input
         /// </summary>
         /// <remarks>Values are in degrees</remarks>
         Gyroscope,
-
-        /// <summary>
-        /// Second accelerometer.
-        /// </summary>
-        /// <remarks>Values are in m/s^2</remarks>
-        SecondAccelerometer,
-
-        /// <summary>
-        /// Second gyroscope.
-        /// </summary>
-        /// <remarks>Values are in degrees</remarks>
-        SecondGyroscope
     }
 }

src/Ryujinx/Assets/Styles/Themes.xaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ryu="clr-namespace:Ryujinx.Ava">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -52,5 +53,22 @@
             <Color x:Key="Unbounded">#FFFF4554</Color>
             <Color x:Key="Custom">#6483F5</Color>
         </ResourceDictionary>
+        <ResourceDictionary x:Key="{x:Static ryu:RyujinxApp.AmoledThemeVariant}">
+            <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
+                             Color="{DynamicResource DataGridSelectionColor}" />
+            <Color x:Key="ControlFillColorSecondary">#008AA8</Color>
+            <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
+            <Color x:Key="ThemeContentBackgroundColor">#FF000000</Color>
+            <Color x:Key="ThemeControlBorderColor">#2D000000</Color>
+            <Color x:Key="ThemeForegroundColor">#FFFFFFFF</Color>
+            <Color x:Key="MenuFlyoutPresenterBorderColor">#79000000</Color>
+            <Color x:Key="AppListBackgroundColor">#50000000</Color>
+            <Color x:Key="AppListHoverBackgroundColor">#40000000</Color>
+            <Color x:Key="SecondaryTextColor">#A0FFFFFF</Color>
+            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
+            <Color x:Key="Switch">#FF2EEAC9</Color>
+            <Color x:Key="Unbounded">#FFFF4554</Color>
+            <Color x:Key="Custom">#6483F5</Color>
+        </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>

src/Ryujinx/RyujinxApp.axaml.cs

@@ -98,6 +98,9 @@ namespace Ryujinx.Ava
 
         private void ThemeChanged_Event(object _, ReactiveEventArgs<string> rArgs) => ApplyConfiguredTheme(rArgs.NewValue);
 
+
+        public static readonly ThemeVariant AmoledThemeVariant = new("Amoled", ThemeVariant.Dark); 
+
         public void ApplyConfiguredTheme(string baseStyle)
         {
             try
@@ -116,6 +119,7 @@ namespace Ryujinx.Ava
                     "Auto" => DetectSystemTheme(),
                     "Light" => ThemeVariant.Light,
                     "Dark" => ThemeVariant.Dark,
+                    "AMOLED" => AmoledThemeVariant,
                     _ => ThemeVariant.Default,
                 };
             }

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -55,6 +55,7 @@
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             ClipToBounds="True"
+                            Background="{DynamicResource ThemeControlBorderColor}"
                             CornerRadius="5">
                             <Grid ColumnDefinitions="Auto,10,*,150,100">
                                 <Image
@@ -105,6 +106,7 @@
                                         Click="IdString_OnClick" 
                                         HorizontalContentAlignment="Left" 
                                         VerticalAlignment="Center"
+                                        
                                         Background="{DynamicResource AppListBackgroundColor}"
                                         Margin="-1, 0, 0, 0"
                                         Padding="0" >

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -547,6 +547,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 "Auto" => 0,
                 "Light" => 1,
                 "Dark" => 2,
+                "AMOLED" => 3,
                 _ => 0
             };
 
@@ -656,6 +657,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 0 => "Auto",
                 1 => "Light",
                 2 => "Dark",
+                3 => "AMOLED",
                 _ => "Auto"
             };
 

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml

@@ -77,6 +77,9 @@
                             <ComboBoxItem>
                                 <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
                             </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="AMOLED" />
+                            </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>