Fix the canary CI breaking caused by #110 (#121)

whoops

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

.forgejo/workflows/canary.yml

@@ -68,7 +68,7 @@ jobs:
           sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place '/^Name=Ryujinx$/s/Name=Ryujinx/Name=Ryujinx-Canary/' distribution/linux/Ryujinx.desktop
+          sed -r --in-place '/^Name=Ryujinx$/s/Name=Ryujinx/Name=Ryujinx-Canary/' distribution/linux/app.ryujinx.Ryujinx.desktop
         shell: bash
 
       - name: Create output dir

distribution/linux/Ryujinx.sh

@@ -1,23 +1,11 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 SCRIPT_DIR=$(dirname "$(realpath "$0")")
 
-if [ -f "$SCRIPT_DIR/Ryujinx.Headless.SDL3" ]; then
-    RYUJINX_BIN="Ryujinx.Headless.SDL3"
-fi
-
-if [ -f "$SCRIPT_DIR/Ryujinx" ]; then
-    RYUJINX_BIN="Ryujinx"
-fi
-
-if [ -z "$RYUJINX_BIN" ]; then
-    exit 1
-fi
-
 COMMAND="env LANG=C.UTF-8 DOTNET_EnableAlternateStackCheck=1"
 
 if command -v gamemoderun > /dev/null 2>&1; then
     COMMAND="$COMMAND gamemoderun"
 fi
 
-exec $COMMAND "$SCRIPT_DIR/$RYUJINX_BIN" "$@"
+exec $COMMAND "$SCRIPT_DIR/Ryujinx" "$@"

distribution/linux/app.ryujinx.Ryujinx.desktop

@@ -1,14 +1,12 @@
 [Desktop Entry]
-Version=1.0
+Version=1.5
 Name=Ryujinx
 Type=Application
-Icon=Ryujinx
+Icon=app.ryujinx.Ryujinx
 Exec=Ryujinx.sh %f
-Comment=A Nintendo Switch Emulator
 GenericName=Nintendo Switch Emulator
 Terminal=false
 Categories=Game;Emulator;
 MimeType=application/x-nx-nca;application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
-Keywords=Switch;Nintendo;Emulator;
 StartupWMClass=Ryujinx
 PrefersNonDefaultGPU=true

distribution/linux/appimage/AppRun

@@ -1,3 +0,0 @@
-#!/bin/sh
-CURRENTDIR="$(readlink -f "$(dirname "$0")")"
-exec "$CURRENTDIR"/usr/bin/Ryujinx.sh "$@"

distribution/linux/appimage/app.ryujinx.Ryujinx.appdata.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+	<id>app.ryujinx.Ryujinx</id>
+	<metadata_license>MIT</metadata_license>
+	<project_license>MIT</project_license>
+	<name>Ryujinx</name>
+	<summary>Nintendo Switch 1 emulator written in C#</summary>
+	<description>
+		<p>Ryujinx is an open-source Nintendo Switch emulator, originally created by gdkchan, written in C#.</p>
+	</description>
+	<launchable type="desktop-id">app.ryujinx.Ryujinx.desktop</launchable>
+	<url type="homepage">https://ryujinx.app/</url>
+	<developer id="app.ryujinx">
+		<name>Ryubing</name>
+	</developer>
+	<screenshots>
+		<screenshot type="default">
+			<image>https://git.ryujinx.app/projects/Ryubing/raw/branch/master/docs/shell.png</image>
+		</screenshot>
+	</screenshots>
+	<provides>
+		<id>app.ryujinx.Ryujinx.desktop</id>
+	</provides>
+	<content_rating type="oars-1.1" />
+</component>

distribution/linux/appimage/build-appimage.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 set -eu
 
 ROOTDIR="$(readlink -f "$(dirname "$0")")"/../../../
@@ -7,20 +7,33 @@ cd "$ROOTDIR"
 BUILDDIR=${BUILDDIR:-publish}
 OUTDIR=${OUTDIR:-publish_appimage}
 
+# AppStream
+
 rm -rf AppDir
-mkdir -p AppDir/usr/bin
+mkdir -p AppDir/usr/lib AppDir/usr/bin
+mkdir -p AppDir/usr/share/metainfo AppDir/usr/share/applications
+mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps/
 
