Merge branch 'brute_scaling' into 'master'

linux: Attempt to apply Avalonia scaling factor via environment pre-launch. (656)

Closes #1

See merge request ryubing/ryujinx!3

distribution/linux/Ryujinx.sh

@@ -20,4 +20,40 @@ if command -v gamemoderun > /dev/null 2>&1; then
     COMMAND="$COMMAND gamemoderun"
 fi
 
+# Check if user already has a manual Avalonia scaling override or session type is x11.
+if [ -n "${AVALONIA_GLOBAL_SCALE_FACTOR-}" ] || [ "$XDG_SESSION_TYPE" = "x11" ]; then
+    echo "Scaling: Performed by environment, skipping." >&2
+else
+    # Query monitor config directly (GNOME), default display only.
+    if [[ "$(echo "$XDG_CURRENT_DESKTOP")" == "GNOME" && -f ~/.config/monitors.xml ]] then
+        echo -n 'Scaling: Monitor config located, querying scale...' >&2
+        SCALING="$(grep '<scale' ~/.config/monitors.xml -m 1 | cut -f2 -d">"|cut -f1 -d"<")"
+        SCALING="${SCALING##* }"
+        echo "found! Factor: ${SCALING}" >&2
+
+    # Fallback to X DPI query for others.
+    # Plasma handles this fine, GNOME will always round up e.g. 1.25 -> 2.00.
+    elif command -v xrdb >/dev/null; then
+        echo -n 'Scaling: Attempting to get scaling from X DPI value...' >&2
+        dpi="$(xrdb -get Xft.dpi)"
+        if [[ -n "${dpi}" ]]; then
+            SCALING=$(awk -vdpi="$dpi" 'BEGIN{print dpi/96}')
+        fi
+        echo "found! Factor: ${SCALING}"
+
+    # Query kscreen-doctor for Plasma as a fallback.
+    elif [[ "$(echo "$XDG_CURRENT_DESKTOP")" == "KDE" ]] && command -v kscreen-doctor >/dev/null; then
+        # gsub strips ANSI color codes from ksd output
+        SCALING=$(kscreen-doctor --outputs | awk '/Scale:/{gsub(/\x1b\[[0-9;]*m/,""); print $2; exit}')
+        echo "found! Factor: ${SCALING}"
+    fi
+
+    if [[ -z "${SCALING-}" || "${SCALING-}" == "0" ]]; then
+        echo 'Unset invalid scaling value' >&2
+        SCALING="1"
+    fi
+
+    COMMAND="$COMMAND AVALONIA_GLOBAL_SCALE_FACTOR=$SCALING"
+fi
+
 exec $COMMAND "$SCRIPT_DIR/$RYUJINX_BIN" "$@"

src/Ryujinx.Common/ReleaseInformation.cs

@@ -1,5 +1,9 @@
+using Ryujinx.Common.Utilities;
 using System;
+using System.Net.Http;
 using System.Reflection;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
 
 namespace Ryujinx.Common
 {
@@ -34,12 +38,60 @@ namespace Ryujinx.Common
 
         public static string Version => IsValid ? BuildVersion : Assembly.GetEntryAssembly()!.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
 
-        public static string GetChangelogUrl(Version currentVersion, Version newVersion) =>
+        public static string GetChangelogUrl(Version currentVersion, Version newVersion, ReleaseChannels.Channel releaseChannel) =>
             IsCanaryBuild 
                 ? $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelSourceRepo}/compare/Canary-{currentVersion}...Canary-{newVersion}" 
-                : GetChangelogForVersion(newVersion);
+                : GetChangelogForVersion(newVersion, releaseChannel);
         
-        public static string GetChangelogForVersion(Version version) =>
-            $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelRepo}/releases/{version}";
+        public static string GetChangelogForVersion(Version version, ReleaseChannels.Channel releaseChannel) =>
+            $"https://github.com/{releaseChannel}/releases/{version}";
+        
+        public static async Task<ReleaseChannels> GetReleaseChannelsAsync(HttpClient httpClient)
+        {
+            ReleaseChannelPair releaseChannelPair = JsonHelper.Deserialize(await httpClient.GetStringAsync("https://ryujinx.app/api/release-channels"), ReleaseChannelPairContext.Default.ReleaseChannelPair);
+            return ReleaseChannels.Create(releaseChannelPair);
+        }
+    }
+
+    public struct ReleaseChannels
+    {
+        internal static ReleaseChannels Create(ReleaseChannelPair channelPair) =>
+            new()
+            {
+                Stable = new Channel(channelPair.Stable), 
+                Canary = new Channel(channelPair.Canary)
+            };
+
+        public Channel Stable { get; init; }
+        public Channel Canary { get; init; }
+        
+        public struct Channel
+        {
+            public Channel(string raw)
+            {
+                string[] parts = raw.Split('/');
+                Owner = parts[0];
+                Repo = parts[1];
+            }
+            
+            public string Owner;
+            public string Repo;
+
+            public override string ToString() => $"{Owner}/{Repo}";
+
+            public string GetLatestReleaseApiUrl() =>
+                $"https://api.github.com/repos/{ToString()}/releases/latest";
+        }
+    }
+    
+    [JsonSerializable(typeof(ReleaseChannelPair))]
+    partial class ReleaseChannelPairContext : JsonSerializerContext;
+
+    class ReleaseChannelPair
+    {
+        [JsonPropertyName("stable")]
+        public string Stable { get; set; }
+        [JsonPropertyName("canary")]
+        public string Canary { get; set; }
     }
 }

src/Ryujinx/Systems/Updater.cs

@@ -31,9 +31,9 @@ namespace Ryujinx.Ava.Systems
 {
     internal static class Updater
     {
+        private static ReleaseChannels.Channel? _currentReleaseChannel;
+        
         private const string GitHubApiUrl = "https://api.github.com";
-        private const string LatestReleaseUrl = 
-            $"{GitHubApiUrl}/repos/{ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}/releases/latest";
         
         private static readonly GithubReleasesJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
 
@@ -76,7 +76,16 @@ namespace Ryujinx.Ava.Systems
             {
                 using HttpClient jsonClient = ConstructHttpClient();
                 
-                string fetchedJson = await jsonClient.GetStringAsync(LatestReleaseUrl);
+                if (_currentReleaseChannel == null)
+                {
+                    ReleaseChannels releaseChannels = await ReleaseInformation.GetReleaseChannelsAsync(jsonClient);
+
+                    _currentReleaseChannel = ReleaseInformation.IsCanaryBuild
+                        ? releaseChannels.Canary
+                        : releaseChannels.Stable;
+                }
+                
+                string fetchedJson = await jsonClient.GetStringAsync(_currentReleaseChannel.Value.GetLatestReleaseApiUrl());
                 GithubReleasesJsonResponse fetched = JsonHelper.Deserialize(fetchedJson, _serializerContext.GithubReleasesJsonResponse);
                 _buildVer = fetched.TagName;
 
@@ -122,7 +131,7 @@ namespace Ryujinx.Ava.Systems
 
                         if (userResult is UserResult.Ok)
                         {
-                            OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion));
+                            OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion, _currentReleaseChannel.Value));
                         }
                     }