Adds gamepad exit hotkeys (plus and minus) to the input section

src/Ryujinx.Input.SDL2/SDL2Gamepad.cs

@@ -253,11 +253,23 @@ public GamepadStateSnapshot GetStateSnapshot()
             return IGamepad.GetStateSnapshot(this);
         }
 
+        private static bool hotButtonMinus = false;
+        private static bool hotExit = false;
+
+        public bool SpecialExit()
+        {
+            if (hotButtonMinus)
+            {
+                hotButtonMinus = false;
+                return hotExit;
+            }
+            return hotExit = false;
+        }
+
         public GamepadStateSnapshot GetMappedStateSnapshot()
         {
             GamepadStateSnapshot rawState = GetStateSnapshot();
             GamepadStateSnapshot result = default;
-
             lock (_userMappingLock)
             {
                 if (_buttonsUserMapping.Count == 0)
@@ -270,6 +282,28 @@ public GamepadStateSnapshot GetMappedStateSnapshot()
                     if (!entry.IsValid)
                         continue;
 
+                    if (GamepadButtonInputId.Minus == entry.To)
+                    {                      
+                        if (rawState.IsPressed(entry.From) && !hotButtonMinus)
+                        {
+                            hotButtonMinus = true;
+                        }
+                        else if (!result.IsPressed(entry.From) && hotButtonMinus)
+                        {
+                            hotButtonMinus = false;
+                        }
+                    }
+
+                    if (GamepadButtonInputId.Plus == entry.To)
+                    {
+                        if (rawState.IsPressed(entry.To) && hotButtonMinus)
+                        {
+
+                           hotExit = true;
+                        }
+
+                    }
+
                     // Do not touch state of button already pressed
                     if (!result.IsPressed(entry.To))
                     {
@@ -376,5 +410,7 @@ public bool IsPressed(GamepadButtonInputId inputId)
 
             return SDL_GameControllerGetButton(_gamepadHandle, _buttonsDriverMapping[(int)inputId]) == 1;
         }
+
+
     }
 }

src/Ryujinx.Input.SDL2/SDL2Keyboard.cs

@@ -329,6 +329,11 @@ public GamepadStateSnapshot GetMappedStateSnapshot()
             return result;
         }
 
+        public bool SpecialExit()
+        {
+            return false;
+        }
+
         public GamepadStateSnapshot GetStateSnapshot()
         {
             throw new NotSupportedException();

src/Ryujinx.Input.SDL2/SDL2Mouse.cs

@@ -25,6 +25,10 @@ public SDL2Mouse(SDL2MouseDriver driver)
         {
             _driver = driver;
         }
+        public bool SpecialExit()
+        {
+            return false;
+        }
 
         public Vector2 GetPosition()
         {

src/Ryujinx.Input/HLE/NpadController.cs

@@ -3,6 +3,7 @@
 using Ryujinx.Common.Configuration.Hid.Controller;
 using Ryujinx.Common.Configuration.Hid.Controller.Motion;
 using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.HOS.Services.Hid;
 using System;
 using System.Collections.Concurrent;
@@ -273,15 +274,21 @@ private void UpdateMotionInput(MotionConfigController motionConfig)
             }
         }
 
-        public void Update()
+        public bool Update()
         {
+
             // _gamepad may be altered by other threads
             var gamepad = _gamepad;
-
+            
             if (gamepad != null && GamepadDriver != null)
             {
                 State = gamepad.GetMappedStateSnapshot();
 
+                if (gamepad.SpecialExit())
+                {
+                    return true;
+                }
+
                 if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Motion.EnableMotion)
                 {
                     if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.GamepadDriver)
@@ -334,6 +341,7 @@ public void Update()
                 State = default;
                 _leftMotionInput = null;
             }
+            return false;
         }
 
         public GamepadInput GetHLEInputState()

src/Ryujinx.Input/HLE/NpadManager.cs

@@ -200,8 +200,10 @@ public void Initialize(Switch device, List<InputConfig> inputConfig, bool enable
             ReloadConfiguration(inputConfig, enableKeyboard, enableMouse);
         }
 
