1 files changed, 84 insertions, 225 deletions
diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs
index 1845c512..aecc585f 100644
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -1,4 +1,7 @@
-using Gtk;
+using Avalonia;
+using Avalonia.Threading;
+using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
@@ -6,139 +9,80 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Common.SystemInterop;
 using Ryujinx.Modules;
 using Ryujinx.SDL2.Common;
-using Ryujinx.UI;
 using Ryujinx.UI.Common;
 using Ryujinx.UI.Common.Configuration;
 using Ryujinx.UI.Common.Helper;
 using Ryujinx.UI.Common.SystemInfo;
-using Ryujinx.UI.Widgets;
-using SixLabors.ImageSharp.Formats.Jpeg;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 
-namespace Ryujinx
+namespace Ryujinx.Ava
 {
-    partial class Program
+    internal partial class Program
     {
-        public static double WindowScaleFactor { get; private set; }
-
+        public static double WindowScaleFactor { get; set; }
+        public static double DesktopScaleFactor { get; set; } = 1.0;
         public static string Version { get; private set; }
-
-        public static string ConfigurationPath { get; set; }
-
-        public static string CommandLineProfile { get; set; }
-
-        private const string X11LibraryName = "libX11";
-
-        [LibraryImport(X11LibraryName)]
-        private static partial int XInitThreads();
+        public static string ConfigurationPath { get; private set; }
+        public static bool PreviewerDetached { get; private set; }
 
         [LibraryImport("user32.dll", SetLastError = true)]
         public static partial int MessageBoxA(IntPtr hWnd, [MarshalAs(UnmanagedType.LPStr)] string text, [MarshalAs(UnmanagedType.LPStr)] string caption, uint type);
 
-        [LibraryImport("libc", SetLastError = true)]
-        private static partial int setenv([MarshalAs(UnmanagedType.LPStr)] string name, [MarshalAs(UnmanagedType.LPStr)] string value, int overwrite);
-
-        private const uint MbIconWarning = 0x30;
+        private const uint MbIconwarning = 0x30;
 
-        static Program()
-        {
-            if (OperatingSystem.IsLinux())
-            {
-                NativeLibrary.SetDllImportResolver(typeof(Program).Assembly, (name, assembly, path) =>
-                {
-                    if (name != X11LibraryName)
-                    {
-                        return IntPtr.Zero;
-                    }
-
-                    if (!NativeLibrary.TryLoad("libX11.so.6", assembly, path, out IntPtr result))
-                    {
-                        if (!NativeLibrary.TryLoad("libX11.so", assembly, path, out result))
-                        {
-                            return IntPtr.Zero;
-                        }
-                    }
-
-                    return result;
-                });
-            }
-        }
-
-        static void Main(string[] args)
+        public static void Main(string[] args)
         {
             Version = ReleaseInformation.Version;
 
             if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134))
             {
-                MessageBoxA(IntPtr.Zero, "You are running an outdated version of Windows.\n\nStarting on June 1st 2022, Ryujinx will only support Windows 10 1803 and newer.\n", $"Ryujinx {Version}", MbIconWarning);
+                _ = MessageBoxA(IntPtr.Zero, "You are running an outdated version of Windows.\n\nStarting on June 1st 2022, Ryujinx will only support Windows 10 1803 and newer.\n", $"Ryujinx {Version}", MbIconwarning);
             }
 
-            // Parse arguments
-            CommandLineState.ParseArguments(args);
-
-            // Hook unhandled exception and process exit events.
-            GLib.ExceptionManager.UnhandledException += (GLib.UnhandledExceptionArgs e) => ProcessUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
-            AppDomain.CurrentDomain.UnhandledException += (object sender, UnhandledExceptionEventArgs e) => ProcessUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
-            AppDomain.CurrentDomain.ProcessExit += (object sender, EventArgs e) => Exit();
+            PreviewerDetached = true;
 
-            // Make process DPI aware for proper window sizing on high-res screens.
-            ForceDpiAware.Windows();
-            WindowScaleFactor = ForceDpiAware.GetWindowScaleFactor();
+            Initialize(args);
 
-            // Delete backup files after updating.
-            Task.Run(Updater.CleanupUpdate);
+            LoggerAdapter.Register();
 
-            Console.Title = $"Ryujinx Console {Version}";
-
-            // NOTE: GTK3 doesn't init X11 in a multi threaded way.
-            // This ends up causing race condition and abort of XCB when a context is created by SPB (even if SPB do call XInitThreads).
-            if (OperatingSystem.IsLinux())
-            {
-                if (XInitThreads() == 0)
-                {
-                    throw new NotSupportedException("Failed to initialize multi-threading support.");
-                }
-
-                Environment.SetEnvironmentVariable("GDK_BACKEND", "x11");
-                setenv("GDK_BACKEND", "x11", 1);
-            }
-
-            if (OperatingSystem.IsMacOS())
-            {
-                string baseDirectory = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
-                string resourcesDataDir;
+            BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+        }
 
-                if (Path.GetFileName(baseDirectory) == "MacOS")
+        public static AppBuilder BuildAvaloniaApp()
+        {
+            return AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .With(new X11PlatformOptions
                 {
-                    resourcesDataDir = Path.Combine(Directory.GetParent(baseDirectory).FullName, "Resources");
-                }
-                else
+                    EnableMultiTouch = true,
+                    EnableIme = true,
+                    EnableInputFocusProxy = Environment.GetEnvironmentVariable("XDG_CURRENT_DESKTOP") == "gamescope",
+                    RenderingMode = new[] { X11RenderingMode.Glx, X11RenderingMode.Software },
+                })
+                .With(new Win32PlatformOptions
                 {
-                    resourcesDataDir = baseDirectory;
-                }
-
-                static void SetEnvironmentVariableNoCaching(string key, string value)
-                {
-                    int res = setenv(key, value, 1);
-                    Debug.Assert(res != -1);
-                }
+                    WinUICompositionBackdropCornerRadius = 8.0f,
+                    RenderingMode = new[] { Win32RenderingMode.AngleEgl, Win32RenderingMode.Software },
+                })
+                .UseSkia();
+        }
 
