headless: Add Ignore Controller Applet as a configurable option

misc: Small cleanups
UI: fix: when switching players, it would show old config (#122 )
2025-09-20 01:25:20 +00:00 · 2024-11-10 15:48:07 -06:00 · 2024-11-10 15:34:24 -06:00 · 2024-11-09 23:24:17 -06:00 · 2024-11-09 21:18:50 -06:00 · 2024-11-09 19:30:19 -06:00
23 changed files with 299 additions and 122 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,36 +74,36 @@ jobs:
          chmod +x ./publish_sdl2_headless/Ryujinx.Headless.SDL2 ./publish_sdl2_headless/Ryujinx.sh
        if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'

-      #- name: Build AppImage
-      #  if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
-      #  run: |
-      #    PLATFORM_NAME="${{ matrix.platform.name }}"
+      - name: Build AppImage
+        if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
+        run: |
+          PLATFORM_NAME="${{ matrix.platform.name }}"

-      #    sudo apt install -y zsync desktop-file-utils appstream
+          sudo apt install -y zsync desktop-file-utils appstream

-      #    mkdir -p tools
-      #    export PATH="$PATH:$(readlink -f tools)"
+          mkdir -p tools
+          export PATH="$PATH:$(readlink -f tools)"

-      #    # Setup appimagetool
-      #    wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-      #    chmod +x tools/appimagetool
-      #    chmod +x distribution/linux/appimage/build-appimage.sh
+          # Setup appimagetool
+          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+          chmod +x tools/appimagetool
+          chmod +x distribution/linux/appimage/build-appimage.sh

          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
-      #    if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-      #      ARCH_NAME=x64
-      #      export ARCH=x86_64
-      #    elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-      #      ARCH_NAME=arm64
-      #      export ARCH=aarch64
-      #    else
-      #      echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
-      #      exit 1
-      #    fi
+          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+            ARCH_NAME=x64
+            export ARCH=x86_64
+          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+            ARCH_NAME=arm64
+            export ARCH=aarch64
+          else
+            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
+            exit 1
+          fi

-      #    export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
-      #    BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
-      #  shell: bash
+          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
+          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
+        shell: bash

      - name: Upload Ryujinx artifact
        uses: actions/upload-artifact@v4
@@ -112,12 +112,12 @@ jobs:
          path: publish
        if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'

-      #- name: Upload Ryujinx (AppImage) artifact
-      #  uses: actions/upload-artifact@v4
-      #  if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
-      #  with:
-      #    name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}-AppImage
-      #    path: publish_appimage
+      - name: Upload Ryujinx (AppImage) artifact
+        uses: actions/upload-artifact@v4
+        if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
+        with:
+          name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}-AppImage
+          path: publish_appimage

      - name: Upload Ryujinx.Headless.SDL2 artifact
        uses: actions/upload-artifact@v4
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -101,83 +101,79 @@ jobs:

      - name: Publish
        run: |
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained -p:IncludeNativeLibrariesForSelfExtract=true
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained -p:IncludeNativeLibrariesForSelfExtract=true
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained -p:IncludeNativeLibrariesForSelfExtract=true
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained -p:IncludeNativeLibrariesForSelfExtract=true

      - name: Packing Windows builds
        if: matrix.platform.os == 'windows-latest'
        run: |
-          pushd publish_ava
-          rm publish/libarmeilleure-jitsupport.dylib
-          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          pushd publish
+          rm libarmeilleure-jitsupport.dylib
+          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
          popd

          pushd publish_sdl2_headless
-          rm publish/libarmeilleure-jitsupport.dylib
-          7z a ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          rm libarmeilleure-jitsupport.dylib
+          7z a ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
          popd
        shell: bash
