UI: Intel Mac warning

Upon launch, shows a warning about using an Intel Mac. This will only show once every boot. You can only turn it off by getting a better system.

docs/compatibility.csv

@@ -3348,7 +3348,7 @@
 01001C400482C000,"Wunderling DX",audio;crash,ingame,2022-09-10 13:20:12
 01003B401148E000,"Wurroom",,playable,2020-10-07 22:46:21
 010081700EDF4000,"WWE 2K Battlegrounds",nvdec;online-broken;UE4,playable,2022-10-07 12:44:40
-010009800203E000,"WWE 2K18",nvdec,playable,2023-10-21 17:22:01
+010009800203E000,"WWE 2K18",nvdec;online-broken,ingame,2025-01-17 11:36:56
 0100DF100B97C000,"X-Morph: Defense",,playable,2020-06-22 11:05:31
 0100D0B00FB74000,"XCOM® 2 Collection",gpu;crash,ingame,2022-10-04 09:38:30
 0100CC9015360000,"XEL",gpu,ingame,2022-10-03 10:19:39

src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs

@@ -176,9 +176,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                         AllowedCpuCoresMask = GetMaskFromMinMax(lowestCpuCore, highestCpuCore);
                         AllowedThreadPriosMask = GetMaskFromMinMax(lowestThreadPrio, highestThreadPrio);
 
-                        if (isApplication && lowestCpuCore == 0 && highestCpuCore != 2)
+                        if (isApplication)
-                            Ryujinx.Common.Logging.Logger.Error?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}! Report this to @LotP on the Ryujinx/Ryubing discord server (discord.gg/ryujinx)!");
-                        else if (isApplication)
                             Ryujinx.Common.Logging.Logger.Info?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}");
 
                         break;

src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs

@@ -703,6 +703,18 @@ namespace Ryujinx.HLE.HOS.Services.Hid
             return ResultCode.Success;
         }
         
+        [CommandCmif(92)]
+        // SetGestureOutputRanges(pid, ushort Unknown0)
+        public ResultCode SetGestureOutputRanges(ServiceCtx context)
+        {
+            ulong pid = context.Request.HandleDesc.PId;
+            ushort unknown0 = context.RequestData.ReadUInt16();
+
+            Logger.Stub?.PrintStub(LogClass.ServiceHid, new { pid, unknown0 });
+
+            return ResultCode.Success;
+        }
+
         [CommandCmif(100)]
         // SetSupportedNpadStyleSet(pid, nn::applet::AppletResourceUserId, nn::hid::NpadStyleTag)
         public ResultCode SetSupportedNpadStyleSet(ServiceCtx context)

src/Ryujinx.Input.SDL2/SDL2Gamepad.cs

@@ -253,23 +253,11 @@ namespace Ryujinx.Input.SDL2
             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)
@@ -282,28 +270,6 @@ namespace Ryujinx.Input.SDL2
                     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))
                     {
@@ -410,7 +376,5 @@ namespace Ryujinx.Input.SDL2
 
             return SDL_GameControllerGetButton(_gamepadHandle, _buttonsDriverMapping[(int)inputId]) == 1;
         }
-
-
     }
 }

src/Ryujinx.Input.SDL2/SDL2Keyboard.cs

@@ -329,11 +329,6 @@ namespace Ryujinx.Input.SDL2
             return result;
         }
 
-        public bool SpecialExit()
-        {
-            return false;
-        }
-
         public GamepadStateSnapshot GetStateSnapshot()
         {
             throw new NotSupportedException();

src/Ryujinx.Input.SDL2/SDL2Mouse.cs

@@ -25,10 +25,6 @@ namespace Ryujinx.Input.SDL2
         {
             _driver = driver;
         }
-        public bool SpecialExit()
-        {
-            return false;
-        }
 
         public Vector2 GetPosition()
         {

src/Ryujinx.Input/HLE/NpadController.cs

@@ -3,7 +3,6 @@ using Ryujinx.Common.Configuration.Hid;
 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;
@@ -274,9 +273,8 @@ namespace Ryujinx.Input.HLE
             }
         }
 
