fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Display (macOS): fix invalid physical size on old Intel Mac

Browse Source
This commit is contained in:
Carter Li
2024-10-05 17:22:32 +08:00
parent bde6c3b829
commit f30501f365
1 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/displayserver/displayserver_apple.c
+36 -14
View File
@@ -1,6 +1,7 @@
#include "displayserver.h"
#include "util/apple/cf_helpers.h"
#include "util/stringUtils.h"
#include "util/edidHelper.h"
#include <stdlib.h>
#include <string.h>
@@ -23,6 +24,7 @@ static void detectDisplays(FFDisplayServerResult* ds)
if(CGGetOnlineDisplayList(sizeof(screens) / sizeof(screens[0]), screens, &screenCount) != kCGErrorSuccess)
return;
FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
for(uint32_t i = 0; i < screenCount; i++)
{
CGDirectDisplayID screen = screens[i];
@@ -44,7 +46,7 @@ static void detectDisplays(FFDisplayServerResult* ds)
}
}
FF_STRBUF_AUTO_DESTROY name = ffStrbufCreate();
ffStrbufClear(&buffer);
CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = NULL;
#ifdef MAC_OS_X_VERSION_10_15
if(CoreDisplay_DisplayCreateInfoDictionary)
@@ -55,14 +57,30 @@ static void detectDisplays(FFDisplayServerResult* ds)
displayInfo = IODisplayCreateInfoDictionary(servicePort, kIODisplayOnlyPreferredName);
}
#endif
uint32_t physicalWidth = 0, physicalHeight = 0;
if(displayInfo)
{
CFDictionaryRef productNames;
if(!ffCfDictGetDict(displayInfo, CFSTR(kDisplayProductName), &productNames))
ffCfDictGetString(productNames, CFSTR("en_US"), &name);
ffCfDictGetString(productNames, CFSTR("en_US"), &buffer);
// CGDisplayScreenSize reports invalid result for external displays on old Intel MacBook Pro
CFDataRef edidRef = (CFDataRef) CFDictionaryGetValue(displayInfo, CFSTR(kIODisplayEDIDKey));
if (edidRef && CFGetTypeID(edidRef) == CFDataGetTypeID())
{
const uint8_t* edidData = CFDataGetBytePtr(edidRef);
uint32_t edidLength = (uint32_t) CFDataGetLength(edidRef);
if (edidLength >= 128)
ffEdidGetPhysicalSize(edidData, &physicalWidth, &physicalHeight);
}
}
CGSize size = CGDisplayScreenSize(screen);
if (!physicalWidth || !physicalHeight)
{
CGSize size = CGDisplayScreenSize(screen);
physicalWidth = (uint32_t) (size.width + 0.5);
physicalHeight = (uint32_t) (size.height + 0.5);
}
FFDisplayResult* display = ffdsAppendDisplay(ds,
(uint32_t)CGDisplayModeGetPixelWidth(mode),
@@ -71,12 +89,12 @@ static void detectDisplays(FFDisplayServerResult* ds)
(uint32_t)CGDisplayModeGetWidth(mode),
(uint32_t)CGDisplayModeGetHeight(mode),
(uint32_t)CGDisplayRotation(screen),
&name,
&buffer,
CGDisplayIsBuiltin(screen) ? FF_DISPLAY_TYPE_BUILTIN : FF_DISPLAY_TYPE_EXTERNAL,
CGDisplayIsMain(screen),
(uint64_t)screen,
(uint32_t) (size.width + 0.5),
(uint32_t) (size.height + 0.5)
physicalWidth,
physicalHeight
);
if (display)
{
@@ -97,16 +115,20 @@ static void detectDisplays(FFDisplayServerResult* ds)
{
if (CoreDisplay_Display_SupportsHDRMode(screen))
{
if (CoreDisplay_Display_IsHDRModeEnabled)
{
display->hdrStatus = CoreDisplay_Display_IsHDRModeEnabled(screen)
? FF_DISPLAY_HDR_STATUS_ENABLED
: FF_DISPLAY_HDR_STATUS_SUPPORTED;
}
else
display->hdrStatus = FF_DISPLAY_HDR_STATUS_SUPPORTED;
display->hdrStatus = FF_DISPLAY_HDR_STATUS_SUPPORTED;
if (CoreDisplay_Display_IsHDRModeEnabled && CoreDisplay_Display_IsHDRModeEnabled(screen))
display->hdrStatus = FF_DISPLAY_HDR_STATUS_ENABLED;
}
else
display->hdrStatus = FF_DISPLAY_HDR_STATUS_UNSUPPORTED;
}
display->serial = CGDisplaySerialNumber(screen);
int value;
if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayYearOfManufacture), &value) == NULL)
display->manufactureYear = (uint16_t) value;
if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayWeekOfManufacture), &value) == NULL)
display->manufactureWeek = (uint16_t) value;
}
CGDisplayModeRelease(mode);
}