From e7c1c3dbecb85ac86af782677c62db99309bf34a Mon Sep 17 00:00:00 2001 From: Robin Dostal Date: Mon, 14 Dec 2020 18:00:05 +0100 Subject: [PATCH 1/2] More reliable pixendensitydetection under Xorg/Randr Physical dimensions are parsed from the monitors EDID instead of Randr. GuessPixelDensity locks to fixed values, caps at 2 and returns 1 if the supplied dimensions are unreasonable. --- src/Avalonia.X11/X11Atoms.cs | 2 + src/Avalonia.X11/X11Screens.cs | 81 +++++++++++++++++++++++++--------- src/Avalonia.X11/XLib.cs | 7 +++ 3 files changed, 70 insertions(+), 20 deletions(-) diff --git a/src/Avalonia.X11/X11Atoms.cs b/src/Avalonia.X11/X11Atoms.cs index 32f1822e51..137757b9cf 100644 --- a/src/Avalonia.X11/X11Atoms.cs +++ b/src/Avalonia.X11/X11Atoms.cs @@ -114,6 +114,8 @@ namespace Avalonia.X11 public readonly IntPtr XA_WM_CLASS = (IntPtr)67; public readonly IntPtr XA_WM_TRANSIENT_FOR = (IntPtr)68; + public readonly IntPtr RR_PROPERTY_RANDR_EDID = (IntPtr)82; + public readonly IntPtr WM_PROTOCOLS; public readonly IntPtr WM_DELETE_WINDOW; public readonly IntPtr WM_TAKE_FOCUS; diff --git a/src/Avalonia.X11/X11Screens.cs b/src/Avalonia.X11/X11Screens.cs index af6d2674b6..df1b2b7312 100644 --- a/src/Avalonia.X11/X11Screens.cs +++ b/src/Avalonia.X11/X11Screens.cs @@ -82,6 +82,39 @@ namespace Avalonia.X11 _cache = null; } + private unsafe Size? GetPhysicalMonitorSizeFromEDID(IntPtr rrOutput) + { + if(rrOutput == IntPtr.Zero) + return null; + var output = Marshal.ReadInt64(rrOutput); + var properties = XRRListOutputProperties(_x11.Display,output, out int propertyCount); + var hasEDID = false; + for(var pc = 0; pc < propertyCount; pc++) + { + if(properties[pc] == _x11.Atoms.RR_PROPERTY_RANDR_EDID) + hasEDID = true; + } + if(!hasEDID) + return null; + XRRGetOutputProperty(_x11.Display, output, _x11.Atoms.RR_PROPERTY_RANDR_EDID, 0, 128, false, false, _x11.Atoms.AnyPropertyType, out int actualType, out int actualFormat, out int nItems, out _, out IntPtr prop); + if(actualType != 19) // XA_INTEGER + return null; + if(actualFormat != 8) + return null; + + var edid = new byte[nItems]; + Marshal.Copy(prop,edid,0,nItems); + XFree(prop); + XFree(new IntPtr(properties)); + if(edid.Length < 22) + return null; + var width = edid[21]; + var height = edid[22]; + if(width == 0 && height == 0) + return null; + return new Size(width * 10, height * 10); + } + public unsafe X11Screen[] Screens { get @@ -97,24 +130,13 @@ namespace Avalonia.X11 var namePtr = XGetAtomName(_x11.Display, mon.Name); var name = Marshal.PtrToStringAnsi(namePtr); XFree(namePtr); - + var bounds = new PixelRect(mon.X, mon.Y, mon.Width, mon.Height); var density = 1d; - if (_settings.NamedScaleFactors?.TryGetValue(name, out density) != true) - { - if (mon.MWidth == 0) - density = 1; - else - density = X11Screen.GuessPixelDensity(mon.Width, mon.MWidth); - } - + var pSize = GetPhysicalMonitorSizeFromEDID(mon.Outputs); + if (_settings.NamedScaleFactors?.TryGetValue(name, out density) != true && pSize != null) + density = X11Screen.GuessPixelDensity(bounds, pSize.Value); density *= _settings.GlobalScaleFactor; - - var bounds = new PixelRect(mon.X, mon.Y, mon.Width, mon.Height); - screens[c] = new X11Screen(bounds, - mon.Primary != 0, - name, - (mon.MWidth == 0 || mon.MHeight == 0) ? (Size?)null : new Size(mon.MWidth, mon.MHeight), - density); + screens[c] = new X11Screen(bounds, mon.Primary != 0, name, pSize, density); } XFree(new IntPtr(monitors)); @@ -163,7 +185,6 @@ namespace Avalonia.X11 } - public int ScreenCount => _impl.Screens.Length; public IReadOnlyList AllScreens => @@ -229,6 +250,7 @@ namespace Avalonia.X11 class X11Screen { private const int FullHDWidth = 1920; + private const int FullHDHeight = 1080; public bool Primary { get; } public string Name { get; set; } public PixelRect Bounds { get; set; } @@ -248,7 +270,7 @@ namespace Avalonia.X11 } else if (pixelDensity == null) { - PixelDensity = GuessPixelDensity(bounds.Width, physicalSize.Value.Width); + PixelDensity = GuessPixelDensity(bounds, physicalSize.Value); } else { @@ -257,7 +279,26 @@ namespace Avalonia.X11 } } - public static double GuessPixelDensity(double pixelWidth, double mmWidth) - => pixelWidth <= FullHDWidth ? 1 : Math.Max(1, Math.Round(pixelWidth / mmWidth * 25.4 / 96)); + public static double GuessPixelDensity(PixelRect pixel, Size physical) + { + var calculatedDensity = 1d; + if(physical.Width > 0) + calculatedDensity = pixel.Width <= FullHDWidth ? 1 : Math.Max(1, pixel.Width / physical.Width * 25.4 / 96); + else if(physical.Height > 0) + calculatedDensity = pixel.Height <= FullHDHeight ? 1 : Math.Max(1, pixel.Height / physical.Height * 25.4 / 96); + + if(calculatedDensity > 3) + return 1; + else + { + var sanePixelDensities = new double[] { 1, 1.25, 1.50, 1.75, 2 }; + foreach(var saneDensity in sanePixelDensities) + { + if(calculatedDensity <= saneDensity + 0.20) + return saneDensity; + } + return sanePixelDensities.Last(); + } + } } } diff --git a/src/Avalonia.X11/XLib.cs b/src/Avalonia.X11/XLib.cs index 85aa4862b7..92308cb7a1 100644 --- a/src/Avalonia.X11/XLib.cs +++ b/src/Avalonia.X11/XLib.cs @@ -500,6 +500,13 @@ namespace Avalonia.X11 [DllImport(libX11Randr)] public static extern XRRMonitorInfo* XRRGetMonitors(IntPtr dpy, IntPtr window, bool get_active, out int nmonitors); + + [DllImport(libX11Randr)] + public static extern IntPtr* XRRListOutputProperties(IntPtr dpy, long output, out int count); + + [DllImport(libX11Randr)] + public static extern int XRRGetOutputProperty(IntPtr dpy, long output, IntPtr atom, long offset, long length, bool _delete, bool pending, IntPtr req_type, out int actual_type, out int actual_format, out int nitems, out long bytes_after, out IntPtr prop); + [DllImport(libX11Randr)] public static extern void XRRSelectInput(IntPtr dpy, IntPtr window, RandrEventMask mask); From 4ce630e71a4d19f4e28c1cea35c95d47330474ef Mon Sep 17 00:00:00 2001 From: Robin Dostal Date: Sun, 20 Dec 2020 23:10:41 +0100 Subject: [PATCH 2/2] Changing XRRMonitorInfo.Outputs from IntPtr to IntPtr* Change XRRMonitorInfo.Outputs from IntPtr to IntPtr* and iterate over all Outputs to detect the smallest pixeldensity. --- src/Avalonia.X11/X11Screens.cs | 43 +++++++++++++++++++++++----------- src/Avalonia.X11/X11Structs.cs | 4 ++-- src/Avalonia.X11/XLib.cs | 4 ++-- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/src/Avalonia.X11/X11Screens.cs b/src/Avalonia.X11/X11Screens.cs index df1b2b7312..b51497fb13 100644 --- a/src/Avalonia.X11/X11Screens.cs +++ b/src/Avalonia.X11/X11Screens.cs @@ -66,7 +66,8 @@ namespace Avalonia.X11 private X11Screen[] _cache; private X11Info _x11; private IntPtr _window; - + const int EDIDStructureLength = 32; // Length of a EDID-Block-Length(128 bytes), XRRGetOutputProperty multiplies offset and length by 4 + public Randr15ScreensImpl(AvaloniaX11Platform platform, X11ScreensUserSettings settings) { _settings = settings; @@ -86,8 +87,7 @@ namespace Avalonia.X11 { if(rrOutput == IntPtr.Zero) return null; - var output = Marshal.ReadInt64(rrOutput); - var properties = XRRListOutputProperties(_x11.Display,output, out int propertyCount); + var properties = XRRListOutputProperties(_x11.Display,rrOutput, out int propertyCount); var hasEDID = false; for(var pc = 0; pc < propertyCount; pc++) { @@ -96,20 +96,20 @@ namespace Avalonia.X11 } if(!hasEDID) return null; - XRRGetOutputProperty(_x11.Display, output, _x11.Atoms.RR_PROPERTY_RANDR_EDID, 0, 128, false, false, _x11.Atoms.AnyPropertyType, out int actualType, out int actualFormat, out int nItems, out _, out IntPtr prop); - if(actualType != 19) // XA_INTEGER + XRRGetOutputProperty(_x11.Display, rrOutput, _x11.Atoms.RR_PROPERTY_RANDR_EDID, 0, EDIDStructureLength, false, false, _x11.Atoms.AnyPropertyType, out IntPtr actualType, out int actualFormat, out int bytesAfter, out _, out IntPtr prop); + if(actualType != _x11.Atoms.XA_INTEGER) return null; - if(actualFormat != 8) + if(actualFormat != 8) // Expecting an byte array return null; - var edid = new byte[nItems]; - Marshal.Copy(prop,edid,0,nItems); + var edid = new byte[bytesAfter]; + Marshal.Copy(prop,edid,0,bytesAfter); XFree(prop); XFree(new IntPtr(properties)); if(edid.Length < 22) return null; - var width = edid[21]; - var height = edid[22]; + var width = edid[21]; // 0x15 1 Max. Horizontal Image Size cm. + var height = edid[22]; // 0x16 1 Max. Vertical Image Size cm. if(width == 0 && height == 0) return null; return new Size(width * 10, height * 10); @@ -131,10 +131,25 @@ namespace Avalonia.X11 var name = Marshal.PtrToStringAnsi(namePtr); XFree(namePtr); var bounds = new PixelRect(mon.X, mon.Y, mon.Width, mon.Height); - var density = 1d; - var pSize = GetPhysicalMonitorSizeFromEDID(mon.Outputs); - if (_settings.NamedScaleFactors?.TryGetValue(name, out density) != true && pSize != null) - density = X11Screen.GuessPixelDensity(bounds, pSize.Value); + Size? pSize = null; + double density = 0; + if (_settings.NamedScaleFactors?.TryGetValue(name, out density) != true) + { + for(int o = 0; o < mon.NOutput; o++) + { + var outputSize = GetPhysicalMonitorSizeFromEDID(mon.Outputs[o]); + var outputDensity = 1d; + if(outputSize != null) + outputDensity = X11Screen.GuessPixelDensity(bounds, outputSize.Value); + if(density == 0 || density > outputDensity) + { + density = outputDensity; + pSize = outputSize; + } + } + } + if(density == 0) + density = 1; density *= _settings.GlobalScaleFactor; screens[c] = new X11Screen(bounds, mon.Primary != 0, name, pSize, density); } diff --git a/src/Avalonia.X11/X11Structs.cs b/src/Avalonia.X11/X11Structs.cs index 0ae5c16aef..ae4954a2d5 100644 --- a/src/Avalonia.X11/X11Structs.cs +++ b/src/Avalonia.X11/X11Structs.cs @@ -1870,7 +1870,7 @@ namespace Avalonia.X11 { public const string XNFontSet = "fontSet"; } - struct XRRMonitorInfo { + unsafe struct XRRMonitorInfo { public IntPtr Name; public int Primary; public int Automatic; @@ -1881,6 +1881,6 @@ namespace Avalonia.X11 { public int Height; public int MWidth; public int MHeight; - public IntPtr Outputs; + public IntPtr* Outputs; } } diff --git a/src/Avalonia.X11/XLib.cs b/src/Avalonia.X11/XLib.cs index 92308cb7a1..bec94e63c9 100644 --- a/src/Avalonia.X11/XLib.cs +++ b/src/Avalonia.X11/XLib.cs @@ -502,10 +502,10 @@ namespace Avalonia.X11 XRRGetMonitors(IntPtr dpy, IntPtr window, bool get_active, out int nmonitors); [DllImport(libX11Randr)] - public static extern IntPtr* XRRListOutputProperties(IntPtr dpy, long output, out int count); + public static extern IntPtr* XRRListOutputProperties(IntPtr dpy, IntPtr output, out int count); [DllImport(libX11Randr)] - public static extern int XRRGetOutputProperty(IntPtr dpy, long output, IntPtr atom, long offset, long length, bool _delete, bool pending, IntPtr req_type, out int actual_type, out int actual_format, out int nitems, out long bytes_after, out IntPtr prop); + public static extern int XRRGetOutputProperty(IntPtr dpy, IntPtr output, IntPtr atom, int offset, int length, bool _delete, bool pending, IntPtr req_type, out IntPtr actual_type, out int actual_format, out int nitems, out long bytes_after, out IntPtr prop); [DllImport(libX11Randr)] public static extern void XRRSelectInput(IntPtr dpy, IntPtr window, RandrEventMask mask);