Fix Windows console hide path targeting the foreground window (#32)

This PR addresses [Ryubing/Issues#345](https://github.com/Ryubing/Issues/issues/345) by fixing the Windows console hide/show path so it only acts on Ryujinx’s own console window instead of whatever window happens to be focused during startup. Previously, when Show Console was disabled, the helper could race with focus changes and end up affecting another app or shell window while leaving the console visible; this change removes that foreground-window dependency and keeps the startup behavior scoped to the Ryujinx console.

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

.forgejo/workflows/build.yml

@@ -202,3 +202,44 @@ jobs:
           name: ryujinx-${{ matrix.configuration }}-${{ steps.version_info.outputs.result }}+${{ steps.version_info.outputs.git_short_hash }}-macos_universal
           path: "publish/*.tar.gz"
         if: forgejo.event_name == 'pull_request'
+
+  post_comment:
+    name: Post comment linking uploaded artifacts
+    runs-on: ubuntu-latest
+    needs: 
+      - build
+      - build_macos
+    steps:
+      - uses: actions/github-script@v9
+        with:
+          script: |
+            const forgejo = getOctokit(process.env.FORGEJO_TOKEN, {
+              baseUrl: 'https://git.ryujinx.app/api/v1'
+            });
+
+            const {owner, repo} = context.repo;
+            const run_id = ${{ forgejo.run_id }};
+            const pull_head_sha = '${{ forgejo.event.workflow_run.head_sha }}';
+
+            const issue_number = ${{ forgejo.event.pull_request.number }};
+            core.info(`Using pull request ${issue_number}`);
+
+            const {data: {artifacts}} = await forgejo.rest.actions.listWorkflowRunArtifacts({owner, repo, run_id});
+            if (!artifacts.length) {
+              return core.error(`No artifacts found`);
+            }
+            let body = `Download the artifacts for this pull request:\n`;
+            for (const art of artifacts) {
+              const url = `https://git.ryujinx.app/api/v1/repos/${owner}/${repo}/actions/artifacts/${art.id}/zip`;
+              body += `\n* [${art.name}](${url})`;
+            }
+
+            const {data: comments} = await forgejo.rest.issues.listComments({repo, owner, issue_number});
+            const existing_comment = comments.find((c) => c.user.login === 'forgejo-actions');
+            if (existing_comment) {
+              core.info(`Updating comment ${existing_comment.id}`);
+              await forgejo.rest.issues.updateComment({repo, owner, comment_id: existing_comment.id, body});
+            } else {
+              core.info(`Creating a comment`);
+              await forgejo.rest.issues.createComment({repo, owner, issue_number, body});
+            }

.forgejo/workflows/release.yml

@@ -143,9 +143,7 @@ jobs:
 
   macos_release:
     name: Release MacOS universal
-    runs-on: docker
-    container:
-      image: ghcr.io/catthehacker/ubuntu:act-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
 
@@ -207,7 +205,7 @@ jobs:
 
   post_ci:
     name: Post-CI Steps
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     needs:
       - macos_release
       - release

.forgejo/workflows/unused/nightly_pr_comment.yml

@@ -1,61 +0,0 @@
-name: Comment PR artifacts links
-
-on:
-  workflow_run:
-    workflows: ['Build PR']
-    types: [completed]
-
-jobs:
-  pr_comment:
-    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v9
-        with:
-          script: |
-            const {owner, repo} = context.repo;
-            const run_id = ${{github.event.workflow_run.id}};
-            const pull_head_sha = '${{github.event.workflow_run.head_sha}}';
-
-            const issue_number = await (async () => {
-              const pulls = await github.rest.pulls.list({owner, repo});
-              for await (const {data} of github.paginate.iterator(pulls)) {
-                for (const pull of data) {
-                  if (pull.head.sha === pull_head_sha) {
-                    return pull.number;
-                  }
-                }
-              }
-            })();
-            if (issue_number) {
-              core.info(`Using pull request ${issue_number}`);
-            } else {
-              return core.error(`No matching pull request found`);
-            }
-
-            const {data: {artifacts}} = await github.rest.actions.listWorkflowRunArtifacts({owner, repo, run_id});
-            if (!artifacts.length) {
-              return core.error(`No artifacts found`);
-            }
-            let body = `Download the artifacts for this pull request:\n`;
-            let hidden_debug_artifacts = `\n\n <details><summary>Only for Developers</summary>\n`;
-            for (const art of artifacts) {
-              const url = `https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip`;
-              if (art.name.includes('Debug')) {
-                hidden_debug_artifacts += `\n* [${art.name}](${url})`;
-              } else {
-                body += `\n* [${art.name}](${url})`;
-              }
-            }
-            hidden_debug_artifacts += `\n</details>`;
-            body += hidden_debug_artifacts;
-
-            const {data: comments} = await github.rest.issues.listComments({repo, owner, issue_number});
-            const existing_comment = comments.find((c) => c.user.login === 'github-actions[bot]');
-            if (existing_comment) {
-              core.info(`Updating comment ${existing_comment.id}`);
-              await github.rest.issues.updateComment({repo, owner, comment_id: existing_comment.id, body});
-            } else {
-              core.info(`Creating a comment`);
-              await github.rest.issues.createComment({repo, owner, issue_number, body});
-            }

Directory.Packages.props

@@ -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">

assets/Locales/Root.json

@@ -21425,6 +21425,31 @@
         "zh_TW": "需要重新啟動 Ryujinx"
       }
     },