+      
+      - name: Build AppImage (Linux)
+        if: matrix.platform.os == 'ubuntu-latest'
+        run: |
+          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
+          PLATFORM_NAME="${{ matrix.platform.name }}"
+
+          sudo apt install -y zsync desktop-file-utils appstream
+
+          mkdir -p tools
+          export PATH="$PATH:$(readlink -f tools)"
+
+          # Setup appimagetool
+          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+          chmod +x tools/appimagetool
+          chmod +x distribution/linux/appimage/build-appimage.sh
+
+          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
+          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+            ARCH_NAME=x64
+            export ARCH=x86_64
+          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+            ARCH_NAME=arm64
+            export ARCH=aarch64
+          else
+            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
+            exit 1
+          fi
+
+          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
+          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
+
+          pushd publish_appimage
+          mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
+          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
+          popd
+        shell: bash        

      - name: Packing Linux builds
        if: matrix.platform.os == 'ubuntu-latest'
        run: |
-          pushd publish_ava
-          rm publish/libarmeilleure-jitsupport.dylib
-          chmod +x publish/Ryujinx.sh publish/Ryujinx
-          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          pushd publish
+          chmod +x Ryujinx.sh Ryujinx
+          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
          popd

          pushd publish_sdl2_headless
-          rm publish/libarmeilleure-jitsupport.dylib
-          chmod +x publish/Ryujinx.sh publish/Ryujinx.Headless.SDL2
-          tar -czvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          chmod +x Ryujinx.sh Ryujinx.Headless.SDL2
+          tar -czvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
          popd
        shell: bash
-      
-      #- name: Build AppImage (Linux)
-      #  if: matrix.platform.os == 'ubuntu-latest'
-      #  run: |
-      #    BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-      #    PLATFORM_NAME="${{ matrix.platform.name }}"
-
-      #    sudo apt install -y zsync desktop-file-utils appstream
-
-      #    mkdir -p tools
-      #    export PATH="$PATH:$(readlink -f tools)"
-
-          # Setup appimagetool
-      #    wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-      #    chmod +x tools/appimagetool
-      #    chmod +x distribution/linux/appimage/build-appimage.sh
-
-          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
-      #    if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-      #      ARCH_NAME=x64
-      #      export ARCH=x86_64
-      #    elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-      #      ARCH_NAME=arm64
-      #      export ARCH=aarch64
-      #    else
-      #      echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
-      #      exit 1
-      #    fi
-
-      #    export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
-      #    BUILDDIR=publish_ava OUTDIR=publish_ava_appimage distribution/linux/appimage/build-appimage.sh
-
-          # Add to release output
-      #    pushd publish_ava_appimage
-      #    mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
-      #    mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
-      #    popd
-      #  shell: bash

      - name: Pushing new release
        uses: ncipollo/release-action@v1
        with:
          name: ${{ steps.version_info.outputs.build_version }}
-          artifacts: "release_output/*.tar.gz,release_output/*.zip"
-          #artifacts: "release_output/*.tar.gz,release_output/*.zip/*AppImage*"
+          artifacts: "release_output/*.tar.gz,release_output/*.zip/*AppImage*"
          tag: ${{ steps.version_info.outputs.build_version }}
          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
          omitBodyDuringUpdate: true
@@ -233,7 +229,7 @@ jobs:

      - name: Publish macOS Ryujinx
        run: |
-          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release

      - name: Publish macOS Ryujinx.Headless.SDL2
        run: |
@@ -243,7 +239,7 @@ jobs:
        uses: ncipollo/release-action@v1
        with:
          name: ${{ steps.version_info.outputs.build_version }}
-          artifacts: "publish_ava/*.tar.gz, publish_headless/*.tar.gz"
+          artifacts: "publish/*.tar.gz, publish_headless/*.tar.gz"
          tag: ${{ steps.version_info.outputs.build_version }}
          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
          omitBodyDuringUpdate: true
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -22,7 +22,7 @@
    <PackageVersion Include="LibHac" Version="0.19.0" />
    <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.0.1" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
    <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
--- a/README.md
+++ b/README.md
@@ -14,6 +14,15 @@
        <img src="https://img.shields.io/github/v/release/GreemDev/Ryujinx"
            alt="Latest Release">
    </a>
