Merge 6d78e71fc7 into 3ecc7819cc

Directory.Packages.props

@@ -3,6 +3,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
+    <PackageVersion Include="Alimer.Bindings.SDL" Version="3.7.1" />
     <PackageVersion Include="Avalonia" Version="11.0.13" />
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
     <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />

Ryujinx.sln

@@ -75,6 +75,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon", "src\Ryuj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Generators", "src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj", "{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Input.SDL3", "src\Ryujinx.Input.SDL3\Ryujinx.Input.SDL3.csproj", "{3BF24278-547D-42C2-9D43-182B978F54DD}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal", "src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj", "{C08931FA-1191-417A-864F-3882D93E683B}"
@@ -259,6 +261,10 @@ Global
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BF24278-547D-42C2-9D43-182B978F54DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BF24278-547D-42C2-9D43-182B978F54DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BF24278-547D-42C2-9D43-182B978F54DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BF24278-547D-42C2-9D43-182B978F54DD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs

@@ -56,6 +56,7 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
             return motionBackendType switch
             {
                 MotionInputBackendType.GamepadDriver => JsonSerializer.Deserialize(ref reader, _serializerContext.StandardMotionConfigController),
+                MotionInputBackendType.Handheld => JsonSerializer.Deserialize(ref reader, _serializerContext.StandardMotionConfigController),
                 MotionInputBackendType.CemuHook => JsonSerializer.Deserialize(ref reader, _serializerContext.CemuHookMotionConfigController),
                 _ => throw new InvalidOperationException($"Unknown backend type {motionBackendType}"),
             };
@@ -66,6 +67,7 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
             switch (value.MotionBackend)
             {
                 case MotionInputBackendType.GamepadDriver:
+                case MotionInputBackendType.Handheld:
                     JsonSerializer.Serialize(writer, value as StandardMotionConfigController, _serializerContext.StandardMotionConfigController);
                     break;
                 case MotionInputBackendType.CemuHook:

src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs

@@ -9,5 +9,6 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
         Invalid,
         GamepadDriver,
         CemuHook,
+        Handheld,
     }
 }

src/Ryujinx.Input.SDL3/Ryujinx.Input.SDL3.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
+    <PackageReference Include="Alimer.Bindings.SDL" />
+  </ItemGroup>
+
+</Project>

src/Ryujinx.Input.SDL3/SDL3MotionDriver.cs

@@ -0,0 +1,85 @@
+using SDL3;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using static SDL3.SDL3;
+
+namespace Ryujinx.Input.SDL3
+{
+    public unsafe class SDL3MotionDriver : IHandheld, IDisposable
+    {
+        private readonly Dictionary<SDL_SensorType, SDL_Sensor> sensors;
+        private bool _disposed;
+
+        public SDL3MotionDriver()
+        {
+            int result = SDL_Init(SDL_InitFlags.Sensor);
+            if (result < 0)
+            {
+                throw new InvalidOperationException($"SDL sensor initialization failed: {SDL_GetError()}");
+            }
+            sensors = SDL_GetSensors().ToArray().ToDictionary(SDL_GetSensorTypeForID, SDL_OpenSensor);
+        }
+
+        ~SDL3MotionDriver()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing && sensors != null)
+            {
+                foreach (var sensor in sensors.Values)
+                {
+                    if (sensor != IntPtr.Zero)
+                    {
+                        SDL_CloseSensor(sensor);
+                    }
+                }
+            }
+
+            _disposed = true;
+        }
+
+        public Vector3 GetMotionData(MotionInputId inputType)
+        {
+            ObjectDisposedException.ThrowIf(_disposed, this);
+
+            return inputType switch
+            {
+                MotionInputId.Gyroscope => GetSensorVector(SDL_SensorType.Gyro) * 180 / MathF.PI,
+                MotionInputId.Accelerometer => GetSensorVector(SDL_SensorType.Accel) / SDL_STANDARD_GRAVITY,
+                _ => Vector3.Zero
+            };
+        }
+
+        private Vector3 GetSensorVector(SDL_SensorType sensorType)
+        {
+            if (!sensors.TryGetValue(sensorType, out SDL_Sensor sensor))
+            {
+                return Vector3.Zero;
+            }
+
+            var data = stackalloc float[3];
+            if (SDL_GetSensorData(sensor, data, 3) < 0)
+            {
+                return Vector3.Zero;
+            }
+
+            return new Vector3(data[0], data[1], data[2]);
+        }
+    }
+}

