|
@@ -1,6 +1,7 @@
|
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Common.Logging;
|
|
|
using System;
|
|
using System;
|
|
|
using System.Drawing;
|
|
using System.Drawing;
|
|
|
|
|
+using System.Globalization;
|
|
|
using System.Runtime.InteropServices;
|
|
using System.Runtime.InteropServices;
|
|
|
using System.Runtime.Versioning;
|
|
using System.Runtime.Versioning;
|
|
|
|
|
|
|
@@ -11,6 +12,23 @@ namespace Ryujinx.Common.System
|
|
|
[DllImport("user32.dll")]
|
|
[DllImport("user32.dll")]
|
|
|
private static extern bool SetProcessDPIAware();
|
|
private static extern bool SetProcessDPIAware();
|
|
|
|
|
|
|
|
|
|
+ private const string X11LibraryName = "libX11.so.6";
|
|
|
|
|
+
|
|
|
|
|
+ [DllImport(X11LibraryName)]
|
|
|
|
|
+ private static extern IntPtr XOpenDisplay(string display);
|
|
|
|
|
+
|
|
|
|
|
+ [DllImport(X11LibraryName)]
|
|
|
|
|
+ private static extern IntPtr XGetDefault(IntPtr display, string program, string option);
|
|
|
|
|
+
|
|
|
|
|
+ [DllImport(X11LibraryName)]
|
|
|
|
|
+ private static extern int XDisplayWidth(IntPtr display, int screenNumber);
|
|
|
|
|
+
|
|
|
|
|
+ [DllImport(X11LibraryName)]
|
|
|
|
|
+ private static extern int XDisplayWidthMM(IntPtr display, int screenNumber);
|
|
|
|
|
+
|
|
|
|
|
+ [DllImport(X11LibraryName)]
|
|
|
|
|
+ private static extern int XCloseDisplay(IntPtr display);
|
|
|
|
|
+
|
|
|
private static readonly double _standardDpiScale = 96.0;
|
|
private static readonly double _standardDpiScale = 96.0;
|
|
|
private static readonly double _maxScaleFactor = 1.25;
|
|
private static readonly double _maxScaleFactor = 1.25;
|
|
|
|
|
|
|
@@ -36,9 +54,29 @@ namespace Ryujinx.Common.System
|
|
|
{
|
|
{
|
|
|
userDpiScale = Graphics.FromHwnd(IntPtr.Zero).DpiX;
|
|
userDpiScale = Graphics.FromHwnd(IntPtr.Zero).DpiX;
|
|
|
}
|
|
}
|
|
|
- else
|
|
|
|
|
|
|
+ else if (OperatingSystem.IsLinux())
|
|
|
{
|
|
{
|
|
|
- // TODO: Linux support
|
|
|
|
|
|
|
+ string xdgSessionType = Environment.GetEnvironmentVariable("XDG_SESSION_TYPE")?.ToLower();
|
|
|
|
|
+
|
|
|
|
|
+ if (xdgSessionType == null || xdgSessionType == "x11")
|
|
|
|
|
+ {
|
|
|
|
|
+ IntPtr display = XOpenDisplay(null);
|
|
|
|
|
+ string dpiString = Marshal.PtrToStringAnsi(XGetDefault(display, "Xft", "dpi"));
|
|
|
|
|
+ if (dpiString == null || !double.TryParse(dpiString, NumberStyles.Any, CultureInfo.InvariantCulture, out userDpiScale))
|
|
|
|
|
+ {
|
|
|
|
|
+ userDpiScale = (double)XDisplayWidth(display, 0) * 25.4 / (double)XDisplayWidthMM(display, 0);
|
|
|
|
|
+ }
|
|
|
|
|
+ XCloseDisplay(display);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (xdgSessionType == "wayland")
|
|
|
|
|
+ {
|
|
|
|
|
+ // TODO
|
|
|
|
|
+ Logger.Warning?.Print(LogClass.Application, $"Couldn't determine monitor DPI: Wayland not yet supported");
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ Logger.Warning?.Print(LogClass.Application, $"Couldn't determine monitor DPI: Unrecognised XDG_SESSION_TYPE: {xdgSessionType}");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
catch (Exception e)
|
|
catch (Exception e)
|