-                // On macOS, GTK3 needs XDG_DATA_DIRS to be set, otherwise it will try searching for "gschemas.compiled" in system directories.
-                SetEnvironmentVariableNoCaching("XDG_DATA_DIRS", Path.Combine(resourcesDataDir, "share"));
+        private static void Initialize(string[] args)
+        {
+            // Parse arguments
+            CommandLineState.ParseArguments(args);
 
-                // On macOS, GTK3 needs GDK_PIXBUF_MODULE_FILE to be set, otherwise it will try searching for "loaders.cache" in system directories.
-                SetEnvironmentVariableNoCaching("GDK_PIXBUF_MODULE_FILE", Path.Combine(resourcesDataDir, "lib", "gdk-pixbuf-2.0", "2.10.0", "loaders.cache"));
+            // Delete backup files after updating.
+            Task.Run(Updater.CleanupUpdate);
 
-                SetEnvironmentVariableNoCaching("GTK_IM_MODULE_FILE", Path.Combine(resourcesDataDir, "lib", "gtk-3.0", "3.0.0", "immodules.cache"));
-            }
+            Console.Title = $"Ryujinx Console {Version}";
 
-            string systemPath = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.Machine);
-            Environment.SetEnvironmentVariable("Path", $"{Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "bin")};{systemPath}");
+            // Hook unhandled exception and process exit events.
+            AppDomain.CurrentDomain.UnhandledException += (sender, e) => ProcessUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
+            AppDomain.CurrentDomain.ProcessExit += (sender, e) => Exit();
 
             // Setup base data directory.
             AppDataManager.Initialize(CommandLineState.BaseDirPathArg);
@@ -153,29 +97,47 @@ namespace Ryujinx
             DiscordIntegrationModule.Initialize();
 
             // Initialize SDL2 driver