src/Ryujinx.Input/HLE/InputManager.cs

@@ -2,12 +2,13 @@ using System;
 
 namespace Ryujinx.Input.HLE
 {
-    public class InputManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver)
+    public class InputManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IHandheld handheld)
         : IDisposable
     {
         public IGamepadDriver KeyboardDriver { get; } = keyboardDriver;
         public IGamepadDriver GamepadDriver { get; } = gamepadDriver;
         public IGamepadDriver MouseDriver { get; private set; }
+        public IHandheld Handheld { get; } = handheld;
 
         public void SetMouseDriver(IGamepadDriver mouseDriver)
         {
@@ -18,7 +19,7 @@ namespace Ryujinx.Input.HLE
 
         public NpadManager CreateNpadManager()
         {
-            return new NpadManager(KeyboardDriver, GamepadDriver, MouseDriver);
+            return new NpadManager(KeyboardDriver, GamepadDriver, MouseDriver, Handheld);
         }
 
         public TouchScreenManager CreateTouchScreenManager()
@@ -38,6 +39,7 @@ namespace Ryujinx.Input.HLE
                 KeyboardDriver?.Dispose();
                 GamepadDriver?.Dispose();
                 MouseDriver?.Dispose();
+                Handheld?.Dispose();
             }
         }
 

src/Ryujinx.Input/HLE/NpadController.cs

@@ -218,12 +218,14 @@ namespace Ryujinx.Input.HLE
         public string Id { get; private set; }
 
         private readonly CemuHookClient _cemuHookClient;
+        private readonly IHandheld _handheld;
 
-        public NpadController(CemuHookClient cemuHookClient)
+        public NpadController(CemuHookClient cemuHookClient, IHandheld handheld)
         {
             State = default;
             Id = null;
             _cemuHookClient = cemuHookClient;
+            _handheld = handheld;
         }
 
         public bool UpdateDriverConfiguration(IGamepadDriver gamepadDriver, InputConfig config)
@@ -287,6 +289,18 @@ namespace Ryujinx.Input.HLE
 
                 if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Motion.EnableMotion)
                 {
+                    if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.Handheld)
+                    {
+                        Vector3 accelerometer = _handheld.GetMotionData(MotionInputId.Accelerometer);
+                        Vector3 gyroscope = _handheld.GetMotionData(MotionInputId.Gyroscope);
+
+                        accelerometer = new Vector3(accelerometer.X, -accelerometer.Z, accelerometer.Y);
+                        gyroscope = new Vector3(gyroscope.X, -gyroscope.Z, gyroscope.Y);
+
+                        _leftMotionInput.Update(accelerometer, gyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
+                        _rightMotionInput = _leftMotionInput;
+                    }
+
                     if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.GamepadDriver)
                     {
                         if (gamepad.Features.HasFlag(GamepadFeaturesFlag.Motion))

src/Ryujinx.Input/HLE/NpadManager.cs

@@ -31,6 +31,7 @@ namespace Ryujinx.Input.HLE
         private readonly IGamepadDriver _keyboardDriver;
         private readonly IGamepadDriver _gamepadDriver;
         private readonly IGamepadDriver _mouseDriver;
+        private readonly IHandheld _handheld;
         private bool _isDisposed;
 
         private List<InputConfig> _inputConfig;
@@ -38,7 +39,7 @@ namespace Ryujinx.Input.HLE
         private bool _enableMouse;
         private Switch _device;
 
-        public NpadManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IGamepadDriver mouseDriver)
+        public NpadManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IGamepadDriver mouseDriver, IHandheld handheld)
         {
             _controllers = new NpadController[MaxControllers];
             _cemuHookClient = new CemuHookClient(this);
@@ -47,6 +48,7 @@ namespace Ryujinx.Input.HLE
             _gamepadDriver = gamepadDriver;
             _mouseDriver = mouseDriver;
             _inputConfig = [];
+            _handheld = handheld;
 
             _gamepadDriver.OnGamepadConnected += HandleOnGamepadConnected;
             _gamepadDriver.OnGamepadDisconnected += HandleOnGamepadDisconnected;
@@ -139,7 +141,7 @@ namespace Ryujinx.Input.HLE
                     }
                     else
                     {
-                        controller = new(_cemuHookClient);
+                        controller = new(_cemuHookClient, _handheld);
                     }
 
                     bool isValid = DriverConfigurationUpdate(ref controller, inputConfigEntry);