-        public void Update(float aspectRatio = 1)
+        public bool Update(float aspectRatio = 1)
         {
+            bool specialExit = false;
+
             lock (_lock)
             {
                 List<GamepadInput> hleInputStates = new();
@@ -225,9 +227,10 @@ public void Update(float aspectRatio = 1)
                         DriverConfigurationUpdate(ref controller, inputConfig);
 
                         controller.UpdateUserConfiguration(inputConfig);
-                        controller.Update();
-                        controller.UpdateRumble(_device.Hid.Npads.GetRumbleQueue(playerIndex));
 
+                        specialExit = controller.Update();  //hotkey press check
+                        controller.UpdateRumble(_device.Hid.Npads.GetRumbleQueue(playerIndex));
+
                         inputState = controller.GetHLEInputState();
 
                         inputState.Buttons |= _device.Hid.UpdateStickButtons(inputState.LStick, inputState.RStick);
@@ -315,6 +318,8 @@ public void Update(float aspectRatio = 1)
 
                 _device.TamperMachine.UpdateInput(hleInputStates);
             }
+
+            return specialExit;
         }
 
         internal InputConfig GetPlayerInputConfigByIndex(int index)

src/Ryujinx.Input/IGamepad.cs

@@ -79,6 +79,12 @@ public interface IGamepad : IDisposable
         /// <returns>A remapped snaphost of the state of the gamepad.</returns>
         GamepadStateSnapshot GetMappedStateSnapshot();
 
+        /// <summary>
+        /// Gets the state if the minus and plus buttons were pressed on the gamepad.
+        /// </summary>
+        /// <returns>returns true if the buttons were pressed.</returns>
+        bool SpecialExit();
+
         /// <summary>
         /// Get a snaphost of the state of the gamepad.
         /// </summary>

src/Ryujinx/AppHost.cs

@@ -18,6 +18,7 @@
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Views.Main;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
@@ -70,6 +71,7 @@ internal class AppHost
         private const float MaxResolutionScale = 4.0f; // Max resolution hotkeys can scale to before wrapping.
         private const int TargetFps = 60;
         private const float VolumeDelta = 0.05f;
+        static bool SpecialExit = false;
 
         private static readonly Cursor _invisibleCursor = new(StandardCursorType.None);
         private readonly nint _invisibleCursorWin;
@@ -96,6 +98,7 @@ internal class AppHost
         private bool _isCursorInRenderer = true;
         private bool _ignoreCursorState = false;
 
+
         private enum CursorStates
         {
             CursorIsHidden,
@@ -503,10 +506,15 @@ public void Start()
             _viewModel.Volume = ConfigurationState.Instance.System.AudioVolume.Value;
 
             MainLoop();
-
+           
             Exit();
         }
 
+        public bool IsSpecialExit()
+        {
+            return SpecialExit;
+        }
+
         private void UpdateIgnoreMissingServicesState(object sender, ReactiveEventArgs<bool> args)
         {
             if (Device != null)
@@ -589,6 +597,7 @@ private void Exit()
 
             _isStopped = true;
             Stop();
+
         }
 
         public void DisposeContext()
@@ -1023,12 +1032,12 @@ private void Window_BoundsChanged(object sender, Size e)
         }
 
         private void MainLoop()
-        {
+        {           
             while (UpdateFrame())
             {
-                // Polling becomes expensive if it's not slept.
                 Thread.Sleep(1);
             }
+
         }
 
         private void RenderLoop()
@@ -1135,6 +1144,7 @@ public void UpdateStatus()
             string dockedMode = ConfigurationState.Instance.System.EnableDockedMode ? LocaleManager.Instance[LocaleKeys.Docked] : LocaleManager.Instance[LocaleKeys.Handheld];
             string vSyncMode = Device.VSyncMode.ToString();
 
+
             UpdateShaderCount();
 
             if (GraphicsConfig.ResScale != 1)
@@ -1200,7 +1210,17 @@ private bool UpdateFrame()
                 return false;
             }
 
-            NpadManager.Update(ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat());
+            if (NpadManager.Update(ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat()))
+            {
+                if (ConfigurationState.Instance.Hid.specialExitEmulator.Value == 1)
+                {
+                    SpecialExit = true; // close App
+                }
+                if (ConfigurationState.Instance.Hid.specialExitEmulator.Value > 0)
+                {
+                    _isActive = false; //close game
+                }
+            }
 
             if (_viewModel.IsActive)
             {
@@ -1335,6 +1355,8 @@ private bool UpdateFrame()
 
             Device.Hid.DebugPad.Update();
 
+
+
             return true;
         }