-        public bool Update()
+        public void Update()
         {
-            
             // _gamepad may be altered by other threads
             var gamepad = _gamepad;
 
@@ -284,11 +282,6 @@ namespace Ryujinx.Input.HLE
             {
                 State = gamepad.GetMappedStateSnapshot();
 
-                if (gamepad.SpecialExit())
-                {
-                    return true;
-                }
-
                 if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Motion.EnableMotion)
                 {
                     if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.GamepadDriver)
@@ -341,7 +334,6 @@ namespace Ryujinx.Input.HLE
                 State = default;
                 _leftMotionInput = null;
             }
-            return false;
         }
 
         public GamepadInput GetHLEInputState()

src/Ryujinx.Input/HLE/NpadManager.cs

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

src/Ryujinx.Input/IGamepad.cs

@@ -79,12 +79,6 @@ namespace Ryujinx.Input
         /// <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,7 +18,6 @@ using Ryujinx.Ava.UI.Helpers;
 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;
@@ -71,7 +70,6 @@ namespace Ryujinx.Ava
         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;
@@ -98,7 +96,6 @@ namespace Ryujinx.Ava
         private bool _isCursorInRenderer = true;
         private bool _ignoreCursorState = false;
 
-
         private enum CursorStates
         {
             CursorIsHidden,
@@ -510,11 +507,6 @@ namespace Ryujinx.Ava
             Exit();
         }
 
-        public bool IsSpecialExit()
-        {
-            return SpecialExit;
-        }
-
         private void UpdateIgnoreMissingServicesState(object sender, ReactiveEventArgs<bool> args)
         {
             if (Device != null)
@@ -597,7 +589,6 @@ namespace Ryujinx.Ava
 
             _isStopped = true;
             Stop();
-            
         }
 
         public void DisposeContext()
@@ -1144,7 +1135,6 @@ namespace Ryujinx.Ava
             string dockedMode = ConfigurationState.Instance.System.EnableDockedMode ? LocaleManager.Instance[LocaleKeys.Docked] : LocaleManager.Instance[LocaleKeys.Handheld];
             string vSyncMode = Device.VSyncMode.ToString();
 
-
             UpdateShaderCount();
 
             if (GraphicsConfig.ResScale != 1)
@@ -1210,17 +1200,7 @@ namespace Ryujinx.Ava
                 return false;
             }
 
-            if (NpadManager.Update(ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat()))
+            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)
             {
@@ -1355,8 +1335,6 @@ namespace Ryujinx.Ava
 
             Device.Hid.DebugPad.Update();
 
-
-
             return true;
         }
 

src/Ryujinx/DiscordIntegrationModule.cs

@@ -1,4 +1,5 @@
 using DiscordRPC;
+using Gommon;
 using Humanizer;
 using Humanizer.Localisation;
 using Ryujinx.Ava.Utilities.AppLibrary;
@@ -45,16 +46,7 @@ namespace Ryujinx.Ava
             };
 
             ConfigurationState.Instance.EnableDiscordIntegration.Event += Update;
-            TitleIDs.CurrentApplication.Event += (_, e) =>
+            TitleIDs.CurrentApplication.Event += (_, e) => Use(e.NewValue);
-            {
-                if (e.NewValue)
-                    SwitchToPlayingState(
-                        ApplicationLibrary.LoadAndSaveMetaData(e.NewValue),
-                        Switch.Shared.Processes.ActiveApplication
-                    );
-                else 
-                    SwitchToMainState();
-            };
         }
 
         private static void Update(object sender, ReactiveEventArgs<bool> evnt)
@@ -75,11 +67,23 @@ namespace Ryujinx.Ava
                     _discordClient = new DiscordRpcClient(ApplicationId);
 
                     _discordClient.Initialize();
-                    _discordClient.SetPresence(_discordPresenceMain);
+
+                    Use(TitleIDs.CurrentApplication);
                 }
             }
         }
 