-            SDL2Driver.MainThreadDispatcher = action =>
+            SDL2Driver.MainThreadDispatcher = action => Dispatcher.UIThread.InvokeAsync(action, DispatcherPriority.Input);
+
+            ReloadConfig();
+
+            WindowScaleFactor = ForceDpiAware.GetWindowScaleFactor();
+
+            // Logging system information.
+            PrintSystemInfo();
+
+            // Enable OGL multithreading on the driver, when available.
+            DriverUtilities.ToggleOGLThreading(ConfigurationState.Instance.Graphics.BackendThreading == BackendThreading.Off);
+
+            // Check if keys exists.
+            if (!File.Exists(Path.Combine(AppDataManager.KeysDirPath, "prod.keys")))
             {
-                Application.Invoke(delegate
+                if (!(AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile && File.Exists(Path.Combine(AppDataManager.KeysDirPathUser, "prod.keys"))))
                 {
-                    action();
-                });
-            };
+                    MainWindow.ShowKeyErrorOnLoad = true;
+                }
+            }
 
-            // Sets ImageSharp Jpeg Encoder Quality.
-            SixLabors.ImageSharp.Configuration.Default.ImageFormatsManager.SetEncoder(JpegFormat.Instance, new JpegEncoder()
+            if (CommandLineState.LaunchPathArg != null)
             {
-                Quality = 100,
-            });
+                MainWindow.DeferLoadApplication(CommandLineState.LaunchPathArg, CommandLineState.StartFullscreenArg);
+            }
+        }
 
+        public static void ReloadConfig()
+        {
             string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
             string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
 
             // Now load the configuration as the other subsystems are now registered
-            ConfigurationPath = File.Exists(localConfigurationPath)
-                ? localConfigurationPath
-                : File.Exists(appDataConfigurationPath)
-                    ? appDataConfigurationPath
-                    : null;
+            if (File.Exists(localConfigurationPath))
+            {
+                ConfigurationPath = localConfigurationPath;
+            }
+            else if (File.Exists(appDataConfigurationPath))
+            {
+                ConfigurationPath = appDataConfigurationPath;
+            }
 
             if (ConfigurationPath == null)
             {
@@ -199,7 +161,7 @@ namespace Ryujinx
                 }
             }
 
-            // Check if graphics backend was overridden.
+            // Check if graphics backend was overridden
             if (CommandLineState.OverrideGraphicsBackend != null)
             {
                 if (CommandLineState.OverrideGraphicsBackend.ToLower() == "opengl")
@@ -212,6 +174,12 @@ namespace Ryujinx
                 }
             }
 
+            // Check if docked mode was overriden.
+            if (CommandLineState.OverrideDockedMode.HasValue)
+            {
+                ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
+            }
+
             // Check if HideCursor was overridden.
             if (CommandLineState.OverrideHideCursor is not null)
             {
@@ -223,114 +191,6 @@ namespace Ryujinx
                     _ => ConfigurationState.Instance.HideCursor.Value,
                 };
             }
