misc: Headless: Inherit main input config

This way the Arbitrary Shader Translation Delay hack will no longer
affect shader loading when using Vulkan.

src/Ryujinx.Common/ReactiveObject.cs

@@ -53,17 +53,9 @@ namespace Ryujinx.Common
     {
         public static void LogValueChange<T>(LogClass logClass, ReactiveEventArgs<T> eventArgs, string valueName)
         {
-            if ((eventArgs.NewValue == null || eventArgs.OldValue == null))
-            {
-                if (!(eventArgs.NewValue == null && eventArgs.OldValue == null))
-                    goto Log;
-            } 
-            else if (!eventArgs.NewValue!.Equals(eventArgs.OldValue))
-                goto Log;
+            if (eventArgs.AreValuesEqual)
+                return;
             
-            return;
-            
-        Log:
             string message = string.Create(CultureInfo.InvariantCulture, $"{valueName} set to: {eventArgs.NewValue}");
 
             Logger.Info?.Print(logClass, message);
@@ -76,5 +68,22 @@ namespace Ryujinx.Common
     {
         public T OldValue { get; } = oldValue;
         public T NewValue { get; } = newValue;
+
+        public bool AreValuesEqual
+        {
+            get
+            {
+                if (OldValue == null && NewValue == null)
+                    return true;
+
+                if (OldValue == null && NewValue != null)
+                    return false;
+                
+                if (OldValue != null && NewValue == null)
+                    return false;
+
+                return OldValue!.Equals(NewValue);
+            }
+        }
     }
 }

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs

@@ -367,7 +367,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         {
             try
             {
-                if (_context.DirtyHacks.IsEnabled(DirtyHack.ShaderTranslationDelay))
+                if (_context.Capabilities.Api == TargetApi.Metal && _context.DirtyHacks.IsEnabled(DirtyHack.ShaderTranslationDelay))
                     Thread.Sleep(_context.DirtyHacks[DirtyHack.ShaderTranslationDelay]);
                 
                 AsyncProgramTranslation asyncTranslation = new(guestShaders, specState, programIndex, isCompute);

src/Ryujinx/Assets/locales.json

@@ -1235,7 +1235,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "자주 묻는 질문(FAQ) 및 안내",
-        "no_NO": "",
+        "no_NO": "Vanlige spørsmål og veiledninger",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "FAQ и Руководства",
@@ -1460,7 +1460,7 @@
         "it_IT": "Preferito",
         "ja_JP": "お気に入り",
         "ko_KR": "즐겨찾기",
-        "no_NO": "",
+        "no_NO": "Favoritter",
         "pl_PL": "Ulubione",
         "pt_BR": "Favorito",
         "ru_RU": "Избранное",
@@ -2610,7 +2610,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "펌웨어 버전 : {0}",
-        "no_NO": "",
+        "no_NO": "Fastvareversjon: {0}",
         "pl_PL": "",
         "pt_BR": "Versão do firmware: {0}",
         "ru_RU": "Версия прошивки: {0}",
@@ -3460,7 +3460,7 @@
         "it_IT": "Corea",
         "ja_JP": "韓国",
         "ko_KR": "한국",
-        "no_NO": "",
+        "no_NO": "Koreansk",
         "pl_PL": "",
         "pt_BR": "Coreia",
         "ru_RU": "Корея",
@@ -4010,7 +4010,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "PC 날짜와 시간에 동기화",
-        "no_NO": "",
+        "no_NO": "Resynkroniser til PC-dato og -klokkeslett",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Повторная синхронизация с датой и временем на компьютере",
@@ -15260,7 +15260,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "시스템 시간을 PC의 현재 날짜 및 시간과 일치하도록 다시 동기화합니다.\n\n이 설정은 활성 설정이 아니므로 여전히 동기화되지 않을 수 있으며, 이 경우 이 버튼을 다시 클릭하면 됩니다.",
-        "no_NO": "",
+        "no_NO": "Resynkroniser systemtiden slik at den samsvarer med PC-ens gjeldende dato og klokkeslett. \\Dette er ikke en aktiv innstilling, men den kan likevel komme ut av synkronisering; i så fall er det bare å klikke på denne knappen igjen.",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Повторно синхронизирует системное время, чтобы оно соответствовало текущей дате и времени вашего компьютера.\n\nЭто не активная настройка, она все еще может рассинхронизироваться; в этом случае просто нажмите эту кнопку еще раз.",
@@ -20535,7 +20535,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "Vulkan을 사용합니다.\nARM 맥에서 해당 플랫폼에서 잘 실행되는 게임을 플레이하는 경우 Metal 후단부를 사용합니다.",
-        "no_NO": "",
+        "no_NO": "Bruker Vulkan \nPå en ARM Mac, og når du spiller et spill som kjører bra under den, bruker du Metal-backend.",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Использует Vulkan.\nНа Mac с ARM процессорами используется Metal, если игра с ним совместима и хорошо работает.",
@@ -22598,4 +22598,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -162,6 +162,11 @@ namespace Ryujinx.Headless
             }
             
             ReloadConfig();
+
+            if (option.InheritConfig)
+            {
+                option.InheritMainConfigInput(originalArgs, ConfigurationState.Instance);
+            }
             
             _virtualFileSystem = VirtualFileSystem.CreateInstance();
             _libHacHorizonManager = new LibHacHorizonManager();
@@ -224,15 +229,7 @@ namespace Ryujinx.Headless
             _enableKeyboard = option.EnableKeyboard;
             _enableMouse = option.EnableMouse;
 
-            static void LoadPlayerConfiguration(string inputProfileName, string inputId, PlayerIndex index)
-            {
-                InputConfig inputConfig = HandlePlayerConfiguration(inputProfileName, inputId, index);
 
-                if (inputConfig != null)
-                {
-                    _inputConfiguration.Add(inputConfig);
-                }
-            }
             
             LoadPlayerConfiguration(option.InputProfile1Name, option.InputId1, PlayerIndex.Player1);
             LoadPlayerConfiguration(option.InputProfile2Name, option.InputId2, PlayerIndex.Player2); 
@@ -244,7 +241,6 @@ namespace Ryujinx.Headless
             LoadPlayerConfiguration(option.InputProfile8Name, option.InputId8, PlayerIndex.Player8);
             LoadPlayerConfiguration(option.InputProfileHandheldName, option.InputIdHandheld, PlayerIndex.Handheld);
             
-
             if (_inputConfiguration.Count == 0)
             {
                 return;
@@ -306,6 +302,24 @@ namespace Ryujinx.Headless
             }
 
             _inputManager.Dispose();
+
+            return;
+            
+            void LoadPlayerConfiguration(string inputProfileName, string inputId, PlayerIndex index)
+            {
+                if (index == PlayerIndex.Handheld && _inputConfiguration.Count > 0)
+                {
+                    Logger.Info?.Print(LogClass.Configuration, "Skipping handheld configuration as there are already other players configured.");
+                    return;
+                }
+                
+                InputConfig inputConfig = option.InheritedInputConfigs[index] ?? HandlePlayerConfiguration(inputProfileName, inputId, index);
+
+                if (inputConfig != null)
+                {
+                    _inputConfiguration.Add(inputConfig);
+                }
+            }
         }
 
         private static void SetupProgressHandler()

src/Ryujinx/Headless/Options.cs

@@ -154,10 +154,39 @@ namespace Ryujinx.Headless
             return;
             
             bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey)));