+        public static void Use(Optional<string> titleId)
+        {
+            if (titleId.TryGet(out string tid))
+                SwitchToPlayingState(
+                    ApplicationLibrary.LoadAndSaveMetaData(tid), 
+                    Switch.Shared.Processes.ActiveApplication
+                );
+            else 
+                SwitchToMainState();
+        }
+
         private static void SwitchToPlayingState(ApplicationMetadata appMeta, ProcessResult procRes)
         {
             _discordClient?.SetPresence(new RichPresence

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -229,8 +229,6 @@ namespace Ryujinx.Headless
             _enableKeyboard = option.EnableKeyboard;
             _enableMouse = option.EnableMouse;
             
-
-            
             LoadPlayerConfiguration(option.InputProfile1Name, option.InputId1, PlayerIndex.Player1);
             LoadPlayerConfiguration(option.InputProfile2Name, option.InputId2, PlayerIndex.Player2); 
             LoadPlayerConfiguration(option.InputProfile3Name, option.InputId3, PlayerIndex.Player3);
@@ -301,7 +299,10 @@ namespace Ryujinx.Headless
                 _userChannelPersistence.ShouldRestart = false;
             }
 
+            try
+            {
                 _inputManager.Dispose();
+            } catch {}
 
             return;
             
@@ -338,23 +339,23 @@ namespace Ryujinx.Headless
         {
             string label = state switch
             {
-                LoadState => $"PTC : {current}/{total}",
+                LoadState => "PTC",
-                ShaderCacheState => $"Shaders : {current}/{total}",
+                ShaderCacheState => "Shaders",
-                _ => throw new ArgumentException($"Unknown Progress Handler type {typeof(T)}"),
+                _ => throw new ArgumentException($"Unknown Progress Handler type {typeof(T)}")
             };
 
-            Logger.Info?.Print(LogClass.Application, label);
+            Logger.Info?.Print(LogClass.Application, $"{label} : {current}/{total}");
         }
 
         private static WindowBase CreateWindow(Options options)
         {
             return options.GraphicsBackend switch
             {
-                GraphicsBackend.Vulkan => new VulkanWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet, options.SpecialExit),
+                GraphicsBackend.Vulkan => new VulkanWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet),
                 GraphicsBackend.Metal => OperatingSystem.IsMacOS() ?
-                    new MetalWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableKeyboard, options.HideCursorMode, options.IgnoreControllerApplet, options.SpecialExit) :
+                    new MetalWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableKeyboard, options.HideCursorMode, options.IgnoreControllerApplet) :
                     throw new Exception("Attempted to use Metal renderer on non-macOS platform!"),
-                _ => new OpenGLWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet, options.SpecialExit)
+                _ => new OpenGLWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet)
             };
         }
 

src/Ryujinx/Headless/Options.cs

@@ -151,9 +151,6 @@ namespace Ryujinx.Headless
             if (NeedsOverride(nameof(IgnoreControllerApplet)))
                 IgnoreControllerApplet = configurationState.IgnoreApplet;
             
-            if (NeedsOverride(nameof(SpecialExit)))
-                SpecialExit = configurationState.Hid.SpecialExitEmulator;
-
             return;
             
             bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey)));
@@ -277,9 +274,6 @@ namespace Ryujinx.Headless
         [Option("enable-mouse", Required = false, Default = false, HelpText = "Enable or disable mouse support.")]
         public bool EnableMouse { get; set; }
 
-        [Option("enable-press-hotkeys-to-exit", Required = false, Default = 0, HelpText = "press the minus and plus buttons to: 0 -disable, 1 - exit app, 2 - exit game.")]
-        public int SpecialExit { get; set; }
-
         [Option("hide-cursor", Required = false, Default = HideCursorMode.OnIdle, HelpText = "Change when the cursor gets hidden.")]
         public HideCursorMode HideCursorMode { get; set; }
 
@@ -420,7 +414,6 @@ namespace Ryujinx.Headless
         [Option("ignore-controller-applet", Required = false, Default = false, HelpText = "Enable ignoring the controller applet when your game loses connection to your controller.")]
         public bool IgnoreControllerApplet { get; set; }
 