+  <br>
+    <a href="https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml">
+        <img src="https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml/badge.svg"
+            alt="">
+    </a>
+    <a href="https://github.com/GreemDev/Ryujinx-Canary/releases/latest">
+        <img src="https://img.shields.io/github/v/release/GreemDev/Ryujinx-Canary?label=canary"
+            alt="Latest Canary Release">
+    </a>
 </h1>

 <p align="center">
--- a/src/ARMeilleure/Translation/Dominance.cs
+++ b/src/ARMeilleure/Translation/Dominance.cs
@@ -77,7 +77,7 @@ namespace ARMeilleure.Translation
                {
                    continue;
                }
-
+                
                for (int pBlkIndex = 0; pBlkIndex < block.Predecessors.Count; pBlkIndex++)
                {
                    BasicBlock current = block.Predecessors[pBlkIndex];
--- a/src/ARMeilleure/Translation/PTC/Ptc.cs
+++ b/src/ARMeilleure/Translation/PTC/Ptc.cs
@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
+using System.Linq;
 using System.Runtime;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -848,18 +849,15 @@ namespace ARMeilleure.Translation.PTC
                }
            }

-            List<Thread> threads = new();

-            for (int i = 0; i < degreeOfParallelism; i++)
-            {
-                Thread thread = new(TranslateFuncs)
-                {
-                    IsBackground = true,
-                    Name = "Ptc.TranslateThread." + i
-                };
-
-                threads.Add(thread);
-            }
+            List<Thread> threads = Enumerable.Range(0, degreeOfParallelism)
+                .Select(idx => 
+                    new Thread(TranslateFuncs)
+                    {
+                        IsBackground = true, 
+                        Name = "Ptc.TranslateThread." + idx 
+                    }
+                ).ToList();

            Stopwatch sw = Stopwatch.StartNew();

--- a/src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs
+++ b/src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs
@@ -30,10 +30,10 @@ namespace Ryujinx.Common.Logging.Targets
        string ILogTarget.Name { get => _target.Name; }

        public AsyncLogTargetWrapper(ILogTarget target)
-            : this(target, -1, AsyncLogTargetOverflowAction.Block)
+            : this(target, -1)
        { }

-        public AsyncLogTargetWrapper(ILogTarget target, int queueLimit, AsyncLogTargetOverflowAction overflowAction)
+        public AsyncLogTargetWrapper(ILogTarget target, int queueLimit = -1, AsyncLogTargetOverflowAction overflowAction = AsyncLogTargetOverflowAction.Block)
        {
            _target = target;
            _messageQueue = new BlockingCollection<LogEventArgs>(queueLimit);
--- a/src/Ryujinx.HLE/HOS/Applets/AppletManager.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/AppletManager.cs
@@ -1,4 +1,6 @@
+using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Applets.Browser;
+using Ryujinx.HLE.HOS.Applets.Dummy;
 using Ryujinx.HLE.HOS.Applets.Error;
 using Ryujinx.HLE.HOS.Services.Am.AppletAE;
 using System;
@@ -26,9 +28,13 @@ namespace Ryujinx.HLE.HOS.Applets
                    return new BrowserApplet(system);
                case AppletId.LibAppletOff:
                    return new BrowserApplet(system);
+                case AppletId.MiiEdit:
+                    Logger.Warning?.Print(LogClass.Application, $"Please use the MiiEdit inside File/Open Applet");
+                    return new DummyApplet(system);
            }

-            throw new NotImplementedException($"{applet} applet is not implemented.");
+            Logger.Warning?.Print(LogClass.Application, $"Applet {applet} not implemented!");
+            return new DummyApplet(system);
        }
    }
 }