+    {
+      "ID": "SettingsShowConsoleRestartMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "The console will be available the next time Ryujinx starts.",
+        "es_ES": "La consola estará disponible la próxima vez que se inicie Ryujinx.",
+        "fr_FR": "La console sera disponible au prochain démarrage de Ryujinx.",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "SettingsGpuBackendRestartMessage",
       "Translations": {

src/Ryujinx.Common/Helpers/ConsoleHelper.cs

@@ -12,11 +12,12 @@ namespace Ryujinx.Common.Helper
         private static partial nint GetConsoleWindow();
 
         [SupportedOSPlatform("windows")]
-        [LibraryImport("user32")]
+        [LibraryImport("kernel32", SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        private static partial bool ShowWindow(nint hWnd, int nCmdShow);
+        private static partial bool FreeConsole();
 
         public static bool SetConsoleWindowStateSupported => OperatingSystem.IsWindows();
+        public static bool HasConsoleWindow => OperatingSystem.IsWindows() && GetConsoleWindow() != nint.Zero;
 
         public static void SetConsoleWindowState(bool show)
         {
@@ -33,18 +34,31 @@ namespace Ryujinx.Common.Helper
         [SupportedOSPlatform("windows")]
         private static void SetConsoleWindowStateWindows(bool show)
         {
-            const int SW_HIDE = 0;
-            const int SW_SHOW = 5;
-
-            nint hWnd = GetConsoleWindow();
-
-            if (hWnd == nint.Zero)
+            if (show)
             {
-                Logger.Warning?.Print(LogClass.Application, "Attempted to show/hide console window but console window does not exist");
+                if (GetConsoleWindow() != nint.Zero)
+                {
+                    Logger.SetConsoleTargetEnabled(true);
+                }
                 return;
             }
 
-            ShowWindow(hWnd, show ? SW_SHOW : SW_HIDE);
+            Logger.SetConsoleTargetEnabled(false);
+            DetachConsole();
+        }
+
+        [SupportedOSPlatform("windows")]
+        private static void DetachConsole()
+        {
+            if (GetConsoleWindow() == nint.Zero)
+            {
+                return;
+            }
+
+            if (!FreeConsole())
+            {
+                Logger.Warning?.Print(LogClass.Application, "Attempted to detach console window but the operation failed");
+            }
         }
     }
 }

src/Ryujinx.Common/Logging/Logger.cs

@@ -136,11 +136,7 @@ namespace Ryujinx.Common.Logging
 
             _time = Stopwatch.StartNew();
 
-            // Logger should log to console by default
-            AddTarget(new AsyncLogTargetWrapper(
-                new ConsoleLogTarget("console"),
-                1000,
-                AsyncLogTargetOverflowAction.Discard));
+            SetConsoleTargetEnabled(true);
 
             Notice = new Log(LogLevel.Notice);
 
@@ -173,6 +169,21 @@ namespace Ryujinx.Common.Logging
             Updated += target.Log;
         }
 
+        public static void SetConsoleTargetEnabled(bool enabled)
+        {
+            if (enabled)
+            {
+                AddTarget(new AsyncLogTargetWrapper(
+                    new ConsoleLogTarget("console"),
+                    1000,
+                    AsyncLogTargetOverflowAction.Discard));
+            }
+            else
+            {
+                RemoveTarget("console");
+            }
+        }
+
         public static void RemoveTarget(string target)
         {
             ILogTarget logTarget = GetTarget(target);

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" />

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -656,10 +656,19 @@ namespace Ryujinx.Ava.UI.ViewModels
             get => ConfigurationState.Instance.UI.ShowConsole;
             set
             {
+                bool restartRequired = value && !ConsoleHelper.HasConsoleWindow;
+
                 ConfigurationState.Instance.UI.ShowConsole.Value = value;
 
                 ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
 
+                if (restartRequired)
+                {
+                    NotificationHelper.ShowInformation(
+                        LocaleManager.Instance[LocaleKeys.SettingsAppRequiredRestartMessage],
+                        LocaleManager.Instance[LocaleKeys.SettingsShowConsoleRestartMessage]);
+                }
+
                 OnPropertyChanged();
             }
         }