-
         // Values
 
         [Value(0, MetaName = "input", HelpText = "Input to load.", Required = true)]

src/Ryujinx/Headless/StatusUpdatedEventArgs.cs

@@ -1,21 +0,0 @@
-using System;
-
-namespace Ryujinx.Headless
-{
-    class StatusUpdatedEventArgs(
-        string vSyncMode,
-        string dockedMode,
-        string aspectRatio,
-        string gameStatus,
-        string fifoStatus,
-        string gpuName)
-        : EventArgs
-    {
-        public string VSyncMode = vSyncMode;
-        public string DockedMode = dockedMode;
-        public string AspectRatio = aspectRatio;
-        public string GameStatus = gameStatus;
-        public string FifoStatus = fifoStatus;
-        public string GpuName = gpuName;
-    }
-}

src/Ryujinx/Headless/Windows/MetalWindow.cs

@@ -23,11 +23,10 @@ namespace Ryujinx.Headless
             AspectRatio aspectRatio,
             bool enableMouse,
             HideCursorMode hideCursorMode, 
-            bool ignoreControllerApplet,
+            bool ignoreControllerApplet)
-            int specialExitEmulator)
+            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet) { }
-            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet, specialExitEmulator) { }
 
-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_METAL;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_METAL;
 
         protected override void InitializeWindowRenderer()
         {

src/Ryujinx/Headless/Windows/OpenGLWindow.cs

@@ -109,7 +109,6 @@ namespace Ryujinx.Headless
             }
         }
         
-        private readonly GraphicsDebugLevel _glLogLevel;
         private SDL2OpenGLContext _openGLContext;
 
         public OpenGLWindow(
@@ -118,19 +117,17 @@ namespace Ryujinx.Headless
             AspectRatio aspectRatio,
             bool enableMouse,
             HideCursorMode hideCursorMode,
-            bool ignoreControllerApplet,
+            bool ignoreControllerApplet)
-            int specialExitEmulator)
+            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet)
-            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet, specialExitEmulator)
         {
-            _glLogLevel = glLogLevel;
         }
 
-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_OPENGL;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_OPENGL;
 
         protected override void InitializeWindowRenderer()
         {
             // Ensure to not share this context with other contexts before this point.
-            SetupOpenGLAttributes(false, _glLogLevel);
+            SetupOpenGLAttributes(false, GlLogLevel);
             nint context = SDL_GL_CreateContext(WindowHandle);
             CheckResult(SDL_GL_SetSwapInterval(1));
 

src/Ryujinx/Headless/Windows/VulkanWindow.cs

@@ -10,22 +10,18 @@ namespace Ryujinx.Headless
 {
     class VulkanWindow : WindowBase
     {
-        private readonly GraphicsDebugLevel _glLogLevel;
-
         public VulkanWindow(
             InputManager inputManager,
             GraphicsDebugLevel glLogLevel,
             AspectRatio aspectRatio,
             bool enableMouse,
             HideCursorMode hideCursorMode,
-            bool ignoreControllerApplet,
+            bool ignoreControllerApplet)
-            int specialExitEmulator)
+            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet)
-            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet, specialExitEmulator)
         {
-            _glLogLevel = glLogLevel;
         }
 
-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_VULKAN;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_VULKAN;
 
         protected override void InitializeWindowRenderer() { }
 

src/Ryujinx/Headless/Windows/WindowBase.cs

@@ -1,12 +1,12 @@
 using Humanizer;
-using LibHac.Tools.Fs;
 using Ryujinx.Ava;
+using Ryujinx.Ava.UI.Models;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.GAL.Multithreading;
-using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.HLE.HOS.Applets;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
@@ -53,8 +53,6 @@ namespace Ryujinx.Headless
         public Switch Device { get; private set; }
         public IRenderer Renderer { get; private set; }
 