--- a/src/Ryujinx.HLE/HOS/Applets/Dummy/DummyApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Dummy/DummyApplet.cs
@@ -0,0 +1,43 @@
+using Ryujinx.Common.Logging;
+using Ryujinx.Common.Memory;
+using Ryujinx.HLE.HOS.Applets;
+using Ryujinx.HLE.HOS.Services.Am.AppletAE;
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+namespace Ryujinx.HLE.HOS.Applets.Dummy
+{
+    internal class DummyApplet : IApplet
+    {
+        private readonly Horizon _system;
+        private AppletSession _normalSession;
+        public event EventHandler AppletStateChanged;
+        public DummyApplet(Horizon system)
+        {
+            _system = system;
+        }
+        public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession)
+        {
+            _normalSession = normalSession;
+            _normalSession.Push(BuildResponse());
+            AppletStateChanged?.Invoke(this, null);
+            _system.ReturnFocus();
+            return ResultCode.Success;
+        }
+        private static T ReadStruct<T>(byte[] data) where T : struct
+        {
+            return MemoryMarshal.Read<T>(data.AsSpan());
+        }
+        private static byte[] BuildResponse()
+        {
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
+            writer.Write((ulong)ResultCode.Success);
+            return stream.ToArray();
+        }
+        public ResultCode GetResult()
+        {
+            return ResultCode.Success;
+        }
+    }
+}
--- a/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/VirtualAmiiboFile.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/VirtualAmiiboFile.cs
@@ -8,6 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
        public uint FileVersion { get; set; }
        public byte[] TagUuid { get; set; }
        public string AmiiboId { get; set; }
+        public string NickName { get; set; }
        public DateTime FirstWriteDate { get; set; }
        public DateTime LastWriteDate { get; set; }
        public ushort WriteCounter { get; set; }
--- a/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs
@@ -64,16 +64,17 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
            };
        }

-        public static RegisterInfo GetRegisterInfo(ITickSource tickSource, string amiiboId, string nickname)
+        public static RegisterInfo GetRegisterInfo(ITickSource tickSource, string amiiboId, string userName)
        {
            VirtualAmiiboFile amiiboFile = LoadAmiiboFile(amiiboId);
-
+            string nickname = amiiboFile.NickName ?? "Ryujinx";
            UtilityImpl utilityImpl = new(tickSource);
            CharInfo charInfo = new();

            charInfo.SetFromStoreData(StoreData.BuildDefault(utilityImpl, 0));

-            charInfo.Nickname = Nickname.FromString(nickname);
+            // This is the player's name
+            charInfo.Nickname = Nickname.FromString(userName);

            RegisterInfo registerInfo = new()
            {
@@ -85,7 +86,9 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
                Reserved1 = new Array64<byte>(),
                Reserved2 = new Array58<byte>(),
            };
-            "Ryujinx"u8.CopyTo(registerInfo.Nickname.AsSpan());
+            // This is the amiibo's name
+            byte[] nicknameBytes = System.Text.Encoding.UTF8.GetBytes(nickname);
+            nicknameBytes.CopyTo(registerInfo.Nickname.AsSpan());

            return registerInfo;
        }
--- a/src/Ryujinx.Headless.SDL2/OpenGL/OpenGLWindow.cs
+++ b/src/Ryujinx.Headless.SDL2/OpenGL/OpenGLWindow.cs
@@ -117,8 +117,9 @@ namespace Ryujinx.Headless.SDL2.OpenGL
            GraphicsDebugLevel glLogLevel,
            AspectRatio aspectRatio,
            bool enableMouse,
-            HideCursorMode hideCursorMode)
-            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode)
+            HideCursorMode hideCursorMode,
+            bool ignoreControllerApplet)
+            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet)
        {
            _glLogLevel = glLogLevel;
        }
--- a/src/Ryujinx.Headless.SDL2/Options.cs
+++ b/src/Ryujinx.Headless.SDL2/Options.cs
@@ -225,6 +225,9 @@ namespace Ryujinx.Headless.SDL2

        [Option("ignore-missing-services", Required = false, Default = false, HelpText = "Enable ignoring missing services.")]
        public bool IgnoreMissingServices { get; set; }