-cp distribution/linux/Ryujinx.desktop AppDir/Ryujinx.desktop
+cp -r "$BUILDDIR"/* AppDir/usr/lib/
-cp distribution/linux/appimage/AppRun AppDir/AppRun
-cp distribution/misc/Logo.svg AppDir/Ryujinx.svg
 
+cp distribution/linux/appimage/app.ryujinx.Ryujinx.appdata.xml AppDir/usr/share/metainfo/app.ryujinx.Ryujinx.appdata.xml
+cp distribution/linux/app.ryujinx.Ryujinx.desktop AppDir/usr/share/applications/app.ryujinx.Ryujinx.desktop
+cp distribution/misc/Logo.png AppDir/usr/share/icons/hicolor/256x256/apps/app.ryujinx.Ryujinx.png
+ln -s ../lib/Ryujinx AppDir/usr/bin/Ryujinx
 
-cp -r "$BUILDDIR"/* AppDir/usr/bin/
+# AppImage Root
+
+ln -s ./usr/share/applications/app.ryujinx.Ryujinx.desktop AppDir/app.ryujinx.Ryujinx.desktop
+ln -s ./usr/share/icons/hicolor/256x256/apps/app.ryujinx.Ryujinx.png AppDir/.DirIcon
+ln -s ./usr/share/icons/hicolor/256x256/apps/app.ryujinx.Ryujinx.png AppDir/app.ryujinx.Ryujinx.png
+ln -s ./usr/lib/Ryujinx.sh AppDir/AppRun
 
 # Ensure necessary bins are set as executable
 chmod +x AppDir/AppRun AppDir/usr/bin/Ryujinx*
 
 mkdir -p "$OUTDIR"
 
+# The "-n" flag removes the appstream checks during build, in case the main website is down.
+# Run "appstreamcli validate --explain AppDir/usr/share/metainfo/app.ryujinx.Ryujinx.appdata.xml" to check manually
 appimagetool --appimage-extract-and-run -n --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \
     AppDir "$OUTDIR"/Ryujinx.AppImage

src/Ryujinx.Graphics.Vulkan/PipelineState.cs

@@ -588,8 +588,10 @@ namespace Ryujinx.Graphics.Vulkan
                 dynamicStates[5] = DynamicState.StencilReference;
                 dynamicStates[6] = DynamicState.BlendConstants;
 
-                if (supportsExtDynamicState)
+                if (supportsExtDynamicState && (gd.SupportsMTL31 || !gd.IsMoltenVk))
                 {
+                    // Requires Metal 3.1 and new MoltenVK, however extended dynamic states extension is not
+                    // available on older versions of MVK, so we can safely check only OS version.
                     dynamicStates[dynamicStatesCount++] = DynamicState.VertexInputBindingStrideExt;
                 }
 

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -98,6 +98,7 @@ namespace Ryujinx.Graphics.Vulkan
         internal bool IsIntelArc { get; private set; }
         internal bool IsQualcommProprietary { get; private set; }
         internal bool IsMoltenVk { get; private set; }
+        internal bool SupportsMTL31 { get; private set; }
         internal bool IsTBDR { get; private set; }
         internal bool IsSharedMemory { get; private set; }
 
@@ -123,6 +124,8 @@ namespace Ryujinx.Graphics.Vulkan
             // Any device running on MacOS is using MoltenVK, even Intel and AMD vendors.
             if (IsMoltenVk = OperatingSystem.IsMacOS())
                 MVKInitialization.Initialize();
+
+            SupportsMTL31 = OperatingSystem.IsMacOSVersionAtLeast(14);
         }
 
         public static VulkanRenderer Create(

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs

@@ -443,6 +443,7 @@ namespace Ryujinx.HLE.HOS.Applets
                     if ((newCalc.Flags & KeyboardCalcFlags.SetInputText) != 0)
                     {
                         _textValue = newCalc.InputText;
+                        _cursorBegin = _textValue.Length;
                         updateText = true;
 
                         Logger.Debug?.Print(LogClass.ServiceAm, $"Input text set to {_textValue}");

src/Ryujinx.Input.SDL3/SDL3Gamepad.cs

@@ -155,9 +155,7 @@ namespace Ryujinx.Input.SDL3
                 result |= GamepadFeaturesFlag.Led;
             }
             SDL_UnlockProperties(propID);
-
+            SDL_DestroyProperties(propID);
-            // NOTE: Do not call SDL_DestroyProperties here. These properties are owned
-            // internally by SDL and are freed when SDL_CloseGamepad is called (in Dispose).
 
             return result;
         }

src/Ryujinx.Input.SDL3/SDL3GamepadDriver.cs

@@ -331,18 +331,28 @@ namespace Ryujinx.Input.SDL3
 
         public IEnumerable<IGamepad> GetGamepads()
         {
-            string[] ids;
+            lock (_gamepadsIds)
-            lock (_lock)
             {
-                ids = _gamepadsIds.Values
+                foreach (var gamepad in _gamepadsIds)
-                    .Concat(_joyConsIds.Values)
+                {
-                    .Concat(_linkedJoyConsIds.Values)
+                    yield return GetGamepad(gamepad.Value);
-                    .ToArray();
+                }
             }
 
-            foreach (string id in ids)
+            lock (_joyConsIds)
             {
-                yield return GetGamepad(id);
+                foreach (var gamepad in _joyConsIds)
+                {
+                    yield return GetGamepad(gamepad.Value);
+                }
+            }
+            
+            lock (_linkedJoyConsIds)
+            {
+                foreach (var gamepad in _linkedJoyConsIds)
+                {
+                    yield return GetGamepad(gamepad.Value);
+                }
             }
         }
     }

src/Ryujinx.Input/HLE/NpadController.cs

@@ -561,6 +561,7 @@ namespace Ryujinx.Input.HLE
                     !controllerConfig.Rumble.EnableRumble)
                 {
                     return;
+
                 }
 
                 VibrationValue leftVibrationValue = dualVibrationValue.Item1;

src/Ryujinx/Systems/AppHost.cs

@@ -1094,10 +1094,10 @@ namespace Ryujinx.Ava.Systems
         {
             Dispatcher.UIThread.InvokeAsync(() =>
             {
-                if (_viewModel.StartGamesInFullscreen)
+                if (_viewModel.StartGamesInFullscreen && _viewModel.WindowState is not WindowState.FullScreen)
                 {
-                    _viewModel.WindowState = WindowState.FullScreen;
+                    // Use the view model toggle so decoration ordering matches user toggles.
-                    _viewModel.Window.TitleBar.ExtendsContentIntoTitleBar = true;
+                    _viewModel.ToggleFullscreen();
                 }
 
                 if (_viewModel.WindowState is WindowState.FullScreen || _viewModel.StartGamesWithoutUi)

src/Ryujinx/UI/Helpers/Converters/KeyValueConverter.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using Key = Ryujinx.Input.Key;
+using HidKey = Ryujinx.Common.Configuration.Hid.Key;
 
 namespace Ryujinx.Ava.UI.Helpers
 {
@@ -55,6 +56,9 @@ namespace Ryujinx.Ava.UI.Helpers
                 Key key => KeyboardLayoutLocaleHelper.TryGetSemanticLabel(key, out string localizedKeyLabel)
                         ? localizedKeyLabel
                         : key.ToString(),
+                HidKey key => KeyboardLayoutLocaleHelper.TryGetSemanticLabel((Key)(int)key, out string localizedHidKeyLabel)
+                        ? localizedHidKeyLabel
+                        : key.ToString(),
                 PhysicalKey physicalKey => PhysicalKeyLabelHelper.GetDisplayString(physicalKey),
                 GamepadInputId gamepadInputId => GetLocalizedMappedValue(gamepadInputId, _gamepadInputIdMap),
                 StickInputId stickInputId => GetLocalizedMappedValue(stickInputId, _stickInputIdMap),

src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs

@@ -2,6 +2,7 @@ using Avalonia.Svg.Skia;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;
+using Ryujinx.Common.Helper;
 using Ryujinx.Common.Utilities;
 using Ryujinx.UI.Views.Input;
 
@@ -59,32 +60,46 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public partial SvgImage Image { get; set; }
         public InputViewModel ParentModel { get; }
 
+        private readonly RefEvent<System.Drawing.Color>.Handler _rainbowLedHandler;
+
         public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config, StickVisualizer visualizer)
         {
             ParentModel = model;
             Visualizer = visualizer;
+            _rainbowLedHandler = SetRainbowLed;
+
             model.NotifyChangesEvent += OnParentModelChanged;
             OnParentModelChanged();
-            config.PropertyChanged += (_, args) =>
+            config.PropertyChanged += OnConfigPropertyChanged;
-            {
-                if (args.PropertyName is nameof(Config.UseRainbowLed))
-                {
-                    if (Config is { UseRainbowLed: true, TurnOffLed: false, EnableLedChanging: true })
-                        Rainbow.Updated += (ref color) => ParentModel.SelectedGamepad.SetLed((uint)color.ToArgb());
-                    else
-                    {
-                        Rainbow.Reset();
-
-                        if (Config.TurnOffLed)
-                            ParentModel.SelectedGamepad.ClearLed();
-                        else
-                            ParentModel.SelectedGamepad.SetLed(Config.LedColor.ToUInt32());
-                    }
-                }
-            };
             Config = config;
         }
 
+        private void OnConfigPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs args)
+        {
+            if (args.PropertyName is nameof(Config.UseRainbowLed))
+            {
+                if (Config is { UseRainbowLed: true, TurnOffLed: false, EnableLedChanging: true })
+                {
+                    Rainbow.Updated -= _rainbowLedHandler;
+                    Rainbow.Updated += _rainbowLedHandler;
+                }
+                else
+                {
+                    Rainbow.Reset();
+
+                    if (Config.TurnOffLed)
+                        ParentModel.SelectedGamepad.ClearLed();
+                    else
+                        ParentModel.SelectedGamepad.SetLed(Config.LedColor.ToUInt32());
+                }
+            }
+        }
+
+        private void SetRainbowLed(ref System.Drawing.Color color)
+        {
+            ParentModel.SelectedGamepad.SetLed((uint)color.ToArgb());
+        }
+
         public async void ShowMotionConfig()
         {
             await MotionInputView.Show(this);

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -23,7 +23,6 @@ using Ryujinx.Input.SDL3;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
@@ -81,10 +80,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 field = value;
 
-                if ((field?.Features & GamepadFeaturesFlag.Led) != 0 &&
-                    ConfigViewModel is ControllerInputViewModel { Config.UseRainbowLed: true })
-                    Rainbow.Updated += (ref Color color) => field.SetLed((uint)color.ToArgb());
-
                 OnPropertiesChanged(nameof(HasLed), nameof(CanClearLed));
             }
         }