-        public event EventHandler<StatusUpdatedEventArgs> StatusUpdatedEvent;
-
         protected nint WindowHandle { get; set; }
 
         public IHostUITheme HostUITheme { get; }
@@ -72,7 +70,7 @@ namespace Ryujinx.Headless
         protected SDL2MouseDriver MouseDriver;
         private readonly InputManager _inputManager;
         private readonly IKeyboard _keyboardInterface;
-        private readonly GraphicsDebugLevel _glLogLevel;
+        protected readonly GraphicsDebugLevel GlLogLevel;
         private readonly Stopwatch _chrono;
         private readonly long _ticksPerFrame;
         private readonly CancellationTokenSource _gpuCancellationTokenSource;
@@ -88,7 +86,6 @@ namespace Ryujinx.Headless
 
         private readonly AspectRatio _aspectRatio;
         private readonly bool _enableMouse;
-        private readonly int _specialExitEmulator;
         private readonly bool _ignoreControllerApplet;
 
         public WindowBase(
@@ -97,8 +94,7 @@ namespace Ryujinx.Headless
             AspectRatio aspectRatio,
             bool enableMouse,
             HideCursorMode hideCursorMode,
-            bool ignoreControllerApplet,
+            bool ignoreControllerApplet)
-            int specialExitEmulator)
         {
             MouseDriver = new SDL2MouseDriver(hideCursorMode);
             _inputManager = inputManager;
@@ -106,7 +102,7 @@ namespace Ryujinx.Headless
             NpadManager = _inputManager.CreateNpadManager();
             TouchScreenManager = _inputManager.CreateTouchScreenManager();
             _keyboardInterface = (IKeyboard)_inputManager.KeyboardDriver.GetGamepad("0");
-            _glLogLevel = glLogLevel;
+            GlLogLevel = glLogLevel;
             _chrono = new Stopwatch();
             _ticksPerFrame = Stopwatch.Frequency / TargetFps;
             _gpuCancellationTokenSource = new CancellationTokenSource();
@@ -114,7 +110,6 @@ namespace Ryujinx.Headless
             _gpuDoneEvent = new ManualResetEvent(false);
             _aspectRatio = aspectRatio;
             _enableMouse = enableMouse;
-            _specialExitEmulator = specialExitEmulator;
             _ignoreControllerApplet = ignoreControllerApplet;
             HostUITheme = new HeadlessHostUiTheme();
 
@@ -140,7 +135,7 @@ namespace Ryujinx.Headless
 
         private void SetWindowIcon()
         {
-            Stream iconStream = typeof(Program).Assembly.GetManifestResourceStream("HeadlessLogo");
+            Stream iconStream = EmbeddedResources.GetStream("Ryujinx/Assets/UIImages/Logo_Ryujinx.png");
             byte[] iconBytes = new byte[iconStream!.Length];
 
             if (iconStream.Read(iconBytes, 0, iconBytes.Length) != iconBytes.Length)
@@ -166,6 +161,8 @@ namespace Ryujinx.Headless
             }
         }
 
+        private StatusUpdatedEventArgs _lastStatus;
+
         private void InitializeWindow()
         {
             var activeProcess = Device.Processes.ActiveApplication;
@@ -194,7 +191,7 @@ namespace Ryujinx.Headless
                 FullscreenFlag = SDL_WindowFlags.SDL_WINDOW_FULLSCREEN_DESKTOP;
             }
 