src/Ryujinx.Input/IHandheld.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Numerics;
+
+namespace Ryujinx.Input
+{
+    public interface IHandheld : IDisposable
+    {
+        Vector3 GetMotionData(MotionInputId gyroscope);
+    }
+}

src/Ryujinx/Assets/locales.json

@@ -584,7 +584,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "UI를 숨긴 상태에서 게임 시작",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2259,7 +2259,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "PPTC 캐시 제거",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2284,7 +2284,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "앱의 모든 PPTC 캐시 파일 삭제",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2609,7 +2609,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "선택한 DLC 파일에서 RomFS 추출",
+        "ko_KR": "",
         "no_NO": "Pakk ut RomFS filene fra valgt DLC fil",
         "pl_PL": "",
         "pt_BR": "",
@@ -2759,7 +2759,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "호환성 항목 표시",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2784,7 +2784,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "일반적으로 도움말 메뉴를 통해 접근할 수 있는 호환성 목록에 선택한 게임을 표시합니다.",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2809,7 +2809,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "게임 통계 표시",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2834,7 +2834,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "그리드 보기 레이아웃에서 누락된 현재 선택된 게임에 대한 다양한 정보를 표시합니다.",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -3609,7 +3609,7 @@
         "he_IL": "",
         "it_IT": "Aggiornamenti e DLC che fanno riferimento a file mancanti verranno disabilitati automaticamente",
         "ja_JP": "",
-        "ko_KR": "누락된 파일을 참조하는 DLC 및 업데이트가 자동으로 불러오기 취소",
+        "ko_KR": "누락된 파일을 참조하는 DLC 및 업데이트가 자동으로 언로드",
         "no_NO": "DLC og oppdateringer som henviser til manglende filer, vil bli lastet ned automatisk",
         "pl_PL": "",
         "pt_BR": "DLCs e Atualizações que se referem a arquivos ausentes serão descarregadas automaticamente",
@@ -4384,7 +4384,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "스웨덴어",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -4409,7 +4409,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "노르웨이어",
+        "ko_KR": "",
         "no_NO": "Norsk",
         "pl_PL": "",
         "pt_BR": "",
@@ -4484,7 +4484,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "매치 시스템 시간",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -6122,56 +6122,6 @@
         "zh_TW": "關閉"
       }
     },
-    {
-      "ID": "SettingsButtonReset",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Reset Settings",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsButtonResetConfirm",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "I want to reset my settings.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "SettingsButtonOk",
       "Translations": {
@@ -7897,6 +7847,31 @@
         "zh_TW": "使用與 CemuHook 相容的體感"
       }
     },
