fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-28 07:44:06 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Display (macOS): don't read CGDisplayModeRef's private layout

Browse Source
This commit is contained in:
Carter Li
2026-10-02 19:57:32 +08:00
parent a9bf53b4a1
commit 782b7b8fd1
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -1946,10 +1946,10 @@ elseif(APPLE)
PRIVATE "-framework SystemConfiguration"
PRIVATE "-framework VideoToolbox"
PRIVATE "-weak_framework CoreDisplay"
PRIVATE "-F /System/Library/PrivateFrameworks"
PRIVATE "-weak_framework DisplayServices"
PRIVATE "-weak_framework MediaRemote"
PRIVATE "-weak_framework SkyLight"
)
elseif(WIN32)
target_link_libraries(libfastfetch
src/detection/displayserver/displayserver_apple.c
+25 -22
View File
@@ -12,13 +12,24 @@
#include <IOKit/IOKitLib.h>
#ifdef MAC_OS_X_VERSION_10_15
[[clang::weak_import]] extern Boolean CoreDisplay_Display_SupportsHDRMode(CGDirectDisplayID display);
[[clang::weak_import]] extern Boolean CoreDisplay_Display_IsHDRModeEnabled(CGDirectDisplayID display);
[[clang::weak_import]] extern CFDictionaryRef CoreDisplay_DisplayCreateInfoDictionary(CGDirectDisplayID display);
// CoreDisplay_Display_* are thin wrappers around these: the CoreDisplay versions just dlsym the
// SkyLight symbol and call it with the same display id (CoreDisplay_DisplayCreateInfoDictionary
// only falls back to its own Mach IPC path when SkyLight is absent). Call SkyLight directly.
[[clang::weak_import]] extern Boolean SLSDisplaySupportsHDRMode(CGDirectDisplayID display);
[[clang::weak_import]] extern Boolean SLSDisplayIsHDRModeEnabled(CGDirectDisplayID display);
[[clang::weak_import]] extern CFDictionaryRef SLSCopyDisplayInfoDictionary(CGDirectDisplayID display);
#else
#include <IOKit/graphics/IOGraphicsLib.h>
#endif
// A CGDisplayModeRef keeps the IOKit mode description in a private CFDictionaryRef that
// CoreGraphics never hands out (it only reads single keys out of it by itself), so there is no
// public API for e.g. BitsPerSample. SkyLight exports a plain accessor for it instead, which is
// the same value the private dictionary holds for the display's current mode:
// {_CGSDisplayModeDescription=... "bitsPerPixel"i "bitsPerSample"i "samplesPerPixel"i ...}
// Use that rather than reading CGDisplayModeRef's private layout.
[[clang::weak_import]] extern int SLDisplayBitsPerSample(CGDirectDisplayID display);
static void detectDisplays(FFDisplayServerResult* ds) {
CGDirectDisplayID screens[128];
uint32_t screenCount;
@@ -52,8 +63,8 @@ static void detectDisplays(FFDisplayServerResult* ds) {
ffStrbufClear(&buffer);
FF_CFTYPE_AUTO_RELEASE CFDictionaryRef displayInfo = nullptr;
#ifdef MAC_OS_X_VERSION_10_15
if (CoreDisplay_DisplayCreateInfoDictionary) {
displayInfo = CoreDisplay_DisplayCreateInfoDictionary(screen);
if (SLSCopyDisplayInfoDictionary) {
displayInfo = SLSCopyDisplayInfoDictionary(screen);
}
#else
{
@@ -151,21 +162,13 @@ static void detectDisplays(FFDisplayServerResult* ds) {
physicalHeight,
"CoreGraphics");
if (display) {
#ifndef MAC_OS_X_VERSION_10_11
FF_CFTYPE_AUTO_RELEASE CFStringRef pe = CGDisplayModeCopyPixelEncoding(mode);
if (pe) {
display->bitDepth = (uint8_t) (CFStringGetLength(pe) - CFStringFind(pe, CFSTR("B"), 0).location);
if (SLDisplayBitsPerSample) {
// See the comment on SLDisplayBitsPerSample. Returns 0 for an unknown display.
int bitsPerSample = SLDisplayBitsPerSample(screen);
if (bitsPerSample > 0) {
display->bitDepth = (uint8_t) bitsPerSample;
}
}
#else
// https://stackoverflow.com/a/33519316/9976392
// Also shitty, but better than parsing `CFCopyDescription(mode)`
CFDictionaryRef dict = (CFDictionaryRef) * ((int64_t*) mode + 2);
if (CFGetTypeID(dict) == CFDictionaryGetTypeID()) {
int32_t bitDepth;
ffCfDictGetInt(dict, kCGDisplayBitsPerSample, &bitDepth);
display->bitDepth = (uint8_t) bitDepth;
}
#endif
if (display->type == FF_DISPLAY_TYPE_BUILTIN && displayInfo) {
display->hdrStatus = CFDictionaryContainsKey(displayInfo, CFSTR("ReferencePeakHDRLuminance"))
@@ -173,10 +176,10 @@ static void detectDisplays(FFDisplayServerResult* ds) {
: FF_DISPLAY_HDR_STATUS_UNSUPPORTED;
}
#ifdef MAC_OS_X_VERSION_10_15
else if (CoreDisplay_Display_SupportsHDRMode) {
if (CoreDisplay_Display_SupportsHDRMode(screen)) {
else if (SLSDisplaySupportsHDRMode) {
if (SLSDisplaySupportsHDRMode(screen)) {
display->hdrStatus = FF_DISPLAY_HDR_STATUS_SUPPORTED;
if (CoreDisplay_Display_IsHDRModeEnabled && CoreDisplay_Display_IsHDRModeEnabled(screen)) {
if (SLSDisplayIsHDRModeEnabled && SLSDisplayIsHDRModeEnabled(screen)) {
display->hdrStatus = FF_DISPLAY_HDR_STATUS_ENABLED;
}
} else {