-            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | GetWindowFlags());
+            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | WindowFlags);
 
             if (WindowHandle == nint.Zero)
             {
@@ -249,7 +246,7 @@ namespace Ryujinx.Headless
 
         protected abstract void SwapBuffers();
 
-        public abstract SDL_WindowFlags GetWindowFlags();
+        public abstract SDL_WindowFlags WindowFlags { get; }
 
         private string GetGpuDriverName()
         {
@@ -271,7 +268,7 @@ namespace Ryujinx.Headless
         {
             InitializeWindowRenderer();
 
-            Device.Gpu.Renderer.Initialize(_glLogLevel);
+            Device.Gpu.Renderer.Initialize(GlLogLevel);
 
             InitializeRenderer();
 
@@ -311,21 +308,6 @@ namespace Ryujinx.Headless
 
                     if (_ticks >= _ticksPerFrame)
                     {
-                        string dockedMode = Device.System.State.DockedMode ? "Docked" : "Handheld";
-                        float scale = GraphicsConfig.ResScale;
-                        if (scale != 1)
-                        {
-                            dockedMode += $" ({scale}x)";
-                        }
-
-                        StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
-                            Device.VSyncMode.ToString(),
-                            dockedMode,
-                            Device.Configuration.AspectRatio.ToText(),
-                            $"{Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
-                            $"FIFO: {Device.Statistics.GetFifoPercent():0.00} %",
-                            $"GPU: {_gpuDriverName}"));
-
                         _ticks = Math.Min(_ticks - _ticksPerFrame, _ticksPerFrame);
                     }
                 }

src/Ryujinx/Input/AvaloniaKeyboard.cs

@@ -30,11 +30,6 @@ namespace Ryujinx.Ava.Input
             public readonly Key From = from;
         }
 
-        public bool SpecialExit()
-        {
-            return false;
-        }
-
         public AvaloniaKeyboard(AvaloniaKeyboardDriver driver, string id, string name)
         {
             _buttonsUserMapping = [];

src/Ryujinx/Input/AvaloniaMouse.cs

@@ -13,11 +13,6 @@ namespace Ryujinx.Ava.Input
         public string Id => "0";
         public string Name => "AvaloniaMouse";
 
-        public bool SpecialExit() 
-        {
-            return false;
-        }
-
         public bool IsConnected => true;
         public GamepadFeaturesFlag Features => throw new NotImplementedException();
         public bool[] Buttons => _driver.PressedButtons;

src/Ryujinx/Ryujinx.csproj

@@ -166,7 +166,6 @@
     <EmbeddedResource Include="Assets\UIImages\Logo_GitHub_Light.png" />
     <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx.png" />
     <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx_AntiAlias.png" />
-    <EmbeddedResource Include="Headless\Ryujinx.bmp" LogicalName="HeadlessLogo" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="Assets\locales.json" />

src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml

@@ -7,6 +7,7 @@
     Title="Ryujinx - Waiting"
     SizeToContent="WidthAndHeight"
     WindowStartupLocation="CenterOwner"
+    CanResize="False"
     mc:Ignorable="d"
     Focusable="True">
     <Grid

src/Ryujinx/UI/Models/StatusUpdatedEventArgs.cs

@@ -22,5 +22,22 @@ namespace Ryujinx.Ava.UI.Models
             FifoStatus = fifoStatus;
             ShaderCount = shaderCount;
         }
+
+
+        public override bool Equals(object obj)
+        {
+            if (obj is not StatusUpdatedEventArgs suea) return false;
+            return
+                VSyncMode == suea.VSyncMode &&
+                VolumeStatus == suea.VolumeStatus &&
+                DockedMode == suea.DockedMode &&
+                AspectRatio == suea.AspectRatio &&
+                GameStatus == suea.GameStatus &&
+                FifoStatus == suea.FifoStatus &&
+                ShaderCount == suea.ShaderCount;
+        }
+
+        public override int GetHashCode() 
+            => HashCode.Combine(VSyncMode, VolumeStatus, AspectRatio, DockedMode, FifoStatus, GameStatus, ShaderCount);
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1049,7 +1049,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private void InitializeGame()
         {
-            
             RendererHostControl.WindowCreated += RendererHost_Created;
 
             AppHost.StatusUpdatedEvent += Update_StatusBar;
@@ -1059,13 +1058,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             AppHost?.Start();
 
-            if (AppHost?.IsSpecialExit() == true)
-            {
-                Window.ForceExit();
-            }
-
             AppHost?.DisposeContext();
-
         }
 
         private async Task HandleRelaunch()

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -128,7 +128,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool EnableDockedMode { get; set; }
         public bool EnableKeyboard { get; set; }
         public bool EnableMouse { get; set; }
