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

DisplayServer (Linux): detects preferred resolution from EDID

Browse Source
This commit is contained in:
Carter Li
2026-06-19 19:21:00 +08:00
parent 5fd059827d
commit 7c2f7fa4f2
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/displayserver/linux/drm.c
+21 -19
View File
@@ -44,8 +44,8 @@ static const char* drmParseSysfs(FFDisplayServerResult* result) {
}
}
unsigned width = 0, height = 0, physicalWidth = 0, physicalHeight = 0;
double refreshRate = 0;
uint32_t width = 0, height = 0, physicalWidth = 0, physicalHeight = 0, preferredWidth = 0, preferredHeight = 0;
double preferredRefreshRate = 0;
FF_STRBUF_AUTO_DESTROY name = ffStrbufCreate();
ffStrbufSubstrBefore(&drmDir, drmDirWithDnameLength);
@@ -59,33 +59,35 @@ static const char* drmParseSysfs(FFDisplayServerResult* result) {
}
}
uint8_t edidData[512];
ssize_t edidLength = ffReadFileData(drmDir.chars, ARRAY_SIZE(edidData), edidData);
if (edidLength <= 0 || edidLength % 128 != 0) {
edidLength = 0;
ffStrbufSubstrBefore(&drmDir, drmDirWithDnameLength);
ffStrbufAppendS(&drmDir, "/modes");
ffStrbufSubstrBefore(&drmDir, drmDirWithDnameLength);
ffStrbufAppendS(&drmDir, "/modes");
char modes[32];
if (ffReadFileData(drmDir.chars, ARRAY_SIZE(modes), modes) >= 3) {
sscanf(modes, "%ux%u", &width, &height);
ffStrbufAppendS(&name, plainName);
}
} else {
char modes[32];
if (ffReadFileData(drmDir.chars, ARRAY_SIZE(modes), modes) >= 3) {
// This is actually preferred resolution
sscanf(modes, "%ux%u", &width, &height);
ffStrbufAppendS(&name, plainName);
}
uint8_t edidData[1024];
ssize_t edidLength = ffReadFileData(drmDir.chars, ARRAY_SIZE(edidData), edidData);
if (edidLength > 0 && ffEdidIsValid(edidData, (uint32_t) edidLength)) {
ffEdidGetName(edidData, &name);
ffEdidGetPreferredResolutionAndRefreshRate(edidData, &width, &height, &refreshRate);
ffEdidGetPreferredResolutionAndRefreshRate(edidData, &preferredWidth, &preferredHeight, &preferredRefreshRate);
ffEdidGetPhysicalSize(edidData, &physicalWidth, &physicalHeight);
} else {
edidLength = 0;
}
FFDisplayResult* item = ffdsAppendDisplay(
result,
width,
height,
refreshRate,
0,
0,
0,
0,
preferredWidth,
preferredHeight,
preferredRefreshRate,
0,
&name,
ffdsGetDisplayType(plainName),
@@ -379,7 +381,7 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result) {
uint8_t edidData[512];
ssize_t edidLength = 0;
drmGetEdidByConnId(conn.connector_id, edidData, &edidLength);
if (edidLength > 0 && edidLength % 128 == 0) {
if (edidLength > 0 && ffEdidIsValid(edidData, (uint32_t) edidLength)) {
ffEdidGetName(edidData, &name);
hdrStatus = ffEdidGetHdrCompatible(edidData, (uint32_t) edidLength) ? FF_DISPLAY_HDR_STATUS_SUPPORTED : FF_DISPLAY_HDR_STATUS_UNSUPPORTED;
ffEdidGetManufactureDate(edidData, &myear, &mweak);
src/detection/displayserver/linux/wayland/wayland.c
+8
View File
@@ -132,6 +132,14 @@ static FF_A_UNUSED bool matchDrmConnector(const char* connName, WaylandDisplay*
wldata->hdrSupported = ffEdidGetHdrCompatible(edidData, (uint32_t) edidLength);
ffEdidGetManufactureDate((const uint8_t*) edidData, &wldata->myear, &wldata->mweek);
ffEdidGetSerial((const uint8_t*) edidData, &wldata->serial);
if (wldata->preferredWidth == 0) {
uint32_t preferredWidth = 0, preferredHeight = 0;
double preferredRefreshRate = 0;
ffEdidGetPreferredResolutionAndRefreshRate(edidData, &preferredWidth, &preferredHeight, &preferredRefreshRate);
wldata->preferredWidth = (int32_t) preferredWidth;
wldata->preferredHeight = (int32_t) preferredHeight;
wldata->preferredRefreshRate = (int32_t) (preferredRefreshRate * 1000.);
}
wldata->hdrInfoAvailable = true;
return true;
}