+        
+        [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

--- a/src/Ryujinx.Headless.SDL2/Program.cs
+++ b/src/Ryujinx.Headless.SDL2/Program.cs
@@ -444,8 +444,7 @@ namespace Ryujinx.Headless.SDL2
                {
                    Logger.AddTarget(new AsyncLogTargetWrapper(
                        new FileLogTarget("file", logFile),
-                        1000,
-                        AsyncLogTargetOverflowAction.Block
+                        1000
                    ));
                }
                else
@@ -506,8 +505,8 @@ namespace Ryujinx.Headless.SDL2
        private static WindowBase CreateWindow(Options options)
        {
            return options.GraphicsBackend == GraphicsBackend.Vulkan
-                ? new VulkanWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode)
-                : new OpenGLWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode);
+                ? new VulkanWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet)
+                : new OpenGLWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet);
        }

        private static IRenderer CreateRenderer(Options options, WindowBase window)
--- a/src/Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs
+++ b/src/Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs
@@ -17,8 +17,9 @@ namespace Ryujinx.Headless.SDL2.Vulkan
            GraphicsDebugLevel glLogLevel,
            AspectRatio aspectRatio,
            bool enableMouse,
-            HideCursorMode hideCursorMode)
-            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode)
+            HideCursorMode hideCursorMode,
+            bool ignoreControllerApplet)
+            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet)
        {
            _glLogLevel = glLogLevel;
        }
--- a/src/Ryujinx.Headless.SDL2/WindowBase.cs
+++ b/src/Ryujinx.Headless.SDL2/WindowBase.cs
@@ -86,13 +86,15 @@ namespace Ryujinx.Headless.SDL2

        private readonly AspectRatio _aspectRatio;
        private readonly bool _enableMouse;
+        private readonly bool _ignoreControllerApplet;

        public WindowBase(
            InputManager inputManager,
            GraphicsDebugLevel glLogLevel,
            AspectRatio aspectRatio,
            bool enableMouse,
-            HideCursorMode hideCursorMode)
+            HideCursorMode hideCursorMode,
+            bool ignoreControllerApplet)
        {
            MouseDriver = new SDL2MouseDriver(hideCursorMode);
            _inputManager = inputManager;
@@ -108,6 +110,7 @@ namespace Ryujinx.Headless.SDL2
            _gpuDoneEvent = new ManualResetEvent(false);
            _aspectRatio = aspectRatio;
            _enableMouse = enableMouse;
+            _ignoreControllerApplet = ignoreControllerApplet;
            HostUITheme = new HeadlessHostUiTheme();

            SDL2Driver.Instance.Initialize();
@@ -484,6 +487,8 @@ namespace Ryujinx.Headless.SDL2

        public bool DisplayMessageDialog(ControllerAppletUIArgs args)
        {
+            if (_ignoreControllerApplet) return false;
+            
            string playerCount = args.PlayerCountMin == args.PlayerCountMax ? $"exactly {args.PlayerCountMin}" : $"{args.PlayerCountMin}-{args.PlayerCountMax}";

            string message = $"Application requests {playerCount} {"player".ToQuantity(args.PlayerCountMin + args.PlayerCountMax, ShowQuantityAs.None)} with:\n\n"
--- a/src/Ryujinx/Assets/Locales/en_US.json
+++ b/src/Ryujinx/Assets/Locales/en_US.json
@@ -413,6 +413,7 @@
  "AvatarSetBackgroundColor": "Set Background Color",
  "AvatarClose": "Close",
  "ControllerSettingsLoadProfileToolTip": "Load Profile",
+  "ControllerSettingsViewProfileToolTip": "View Profile",
  "ControllerSettingsAddProfileToolTip": "Add Profile",
  "ControllerSettingsRemoveProfileToolTip": "Remove Profile",
  "ControllerSettingsSaveProfileToolTip": "Save Profile",
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -30,6 +30,7 @@ namespace Ryujinx.Ava
 {
    internal partial class Program
    {
+        //
        public static double WindowScaleFactor { get; set; }
        public static double DesktopScaleFactor { get; set; } = 1.0;
        public static string Version { get; private set; }
--- a/src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
+++ b/src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
@@ -226,6 +226,24 @@ namespace Ryujinx.Ava.UI.Helpers
                (int)Symbol.Help,
                primaryButtonResult);

+        internal static async Task<UserResult> CreateConfirmationDialogExtended(
+            string primaryText,
+            string secondaryText,
+            string acceptButtonText,
+            string noacceptButtonText,
+            string cancelButtonText,
+            string title,
+            UserResult primaryButtonResult = UserResult.Yes)
+            => await ShowTextDialog(
+                string.IsNullOrWhiteSpace(title) ? LocaleManager.Instance[LocaleKeys.DialogConfirmationTitle] : title,
+                primaryText,
+                secondaryText,
+                acceptButtonText,
+                noacceptButtonText,
+                cancelButtonText,
+                (int)Symbol.Help,
+                primaryButtonResult);
+
        internal static async Task<UserResult> CreateLocalizedConfirmationDialog(string primaryText, string secondaryText)
            => await CreateConfirmationDialog(
                primaryText,
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -44,6 +44,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        private readonly MainWindow _mainWindow;

        private PlayerIndex _playerId;
+        private PlayerIndex _playerIdChoose;
        private int _controller;
        private string _controllerImage;
        private int _device;
@@ -83,6 +84,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            }
        }

+        public PlayerIndex PlayerIdChoose
+        {
+            get => _playerIdChoose;
+            set { }
+        }
+
        public PlayerIndex PlayerId
        {
            get => _playerId;
@@ -90,6 +97,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            {
                if (IsModified)
                {
+                    
+                    _playerIdChoose = value;
                    return;
                }

@@ -99,7 +108,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                if (!Enum.IsDefined(typeof(PlayerIndex), _playerId))
                {
                    _playerId = PlayerIndex.Player1;
+
                }
+                _isLoaded = false;

                LoadConfiguration();
                LoadDevice();
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
@@ -4,11 +4,14 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
+using DiscordRPC;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Common.Configuration.Hid.Controller;
+using Ryujinx.Common.Logging;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
+using System;
 using StickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;

 namespace Ryujinx.Ava.UI.Views.Input
@@ -27,6 +30,16 @@ namespace Ryujinx.Ava.UI.Views.Input
                {
                    button.IsCheckedChanged += Button_IsCheckedChanged;
                }
+
+                if (visual is CheckBox check)
+                {
+                    check.IsCheckedChanged += CheckBox_IsCheckedChanged;
+                }
+
+                if (visual is Slider slider)
+                {
+                    slider.PropertyChanged += Slider_IsCheckedChanged;
+                }
            }
        }

@@ -40,9 +53,51 @@ namespace Ryujinx.Ava.UI.Views.Input
            }
        }