-        public int EnableSpecialExit { get; set; }
         public VSyncMode VSyncMode
         {
             get => _vSyncMode;
@@ -260,8 +259,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         public int OpenglDebugLevel { get; set; }
         public int MemoryMode { get; set; }
         public int BaseStyleIndex { get; set; }
-
-       
         public int GraphicsBackendIndex
         {
             get => _graphicsBackendIndex;
@@ -514,13 +511,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             EnableDockedMode = config.System.EnableDockedMode;
             EnableKeyboard = config.Hid.EnableKeyboard;
             EnableMouse = config.Hid.EnableMouse;
-            EnableSpecialExit = config.Hid.SpecialExitEmulator.Value switch
-            {
-                0 => 0, // "Hotkey 'Exit' is Disabled"
-                1 => 1, // "Close app. by hotkey"
-                2 => 2, // "Close game by hotkey" 
-                _ => 0
-            };
 
             // Keyboard Hotkeys
             KeyboardHotkey = new HotkeyConfig(config.Hid.Hotkeys.Value);
@@ -628,13 +618,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.System.EnableDockedMode.Value = EnableDockedMode;
             config.Hid.EnableKeyboard.Value = EnableKeyboard;
             config.Hid.EnableMouse.Value = EnableMouse;
-            config.Hid.SpecialExitEmulator.Value = EnableSpecialExit switch
-            {
-                0 => 0, // "Hotkey 'Exit' is Disabled",
-                1 => 1, // "Close app. by hotkey",
-                2 => 2, // "Close game by hotkey",
-                _ => 0
-            };
 
             // Keyboard Hotkeys
             config.Hid.Hotkeys.Value = KeyboardHotkey.GetConfig();

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

@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsInputView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -58,20 +58,6 @@
                                 <TextBlock
                                     Text="{ext:Locale SettingsTabInputDirectMouseAccess}" />
                             </CheckBox>
-                            <ComboBox SelectedIndex="{Binding EnableSpecialExit}"
-                                ToolTip.Tip="{ext:Locale SpecialExitTooltip}"
-                                HorizontalContentAlignment="Left"
-                                MinWidth="160">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabInputDisableExitHotKey}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabInputHotkeyIsCloseApp}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabInputHotkeyIsCloseGame}" />
-                                </ComboBoxItem>
-                            </ComboBox>                           
                         </StackPanel>
                     </StackPanel>
                 </Grid>

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

@@ -136,6 +136,12 @@
                             <ComboBoxItem>
                                 <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                             </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSwedish}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageNorwegian}" />
+                            </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel

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

@@ -32,6 +32,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
+using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Threading;
 using System.Threading.Tasks;
@@ -45,7 +46,6 @@ namespace Ryujinx.Ava.UI.Windows
         internal readonly AvaHostUIHandler UiHandler;
 
         private bool _isLoading;
-        private bool _isExitWithoutConfirm = false;
         private bool _applicationsLoadedOnce;
 
         private UserChannelPersistence _userChannelPersistence;
@@ -137,6 +137,8 @@ namespace Ryujinx.Ava.UI.Windows
             base.OnApplyTemplate(e);
 
             NotificationHelper.SetNotificationManager(this);
+
+            ShowIntelMacWarningAsync();
         }
 
         private void OnScalingChanged(object sender, EventArgs e)
@@ -572,7 +574,7 @@ namespace Ryujinx.Ava.UI.Windows
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
-            if (!ViewModel.IsClosing && ViewModel.AppHost != null && ConfigurationState.Instance.ShowConfirmExit && !_isExitWithoutConfirm)
+            if (!ViewModel.IsClosing && ViewModel.AppHost != null && ConfigurationState.Instance.ShowConfirmExit)
             {
                 e.Cancel = true;
 
@@ -617,12 +619,6 @@ namespace Ryujinx.Ava.UI.Windows
             base.OnClosing(e);
         }
 
