From 247d26b4b50df8a068b9bfbb412a29f0c9f6a97b Mon Sep 17 00:00:00 2001 From: merry Date: Sun, 10 Apr 2022 18:04:22 +0100 Subject: [PATCH] ForceDpiAware: X11 implementation (#3269) * ForceDpiAware: X11 implementation * address comments --- Ryujinx.Common/System/ForceDpiAware.cs | 42 ++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/Ryujinx.Common/System/ForceDpiAware.cs b/Ryujinx.Common/System/ForceDpiAware.cs index dc513307a..f29630a62 100644 --- a/Ryujinx.Common/System/ForceDpiAware.cs +++ b/Ryujinx.Common/System/ForceDpiAware.cs @@ -1,6 +1,7 @@ using Ryujinx.Common.Logging; using System; using System.Drawing; +using System.Globalization; using System.Runtime.InteropServices; using System.Runtime.Versioning; @@ -11,6 +12,23 @@ namespace Ryujinx.Common.System [DllImport("user32.dll")] 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 _maxScaleFactor = 1.25; @@ -36,9 +54,29 @@ namespace Ryujinx.Common.System { 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)