+    {
+      "ID": "ControllerSettingsMotionUseHandheldCompatibleMotion",
+      "Translations": {
+        "ar_SA": "استخدام الحركة المتوافقة مع Hendheld",
+        "de_DE": "Hendheld kompatible Bewegungssteuerung",
+        "el_GR": "Κίνηση συμβατή με Hendheld",
+        "en_US": "Use Hendheld compatible motion",
+        "es_ES": "Usar movimiento compatible con Hendheld",
+        "fr_FR": "Utiliser un capteur de mouvements Hendheld",
+        "he_IL": "השתמש בתנועת Hendheld תואמת ",
+        "it_IT": "Usa sensore compatibile con Hendheld",
+        "ja_JP": "Hendheld 互換モーションを使用",
+        "ko_KR": "Hendheld 호환 모션 사용",
+        "no_NO": "Bruk Hendheld kompatibel bevegelse",
+        "pl_PL": "Użyj ruchu zgodnego z Hendheld",
+        "pt_BR": "Usar sensor compatível com Hendheld",
+        "ru_RU": "Включить совместимость с Hendheld",
+        "sv_SE": "Använd Hendheld-kompatibel rörelse",
+        "th_TH": "ใช้การเคลื่อนไหวที่เข้ากันได้กับ Hendheld",
+        "tr_TR": "Hendheld uyumlu hareket kullan",
+        "uk_UA": "Використовувати рух, сумісний з Hendheld",
+        "zh_CN": "使用 Hendheld 兼容的体感协议",
+        "zh_TW": "使用與 Hendheld 相容的體感"
+      }
+    },
     {
       "ID": "ControllerSettingsMotionControllerSlot",
       "Translations": {
@@ -8084,7 +8059,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "비활성화",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -8109,7 +8084,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "레인보우",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -8134,7 +8109,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "레인보우 속도",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -8159,7 +8134,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "색상",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -13409,7 +13384,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "다음에서 모든 PPTC 데이터를 제거하려고 합니다:\n\n{0}\n\n계속하시겠습니까?",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -19409,7 +19384,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "LED 설정",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -22334,7 +22309,7 @@
         "he_IL": "ממשק רשת",
         "it_IT": "Interfaccia di rete:",
         "ja_JP": "ネットワークインタフェース:",
-        "ko_KR": "네트워크 인터페이스 :",
+        "ko_KR": "네트워크 인터페이스:",
         "no_NO": "Nettverksgrensesnitt",
         "pl_PL": "Interfejs sieci:",
         "pt_BR": "Interface de rede:",
@@ -23309,7 +23284,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "최종 업데이트 : {0}",
+        "ko_KR": "",
         "no_NO": "Sist oppdatert: {0}",
         "pl_PL": "",
         "pt_BR": "",
@@ -23547,131 +23522,6 @@
         "zh_TW": "無法啟動"
       }
     },