-
-            string OptionName(string propertyName) =>
-                typeof(Options)!.GetProperty(propertyName)!.GetCustomAttribute<OptionAttribute>()!.LongName;
         }
+
+        public void InheritMainConfigInput(string[] originalArgs, ConfigurationState configurationState)
+        {
+            Dictionary<PlayerIndex, (string InputId, string InputProfileName)> indicesToProperties = new()
+            {
+                { PlayerIndex.Handheld, (nameof(InputIdHandheld), nameof(InputProfileHandheldName)) },
+                { PlayerIndex.Player1, (nameof(InputId1), nameof(InputProfile1Name)) },
+                { PlayerIndex.Player2, (nameof(InputId2), nameof(InputProfile2Name)) },
+                { PlayerIndex.Player3, (nameof(InputId3), nameof(InputProfile3Name)) },
+                { PlayerIndex.Player4, (nameof(InputId4), nameof(InputProfile4Name)) },
+                { PlayerIndex.Player5, (nameof(InputId5), nameof(InputProfile5Name)) },
+                { PlayerIndex.Player6, (nameof(InputId6), nameof(InputProfile6Name)) },
+                { PlayerIndex.Player7, (nameof(InputId7), nameof(InputProfile7Name)) },
+                { PlayerIndex.Player8, (nameof(InputId8), nameof(InputProfile8Name)) }
+            };
+
+            foreach ((PlayerIndex playerIndex, (string id, string profile)) in indicesToProperties)
+            {
+                if (NeedsOverride(id) && NeedsOverride(profile))
+                {
+                    configurationState.Hid.InputConfig.Value.FindFirst(x => x.PlayerIndex == playerIndex)
+                        .IfPresent(ic => InheritedInputConfigs[playerIndex] = ic);
+                }
+            }
+
+            return;
+            
+            bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey)));
+        }
+
+        private static string OptionName(string propertyName) =>
+            typeof(Options)!.GetProperty(propertyName)!.GetCustomAttribute<OptionAttribute>()!.LongName;
         
         // General
         