+        private float _changeSlider = -1.0f;
+
+        private void Slider_IsCheckedChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            if (sender is Slider check)
+            {
+                if ((bool)check.IsPointerOver && _changeSlider == -1.0f)
+                {
+                    _changeSlider = (float)check.Value;
+                    
+                }
+                else if (!(bool)check.IsPointerOver)
+                {
+                    _changeSlider = -1.0f;
+                }
+
+                if (_changeSlider != -1.0f && _changeSlider != (float)check.Value)
+                {
+
+                     var viewModel = (DataContext as ControllerInputViewModel);
+                     viewModel.ParentModel.IsModified = true;
+                    _changeSlider = (float)check.Value;
+                }
+            }
+        }
+
+        private void CheckBox_IsCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox check)
+            {
+                if ((bool)check.IsPointerOver)
+                {
+
+                    var viewModel = (DataContext as ControllerInputViewModel);
+                    viewModel.ParentModel.IsModified = true;
+                    _currentAssigner?.Cancel();
+                    _currentAssigner = null;
+                }
+            }
+        }
+
+
        private void Button_IsCheckedChanged(object sender, RoutedEventArgs e)
        {
-            if (sender is ToggleButton button)
+            if (sender is ToggleButton button ) 
            {
                if ((bool)button.IsChecked)
                {
@@ -149,7 +204,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                    }
                    else
                    {
-                        if (_currentAssigner != null)
+                        if (_currentAssigner != null )
                        {
                            _currentAssigner.Cancel();
                            _currentAssigner = null;
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -108,7 +108,7 @@
                        ToolTip.Tip="{ext:Locale ControllerSettingsLoadProfileToolTip}"
                        Command="{Binding LoadProfile}">
                        <ui:SymbolIcon
-                            Symbol="Upload"
+                            Symbol="View"
                            FontSize="15"
                            Height="20" />
                    </Button>
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
@@ -25,17 +25,27 @@ namespace Ryujinx.Ava.UI.Views.Input

        private async void PlayerIndexBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
        {
+            if (PlayerIndexBox != null)
+            {
+                if (PlayerIndexBox.SelectedIndex != (int)ViewModel.PlayerId)
+                {
+                    PlayerIndexBox.SelectedIndex = (int)ViewModel.PlayerId;
+                }
+            }
+
            if (ViewModel.IsModified && !_dialogOpen)
            {
                _dialogOpen = true;

-                var result = await ContentDialogHelper.CreateConfirmationDialog(
+                var result = await ContentDialogHelper.CreateConfirmationDialogExtended(
                    LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmMessage],
                    LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmSubMessage],
                    LocaleManager.Instance[LocaleKeys.InputDialogYes],
                    LocaleManager.Instance[LocaleKeys.InputDialogNo],
+                    LocaleManager.Instance[LocaleKeys.Cancel],
                    LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);

+
                if (result == UserResult.Yes)
                {
                    ViewModel.Save();
@@ -43,14 +53,30 @@ namespace Ryujinx.Ava.UI.Views.Input

                _dialogOpen = false;

+                if (result == UserResult.Cancel)
+                {
+                 
+                    return;
+                }
+
                ViewModel.IsModified = false;

-                if (e.AddedItems.Count > 0)
+                if (result != UserResult.Cancel)
                {
-                    var player = (PlayerModel)e.AddedItems[0];
-                    ViewModel.PlayerId = player.Id;
+                    ViewModel.PlayerId = ViewModel.PlayerIdChoose;
+                }
+
+                if (result == UserResult.Cancel)
+                {
+                    if (e.AddedItems.Count > 0)
+                    {
+                        ViewModel.IsModified = true;
+                        var player = (PlayerModel)e.AddedItems[0];
+                        ViewModel.PlayerId = player.Id;
+                    }
                }
            }
+            
        }

        public void Dispose()
Author	SHA1	Message	Date
Evan Husted	9c82d98ec4	headless: Add Ignore Controller Applet as a configurable option	2024-11-10 15:48:07 -06:00
Evan Husted	4aae82bad1	misc: Small cleanups	2024-11-10 15:34:24 -06:00
Vladimir Sokolov	299be822c4	UI: fix: when switching players, it would show old config (#122 ) When switching between players' gamepads while saving settings, then returning to the previous player, the settings show the default settings instead of the actual settings applied	2024-11-09 23:24:17 -06:00
Jacobwasbeast	b17e4f79fb	Adds the ability to read a amiibo's nickname from the VirtualAmiiboFile (#217 ) This feature adds a way to change the Amiibo's nickname inside Smash and other places where it's used, so it’s not always "Ryujinx." However, I did not add a GUI or create the Cabinet applet that would allow users to change this. So you will have to go to system/amiibo and find your amiibo id to change it.	2024-11-09 21:18:50 -06:00
Piplup	a7b58df3fe	Appimage Round 2 (#73 )	2024-11-09 19:30:19 -06:00
Jacobwasbeast	8c2d6192ba	Add Dummy Applet to Replace NotImplementedException (#216 ) Currently, in Ryujinx, if an app attempts to open an unimplemented applet, it crashes. This change adds a dummy applet to send a dummy response instead of crashing and logs the applet.	2024-11-09 19:28:12 -06:00
Evan Husted	2a23000fed	Add Canary release badge & links	2024-11-08 19:54:36 -06:00
dependabot[bot]	ab7d0a2e6d	nuget: bump Microsoft.IdentityModel.JsonWebTokens from 8.0.1 to 8.1.2 (#13 )	2024-11-07 10:47:40 -06:00