-    {
-      "ID": "CompatibilityListPlayableTooltip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Boots and plays without any crashes or GPU bugs of any kind, and at a speed fast enough to reasonably enjoy on an average PC.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "CompatibilityListIngameTooltip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Boots and goes in-game but suffers from one or more of the following: crashes, deadlocks, GPU bugs, distractingly bad audio, or is simply too slow. Game still might able to be played all the way through, but not as the game is intended to play.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "CompatibilityListMenusTooltip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Boots and goes past the title screen but does not make it into main gameplay.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "CompatibilityListBootsTooltip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Boots but does not make it past the title screen.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "CompatibilityListNothingTooltip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Does not boot or shows no signs of activity.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "ExtractAocListHeader",
       "Translations": {
@@ -23684,7 +23534,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "추출할 DLC 선택",
+        "ko_KR": "",
         "no_NO": "Velg en DLC og hente ut",
         "pl_PL": "",
         "pt_BR": "",

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -23,6 +23,7 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
 using Ryujinx.Input.SDL2;
+using Ryujinx.Input.SDL3;
 using Ryujinx.SDL2.Common;
 using System;
 using System.Collections.Generic;
@@ -182,7 +183,7 @@ namespace Ryujinx.Headless
             _accountManager = new AccountManager(_libHacHorizonManager.RyujinxClient, option.UserProfile);
             _userChannelPersistence = new UserChannelPersistence();
 
-            _inputManager = new InputManager(new SDL2KeyboardDriver(), new SDL2GamepadDriver());
+            _inputManager = new InputManager(new SDL2KeyboardDriver(), new SDL2GamepadDriver(), new SDL3MotionDriver());
 
             GraphicsConfig.EnableShaderCache = !option.DisableShaderCache;
 

src/Ryujinx/Ryujinx.csproj

@@ -76,6 +76,7 @@
     <ProjectReference Include="..\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj" />
     <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
     <ProjectReference Include="..\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
+    <ProjectReference Include="..\Ryujinx.Input.SDL3\Ryujinx.Input.SDL3.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
     <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />

src/Ryujinx/UI/Controls/ApplicationDataView.axaml

@@ -41,12 +41,13 @@
                             HorizontalAlignment="Left"
                             Orientation="Vertical"
                             Spacing="5">
-                    <StackPanel Orientation="Horizontal" IsVisible="{Binding AppData.HasPlayabilityInfo}">
+                    <StackPanel Orientation="Horizontal">
                         <TextBlock Padding="0, 0, 5, 0" Text="{ext:Locale GameListHeaderCompatibilityStatus}" />
                         <Button
                             Click="PlayabilityStatus_OnClick"
                             HorizontalContentAlignment="Left"
                             VerticalAlignment="Center"
+                            IsVisible="{Binding AppData.HasPlayabilityInfo}"
                             Background="{DynamicResource AppListBackgroundColor}"
                             Padding="0">
                             <TextBlock
@@ -54,7 +55,6 @@
                                 Tag="{Binding AppData.IdString}"
                                 Text="{Binding AppData.LocalizedStatus}"
                                 Foreground="{Binding AppData.PlayabilityStatus, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
-                                ToolTip.Tip="{Binding AppData.LocalizedStatusTooltip}"
                                 TextAlignment="Start"
                                 TextWrapping="Wrap" />
                             <Button.Styles>

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -93,8 +93,7 @@
                                             IsVisible="{Binding HasPlayabilityInfo}"
                                             Background="{DynamicResource AppListBackgroundColor}"
                                             Margin="-1, 0, 0, 0"
-                                            Padding="0"
+                                            Padding="0" >
-                                            ToolTip.Tip="{Binding LocalizedStatusTooltip}">
                                             <TextBlock
                                                 Margin="1.5"
                                                 Tag="{Binding IdString}"

src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs

@@ -10,6 +10,7 @@ namespace Ryujinx.Ava.UI.Models.Input
     public partial class GamepadInputConfig : BaseModel
     {
         public bool EnableCemuHookMotion { get; set; }
+        public bool EnableHandheldMotion { get; set; }
         public string DsuServerHost { get; set; }
         public int DsuServerPort { get; set; }
         public int Slot { get; set; }
@@ -162,7 +163,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     EnableMotion = controllerInput.Motion.EnableMotion;
                     GyroDeadzone = controllerInput.Motion.GyroDeadzone;
                     Sensitivity = controllerInput.Motion.Sensitivity;
-
+                    EnableHandheldMotion = controllerInput.Motion.MotionBackend == MotionInputBackendType.Handheld;
                     if (controllerInput.Motion is CemuHookMotionConfigController cemuHook)
                     {
                         EnableCemuHookMotion = true;
@@ -285,7 +286,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                 config.Motion = new StandardMotionConfigController
                 {
                     EnableMotion = EnableMotion,
-                    MotionBackend = MotionInputBackendType.GamepadDriver,
+                    MotionBackend = EnableHandheldMotion ? MotionInputBackendType.Handheld : MotionInputBackendType.GamepadDriver,
                     GyroDeadzone = GyroDeadzone,
                     Sensitivity = Sensitivity,
                 };

src/Ryujinx/UI/ViewModels/Input/MotionInputViewModel.cs

@@ -18,6 +18,34 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         [ObservableProperty] private double _gyroDeadzone;
 
-        [ObservableProperty] private bool _enableCemuHookMotion;
+        private bool _enableCemuHookMotion;
+        public bool EnableCemuHookMotion
+        {
+            get => _enableCemuHookMotion;
+            set
+            {
+                if (value)
+                {
+                    EnableHandheldMotion = false;
+                }
+                _enableCemuHookMotion = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private bool _enableHandheldMotion;
+        public bool EnableHandheldMotion
+        {
+            get => _enableHandheldMotion;
+            set
+            {
+                if (value)
+                {
+                    EnableCemuHookMotion = false;
+                }
+                _enableHandheldMotion = value;
+                OnPropertyChanged();
+            }
+        }
     }
 }

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -2,7 +2,7 @@ using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
+using Gommon;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -28,6 +28,8 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Net.NetworkInformation;
+using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
 
@@ -720,25 +722,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             CloseWindow?.Invoke();
         }
 
-        [ObservableProperty] private bool _wantsToReset;
-
-        public AsyncRelayCommand ResetButton => Commands.Create(async () =>
-        {
-            if (!WantsToReset) return;
-            
-            CloseWindow?.Invoke();
-            ConfigurationState.Instance.LoadDefault();
-            ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
-            RyujinxApp.MainWindow.LoadApplications();
-
-            await ContentDialogHelper.CreateInfoDialog(
-                $"Your {RyujinxApp.FullAppName} configuration has been reset.",
-                "",
-                string.Empty,
-                LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
-                "Configuration Reset");
-        });
-
         public void CancelButton()
         {
             RevertIfNotSaved();

src/Ryujinx/UI/Views/Input/MotionInputView.axaml

@@ -61,6 +61,17 @@
                     Margin="5, 0"
                     Text="{Binding GyroDeadzone, StringFormat=\{0:0.00\}}" />
             </StackPanel>
+            <Separator
+                Height="1"
+                Margin="0,5" />
+            <CheckBox
+                Margin="5"
+                IsChecked="{Binding EnableHandheldMotion}">
+                <TextBlock
+                    Margin="0,3,0,0"
+                    VerticalAlignment="Center"
+                    Text="{ext:Locale ControllerSettingsMotionUseHandheldCompatibleMotion}" />
+            </CheckBox>
             <Separator
                 Height="1"
                 Margin="0,5" />

src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs

@@ -30,6 +30,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                 Sensitivity = config.Sensitivity,
                 GyroDeadzone = config.GyroDeadzone,
                 EnableCemuHookMotion = config.EnableCemuHookMotion,
+                EnableHandheldMotion = config.EnableHandheldMotion,
             };
 
             InitializeComponent();
@@ -58,6 +59,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                 config.DsuServerHost = content._viewModel.DsuServerHost;
                 config.DsuServerPort = content._viewModel.DsuServerPort;
                 config.EnableCemuHookMotion = content._viewModel.EnableCemuHookMotion;
+                config.EnableHandheldMotion = content._viewModel.EnableHandheldMotion;
                 config.MirrorInput = content._viewModel.MirrorInput;
             };
 

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -29,6 +29,7 @@ using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.Input.HLE;
 using Ryujinx.Input.SDL2;
+using Ryujinx.Input.SDL3;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -107,7 +108,7 @@ namespace Ryujinx.Ava.UI.Windows
 
             if (Program.PreviewerDetached)
             {
-                InputManager = new InputManager(new AvaloniaKeyboardDriver(this), new SDL2GamepadDriver());
+                InputManager = new InputManager(new AvaloniaKeyboardDriver(this), new SDL2GamepadDriver(), new SDL3MotionDriver());
 
                 _ = this.GetObservable(IsActiveProperty).Subscribe(it => ViewModel.IsActive = it);
                 this.ScalingChanged += OnScalingChanged;

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -108,36 +108,24 @@
                 </Style>
             </ui:NavigationView.Styles>
         </ui:NavigationView>
-        <Grid Grid.Row="2"
+        <ReversibleStackPanel
-              ColumnDefinitions="Auto,*,Auto">
+            Grid.Row="2"
-            <StackPanel Grid.Column="0" Orientation="Horizontal">
+            Margin="10"
-                <Button
+            Spacing="10"
-                    IsEnabled="{Binding WantsToReset}"
+            Orientation="Horizontal"
-                    Margin="10"
+            HorizontalAlignment="Right"
-                    Content="{ext:Locale SettingsButtonReset}"
+            ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
-                    Command="{Binding ResetButton}" />
+            <Button
-                <CheckBox IsChecked="{Binding WantsToReset}"/>
+                Classes="accent"
-                <TextBlock Text="{ext:Locale SettingsButtonResetConfirm}"/>
+                Content="{ext:Locale SettingsButtonOk}"
-            </StackPanel>
+                Command="{Binding OkButton}" />
-            <ReversibleStackPanel
+            <Button
-                Grid.Column="2"
+                HotKey="Escape"
-                Margin="10"
+                Content="{ext:Locale SettingsButtonCancel}"
-                Spacing="10"
+                Command="{Binding CancelButton}" />
-                Orientation="Horizontal"
+            <Button
-                HorizontalAlignment="Right"
+                Content="{ext:Locale SettingsButtonApply}"
-                ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
+                Command="{Binding ApplyButton}" />
-                <Button
+        </ReversibleStackPanel>
-                    Classes="accent"
-                    Content="{ext:Locale SettingsButtonOk}"
-                    Command="{Binding OkButton}" />
-                <Button
-                    HotKey="Escape"
-                    Content="{ext:Locale SettingsButtonCancel}"
-                    Command="{Binding CancelButton}" />
-                <Button
-                    Content="{ext:Locale SettingsButtonApply}"
-                    Command="{Binding ApplyButton}" />
-            </ReversibleStackPanel>
-        </Grid>
     </Grid>
 </window:StyleableAppWindow>

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -46,19 +46,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                 : string.Empty;
 
         public LocaleKeys? PlayabilityStatus { get; set; }
-        public string LocalizedStatusTooltip =>
+        
-            PlayabilityStatus.HasValue 
-#pragma warning disable CS8509 // It is exhaustive for any value this property can contain.
-                ? LocaleManager.Instance[PlayabilityStatus!.Value switch
-#pragma warning restore CS8509
-                {
-                    LocaleKeys.CompatibilityListPlayable => LocaleKeys.CompatibilityListPlayableTooltip,
-                    LocaleKeys.CompatibilityListIngame => LocaleKeys.CompatibilityListIngameTooltip,
-                    LocaleKeys.CompatibilityListMenus => LocaleKeys.CompatibilityListMenusTooltip,
-                    LocaleKeys.CompatibilityListBoots => LocaleKeys.CompatibilityListBootsTooltip,
-                    LocaleKeys.CompatibilityListNothing => LocaleKeys.CompatibilityListNothingTooltip,
-                }]
-                : string.Empty;
         public int PlayerCount { get; set; }
         public int GameCount { get; set; }
 

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -100,25 +100,12 @@ namespace Ryujinx.Ava.Utilities.Compat
         public Optional<string> TitleId { get; }
         public string[] Labels { get; }
         public LocaleKeys? Status { get; }
-
-        public LocaleKeys? StatusDescription
-            => Status switch
-            {
-                LocaleKeys.CompatibilityListPlayable => LocaleKeys.CompatibilityListPlayableTooltip,
-                LocaleKeys.CompatibilityListIngame => LocaleKeys.CompatibilityListIngameTooltip,
-                LocaleKeys.CompatibilityListMenus => LocaleKeys.CompatibilityListMenusTooltip,
-                LocaleKeys.CompatibilityListBoots => LocaleKeys.CompatibilityListBootsTooltip,
-                LocaleKeys.CompatibilityListNothing => LocaleKeys.CompatibilityListNothingTooltip,
-                _ => null
-            };
-        
         public DateTime LastUpdated { get; }
 
         public string LocalizedLastUpdated =>
             LocaleManager.FormatDynamicValue(LocaleKeys.CompatibilityListLastUpdated, LastUpdated.Humanize());
-        
+
         public string LocalizedStatus => LocaleManager.Instance[Status!.Value];
-        public string LocalizedStatusDescription => LocaleManager.Instance[StatusDescription!.Value];
         public string FormattedTitleId => TitleId
             .OrElse(new string(' ', 16));
 

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml

@@ -64,8 +64,6 @@
                                            VerticalAlignment="Center"
                                            Text="{Binding LocalizedStatus}"
                                            Width="85"
-                                           Background="Transparent"
-                                           ToolTip.Tip="{Binding LocalizedStatusDescription}"
                                            Foreground="{Binding Status, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
                                            TextWrapping="NoWrap" />
                                 <TextBlock Grid.Column="3"