@@ -391,5 +420,7 @@ namespace Ryujinx.Headless
 
         [Value(0, MetaName = "input", HelpText = "Input to load.", Required = true)]
         public string InputPath { get; set; }
+
+        public SafeDictionary<PlayerIndex, InputConfig> InheritedInputConfigs = new();
     }
 }

src/Ryujinx/UI/Renderer/RendererHost.axaml

@@ -1,12 +0,0 @@
-<UserControl
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    d:DesignWidth="800"
-    d:DesignHeight="450"
-    x:Class="Ryujinx.Ava.UI.Renderer.RendererHost"
-    FlowDirection="LeftToRight"
-    Focusable="True">
-</UserControl>

src/Ryujinx/UI/Renderer/RendererHost.cs

@@ -1,16 +1,15 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
-using Gommon;
+using Avalonia.Media;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using System;
-using System.Runtime.InteropServices;
 
 namespace Ryujinx.Ava.UI.Renderer
 {
-    public partial class RendererHost : UserControl, IDisposable
+    public class RendererHost : UserControl, IDisposable
     {
         public readonly EmbeddedWindow EmbeddedWindow;
 
@@ -19,7 +18,8 @@ namespace Ryujinx.Ava.UI.Renderer
 
         public RendererHost()
         {
-            InitializeComponent();
+            Focusable = true;
+            FlowDirection = FlowDirection.LeftToRight;
 
             EmbeddedWindow = ConfigurationState.Instance.Graphics.GraphicsBackend.Value switch
             {
@@ -43,8 +43,6 @@ namespace Ryujinx.Ava.UI.Renderer
 
         public RendererHost(string titleId)
         {
-            InitializeComponent();
-
             switch (TitleIDs.SelectGraphicsBackend(titleId, ConfigurationState.Instance.Graphics.GraphicsBackend))
             {
                 case GraphicsBackend.OpenGl:
@@ -109,3 +107,4 @@ namespace Ryujinx.Ava.UI.Renderer
         }
     }
 }
+

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -247,6 +247,7 @@
                     Header="{ext:Locale MenuBarActionsScanAmiiboBin}"
                     Icon="{ext:Icon mdi-cube-scan}"
                     IsVisible="{Binding CanScanAmiiboBinaries}"
+                    InputGesture="Ctrl + B"
                     IsEnabled="{Binding IsAmiiboBinRequested}" />
                 <MenuItem
                     Command="{Binding TakeScreenshot}"

src/Ryujinx/UI/Windows/MainWindow.axaml

@@ -40,6 +40,7 @@
         <KeyBinding Gesture="F9" Command="{Binding ToggleDockMode}" />
         <KeyBinding Gesture="Escape" Command="{Binding ExitCurrentState}" />
         <KeyBinding Gesture="Ctrl+A" Command="{Binding OpenAmiiboWindow}" />
+        <KeyBinding Gesture="Ctrl+B" Command="{Binding OpenBinFile}" />
     </Window.KeyBindings>
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*">
         <helpers:OffscreenTextBox IsEnabled="False" Opacity="0" Name="HiddenTextBox" IsHitTestVisible="False" IsTabStop="False" />