-
-            // Check if docked mode was overridden.
-            if (CommandLineState.OverrideDockedMode.HasValue)
-            {
-                ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
-            }
-
-            // Logging system information.
-            PrintSystemInfo();
-
-            // Enable OGL multithreading on the driver, when available.
-            BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;
-            DriverUtilities.ToggleOGLThreading(threadingMode == BackendThreading.Off);
-
-            // Initialize Gtk.
-            Application.Init();
-
-            // Check if keys exists.
-            bool hasSystemProdKeys = File.Exists(Path.Combine(AppDataManager.KeysDirPath, "prod.keys"));
-            bool hasCommonProdKeys = AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile && File.Exists(Path.Combine(AppDataManager.KeysDirPathUser, "prod.keys"));
-            if (!hasSystemProdKeys && !hasCommonProdKeys)
-            {
-                UserErrorDialog.CreateUserErrorDialog(UserError.NoKeys);
-            }
-
-            // Show the main window UI.
-            MainWindow mainWindow = new();
-            mainWindow.Show();
-
-            if (OperatingSystem.IsLinux())
-            {
-                int currentVmMaxMapCount = LinuxHelper.VmMaxMapCount;
-
-                if (LinuxHelper.VmMaxMapCount < LinuxHelper.RecommendedVmMaxMapCount)
-                {
-                    Logger.Warning?.Print(LogClass.Application, $"The value of vm.max_map_count is lower than {LinuxHelper.RecommendedVmMaxMapCount}. ({currentVmMaxMapCount})");
-
-                    if (LinuxHelper.PkExecPath is not null)
-                    {
-                        var buttonTexts = new Dictionary<int, string>()
-                        {
-                            { 0, "Yes, until the next restart" },
-                            { 1, "Yes, permanently" },
-                            { 2, "No" },
-                        };
-
-                        ResponseType response = GtkDialog.CreateCustomDialog(
-                            "Ryujinx - Low limit for memory mappings detected",
-                            $"Would you like to increase the value of vm.max_map_count to {LinuxHelper.RecommendedVmMaxMapCount}?",
-                            "Some games might try to create more memory mappings than currently allowed. " +
-                            "Ryujinx will crash as soon as this limit gets exceeded.",
-                            buttonTexts,
-                            MessageType.Question);
-
-                        int rc;
-
-                        switch ((int)response)
-                        {
-                            case 0:
-                                rc = LinuxHelper.RunPkExec($"echo {LinuxHelper.RecommendedVmMaxMapCount} > {LinuxHelper.VmMaxMapCountPath}");
-                                if (rc == 0)
-                                {
-                                    Logger.Info?.Print(LogClass.Application, $"vm.max_map_count set to {LinuxHelper.VmMaxMapCount} until the next restart.");
-                                }
-                                else
-                                {
-                                    Logger.Error?.Print(LogClass.Application, $"Unable to change vm.max_map_count. Process exited with code: {rc}");
-                                }
-                                break;
-                            case 1:
-                                rc = LinuxHelper.RunPkExec($"echo \"vm.max_map_count = {LinuxHelper.RecommendedVmMaxMapCount}\" > {LinuxHelper.SysCtlConfigPath} && sysctl -p {LinuxHelper.SysCtlConfigPath}");
-                                if (rc == 0)
-                                {
-                                    Logger.Info?.Print(LogClass.Application, $"vm.max_map_count set to {LinuxHelper.VmMaxMapCount}. Written to config: {LinuxHelper.SysCtlConfigPath}");
-                                }
-                                else
-                                {
-                                    Logger.Error?.Print(LogClass.Application, $"Unable to write new value for vm.max_map_count to config. Process exited with code: {rc}");
-                                }
-                                break;
-                        }
-                    }
-                    else
-                    {
-                        GtkDialog.CreateWarningDialog(
-                            "Max amount of memory mappings is lower than recommended.",
-                            $"The current value of vm.max_map_count ({currentVmMaxMapCount}) is lower than {LinuxHelper.RecommendedVmMaxMapCount}." +
-                            "Some games might try to create more memory mappings than currently allowed. " +
-                            "Ryujinx will crash as soon as this limit gets exceeded.\n\n" +
-                            "You might want to either manually increase the limit or install pkexec, which allows Ryujinx to assist with that.");
-                    }
-                }
-            }
-
-            if (CommandLineState.LaunchPathArg != null)
-            {
-                mainWindow.RunApplication(CommandLineState.LaunchPathArg, CommandLineState.StartFullscreenArg);
-            }
-
-            if (ConfigurationState.Instance.CheckUpdatesOnStart.Value && Updater.CanUpdate(false))
-            {
-                Updater.BeginParse(mainWindow, false).ContinueWith(task =>
-                {
-                    Logger.Error?.Print(LogClass.Application, $"Updater Error: {task.Exception}");
-                }, TaskContinuationOptions.OnlyOnFaulted);
-            }
-
-            Application.Run();
         }
 
         private static void PrintSystemInfo()
@@ -338,8 +198,7 @@ namespace Ryujinx
             Logger.Notice.Print(LogClass.Application, $"Ryujinx Version: {Version}");
             SystemInfo.Gather().Print();
 
-            var enabledLogs = Logger.GetEnabledLevels();
-            Logger.Notice.Print(LogClass.Application, $"Logs Enabled: {(enabledLogs.Count == 0 ? "<None>" : string.Join(", ", enabledLogs))}");
+            Logger.Notice.Print(LogClass.Application, $"Logs Enabled: {(Logger.GetEnabledLevels().Count == 0 ? "<None>" : string.Join(", ", Logger.GetEnabledLevels()))}");
 
             if (AppDataManager.Mode == AppDataManager.LaunchMode.Custom)
             {