skia-natives (again) (#78)

Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/78

Directory.Packages.props

@@ -13,7 +13,7 @@
     <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.5" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.50" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.6.2" />
     <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2" />
     <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.6.2" />
@@ -27,7 +27,7 @@
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.17.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.18.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@@ -57,7 +57,9 @@
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
     <PackageVersion Include="SkiaSharp" Version="2.88.9" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="2.88.9" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="2.88.9" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.9" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
     <PackageVersion Include="System.IO.Hashing" Version="9.0.15" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.3" />

README.md

@@ -5,7 +5,7 @@
         </td>
         <td align="center" width="75%">
           
-# Ryujinx
+<h1 class="ryu-gradient-text">Ryujinx</h1>
 
 [![Latest release](https://git.ryujinx.app/projects/Ryubing/badges/release.svg?label=stable&color=32cd32)](https://update.ryujinx.app/latest/stable)
 [![Latest canary release](https://git.ryujinx.app/Ryubing/Canary/badges/release.svg?label=canary&color=FF4500)](https://update.ryujinx.app/latest/canary)
@@ -21,7 +21,7 @@
   Ryujinx is an open-source Nintendo Switch emulator, originally created by gdkchan, written in C#.
   This emulator aims at providing excellent accuracy and performance, a user-friendly interface and consistent builds.
   It was written from scratch and development on the project began in September 2017.
-  Ryujinx is available on a self-managed <a href="https://github.com/Ryubing/forgejo" target="_blank">modified</a> <a href="https://forgejo.org/" target="_blank">Forgejo</a> instance under the <a href="https://git.ryujinx.app/projects/Ryubing/src/branch/master/LICENSE.txt" target="_blank">MIT license</a>.
+  Ryujinx is available on a self-managed <a class="forgejo-gradient-text" href="https://github.com/Ryubing/forgejo" target="_blank">modified Forgejo</a> instance under the <a href="https://git.ryujinx.app/projects/Ryubing/src/branch/master/LICENSE.txt" target="_blank">MIT license</a>.
   <br />
 </p>
 <p align="center">

src/Ryujinx.Common/Helpers/ConsoleHelper.cs

@@ -16,6 +16,15 @@ namespace Ryujinx.Common.Helper
         [return: MarshalAs(UnmanagedType.Bool)]
         private static partial bool ShowWindow(nint hWnd, int nCmdShow);
 
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("user32")]
+        private static partial nint GetForegroundWindow();
+
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("user32")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool SetForegroundWindow(nint hWnd);
+
         public static bool SetConsoleWindowStateSupported => OperatingSystem.IsWindows();
 
         public static void SetConsoleWindowState(bool show)
@@ -44,6 +53,10 @@ namespace Ryujinx.Common.Helper
                 return;
             }
 
+            SetForegroundWindow(hWnd);
+
+            hWnd = GetForegroundWindow();
+
             ShowWindow(hWnd, show ? SW_SHOW : SW_HIDE);
         }
     }

src/Ryujinx.HLE/Ryujinx.HLE.csproj

@@ -27,7 +27,9 @@
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="MsgPack.Cli" />
     <PackageReference Include="SkiaSharp" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Win32" />
+    <PackageReference Include="SkiaSharp.NativeAssets.macOS" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" />
     <PackageReference Include="NetCoreServer" />
     <PackageReference Include="Open.NAT.Core" />
   </ItemGroup>

src/Ryujinx/Program.cs

@@ -24,11 +24,9 @@ using Ryujinx.Headless;
 using Ryujinx.SDL3.Common;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava
@@ -54,22 +52,6 @@ namespace Ryujinx.Ava
 
             if (OperatingSystem.IsWindows())
             {
-#if !DEBUG
-                // this fixes the "hide console" option by forcing the emulator to launch in an old-school cmd
-                if (!Console.Title.Contains("conhost.exe"))
-                {
-                    StringBuilder sb = new();
-
-                    foreach (string arg in args)
-                    {
-                        sb.Append(arg.Contains(' ') ? $" \"{arg}\"" : $" {arg}");
-                    }
-                    
-                    Process.Start("conhost.exe", $"{Environment.ProcessPath} {sb}");
-                    return 0;
-                }
-#endif
-                
                 if (!OperatingSystem.IsWindowsVersionAtLeast(10, 0, 19041))
                 {
                     _ = Win32NativeInterop.MessageBoxA(nint.Zero, "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 20H1 and newer.\n", $"Ryujinx {Version}", MbIconwarning);
@@ -103,7 +85,7 @@ namespace Ryujinx.Ava
             CoreDumpArg = coreDumpArg;
 
             // TODO: Ryujinx causes core dumps on Linux when it exits "uncleanly", eg. through an unhandled exception.
-            //       This is undesirable and causes very odd behavior during development (the process stops responding, 
+            //       This is undesirable and causes very odd behavior during development (the process stops responding,
             //       the .NET debugger freezes or suddenly detaches, /tmp/ gets filled etc.), unless explicitly requested by the user.
             //       This needs to be investigated, but calling prctl() is better than modifying system-wide settings or leaving this be.
             if (!coreDumpArg)
@@ -260,7 +242,7 @@ namespace Ryujinx.Ava
                     ConfigurationPath = appDataConfigurationPath;
                 }
             }
-        
+
             if (ConfigurationPath == null)
             {
                 // No configuration, we load the default values and save it to disk
@@ -331,28 +313,28 @@ namespace Ryujinx.Ava
                     _ => ConfigurationState.Instance.HideCursor,
                 };
 
-            // Check if memoryManagerMode was overridden. 
+            // Check if memoryManagerMode was overridden.
             if (CommandLineState.OverrideMemoryManagerMode is not null)
                 if (Enum.TryParse(CommandLineState.OverrideMemoryManagerMode, true, out MemoryManagerMode result))
                 {
                     ConfigurationState.Instance.System.MemoryManagerMode.Value = result;
                 }
 
-            // Check if PPTC was overridden. 
+            // Check if PPTC was overridden.
             if (CommandLineState.OverridePPTC is not null)
                 if (Enum.TryParse(CommandLineState.OverridePPTC, true, out bool result))
                 {
                     ConfigurationState.Instance.System.EnablePtc.Value = result;
                 }
 
-            // Check if region was overridden. 
+            // Check if region was overridden.
             if (CommandLineState.OverrideSystemRegion is not null)
                 if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out Region result))
                 {
                     ConfigurationState.Instance.System.Region.Value = result;
                 }
 
-            //Check if language was overridden. 
+            //Check if language was overridden.
             if (CommandLineState.OverrideSystemLanguage is not null)
                 if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out Language result))
                 {

src/Ryujinx/Ryujinx.csproj

@@ -49,6 +49,9 @@
     <PackageReference Include="SharpCompress" />
     <PackageReference Include="Svg.Controls.Avalonia" />
     <PackageReference Include="Svg.Controls.Skia.Avalonia" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Win32" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
+    <PackageReference Include="SkiaSharp.NativeAssets.macOS" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Condition="'$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
     <PackageReference Include="DynamicData" />
     <PackageReference Include="FluentAvaloniaUI" />
     <PackageReference Include="CommandLineParser" />