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

Monitor (macOS): tidy

Browse Source
This commit is contained in:
李通洲
2023-08-11 14:29:24 +08:00
parent 8493c99146
commit ff685a52b4
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/monitor/monitor_apple.c
+4 -8
View File
@@ -12,13 +12,13 @@ static const char* detectWithDisplayServices(const FFDisplayServerResult* displa
FF_LIST_FOR_EACH(FFDisplayResult, display, displayServer->displays)
{
if (display->type == FF_DISPLAY_TYPE_BUILTIN || display->type == FF_DISPLAY_TYPE_UNKNOWN)
if (display->type == FF_DISPLAY_TYPE_BUILTIN)
{
CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = CoreDisplay_DisplayCreateInfoDictionary((CGDirectDisplayID) display->id);
if(displayInfo)
{
int width, height;
if (ffCfDictGetInt(displayInfo, CFSTR("kCGDisplayPixelWidth"), &width) ||
if (ffCfDictGetInt(displayInfo, CFSTR("kCGDisplayPixelWidth"), &width) || // Default resolution (limited by connectors, GPUs, etc.)
ffCfDictGetInt(displayInfo, CFSTR("kCGDisplayPixelHeight"), &height) ||
width <= 0 || height <= 0)
continue;
@@ -26,11 +26,7 @@ static const char* detectWithDisplayServices(const FFDisplayServerResult* displa
FFMonitorResult* monitor = (FFMonitorResult*) ffListAdd(results);
monitor->width = (uint32_t) width;
monitor->height = (uint32_t) height;
ffStrbufInit(&monitor->name);
CFDictionaryRef productNames;
if(!ffCfDictGetDict(displayInfo, CFSTR(kDisplayProductName), &productNames))
ffCfDictGetString(productNames, CFSTR("en_US"), &monitor->name);
ffStrbufInitCopy(&monitor->name, &display->name);
CGSize size = CGDisplayScreenSize((CGDirectDisplayID) display->id);
monitor->physicalWidth = (uint32_t) (size.width + 0.5);
@@ -80,7 +76,7 @@ static const char* detectWithDdcci(FFlist* results)
if (!service) continue;
FF_CFTYPE_AUTO_RELEASE CFDataRef edid = NULL;
if (IOAVServiceCopyEDID(service, &edid) != KERN_SUCCESS )
if (IOAVServiceCopyEDID(service, &edid) != KERN_SUCCESS)
continue;
if (CFDataGetLength(edid) < 128)