-        public void ForceExit() 
-        {
-            _isExitWithoutConfirm = true;
-             Close();
-        }
-
         private void ConfirmExit()
         {
             Dispatcher.UIThread.InvokeAsync(async () =>
@@ -738,5 +734,22 @@ namespace Ryujinx.Ava.UI.Windows
                     (int)Symbol.Checkmark);
             });
         }
+
+        private static bool _intelMacWarningShown;
+
+        public static async Task ShowIntelMacWarningAsync()
+        {
+            if (!_intelMacWarningShown && 
+                (OperatingSystem.IsMacOS() && 
+                 (RuntimeInformation.OSArchitecture == Architecture.X64 ||
+                                               RuntimeInformation.OSArchitecture == Architecture.X86)))
+            {
+                _intelMacWarningShown = true;
+
+                await Dispatcher.UIThread.InvokeAsync(async () => await ContentDialogHelper.CreateWarningDialog(
+                    "Intel Mac Warning",
+                    "Intel Macs are not supported and will not work properly.\nIf you continue, do not come to our Discord asking for support."));
+            }
+        }
     }
 }

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 60;
+        public const int CurrentVersion = 59;
 
         /// <summary>
         /// Version of the configuration file format
@@ -366,12 +366,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// </summary>
         public bool EnableMouse { get; set; }
 
-        /// <summary>
-        /// Allows you to choose one of several behaviors when pressing hotkeys:
-        /// 0 - Do nothing, 1 - Close the emulator application, 2 - Exit the game.
-        /// </summary>
-        public int SpecialExitEmulator { get; set; }
-
         /// <summary>
         /// Hotkey Keyboard Bindings
         /// </summary>

src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs

@@ -136,7 +136,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             
             Hid.EnableKeyboard.Value = cff.EnableKeyboard;
             Hid.EnableMouse.Value = cff.EnableMouse;
-            Hid.SpecialExitEmulator.Value = cff.SpecialExitEmulator;
             Hid.Hotkeys.Value = cff.Hotkeys;
             Hid.InputConfig.Value = cff.InputConfig ?? [];
 
@@ -415,10 +414,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     // This was accidentally enabled by default when it was PRed. That is not what we want,
                     // so as a compromise users who want to use it will simply need to re-enable it once after updating.
                     cff.IgnoreApplet = false;
-                }),
-                (60, static cff =>
-                {
-                    cff.SpecialExitEmulator = 0;
                 })
             );
     }

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -420,13 +420,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// </summary>
             public ReactiveObject<bool> EnableMouse { get; private set; }
 
-            /// <summary>
-            /// Allows you to choose one of several behaviors when pressing hotkeys:
-            /// 0 - Do nothing, 1 - Close the emulator application, 2 - Exit the game.
-            /// </summary>
-            public ReactiveObject<int> SpecialExitEmulator { get; private set; }
-
-
             /// <summary>
             /// Hotkey Keyboard Bindings
             /// </summary>
@@ -443,7 +436,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             {
                 EnableKeyboard = new ReactiveObject<bool>();
                 EnableMouse = new ReactiveObject<bool>();
-                SpecialExitEmulator = new ReactiveObject<int>();
                 Hotkeys = new ReactiveObject<KeyboardHotkeys>();
                 InputConfig = new ReactiveObject<List<InputConfig>>();
             }

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -128,7 +128,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 ShowConsole = UI.ShowConsole,
                 EnableKeyboard = Hid.EnableKeyboard,
                 EnableMouse = Hid.EnableMouse,
-                SpecialExitEmulator = Hid.SpecialExitEmulator,
                 Hotkeys = Hid.Hotkeys,
                 KeyboardConfig = [],
                 ControllerConfig = [],
@@ -242,7 +241,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             UI.WindowStartup.WindowMaximized.Value = false;
             Hid.EnableKeyboard.Value = false;
             Hid.EnableMouse.Value = false;
-            Hid.SpecialExitEmulator.Value = 0;
             Hid.Hotkeys.Value = new KeyboardHotkeys
             {
                 ToggleVSyncMode = Key.F1,