Display (Linux): don't report disabled displays when using DRM

Ref: #634
fastfetch-cli · Nov 28, 2023 · 0c522bd · 0c522bd
1 parent 5db3c90
commit 0c522bd
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/detection/displayserver/linux/displayserver_linux.c b/src/detection/displayserver/linux/displayserver_linux.c
@@ -9,7 +9,7 @@ static void parseDRM(FFDisplayServerResult* result)
 {
     const char* drmDirPath = "/sys/class/drm/";
 
-    DIR* dirp = opendir(drmDirPath);
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(drmDirPath);
     if(dirp == NULL)
         return;
 
@@ -25,18 +25,30 @@ static void parseDRM(FFDisplayServerResult* result)
             continue;
 
         ffStrbufAppendS(&drmDir, entry->d_name);
+        uint32_t drmDirWithDnameLength = drmDir.length;
+
+        ffStrbufAppendS(&drmDir, "/enabled");
+        char enabled = 'd'; // disabled
+        ffReadFileData(drmDir.chars, sizeof(enabled), &enabled);
+        if (enabled != 'e') // enabled
+        {
+            ffStrbufSubstrBefore(&drmDir, drmDirLength);
+            continue;
+        }
+
+        ffStrbufSubstrBefore(&drmDir, drmDirWithDnameLength);
         ffStrbufAppendS(&drmDir, "/modes");
 
-        FILE* modeFile = fopen(drmDir.chars, "r");
-        if(modeFile == NULL)
+        char modes[32];
+        if (ffReadFileData(drmDir.chars, sizeof(modes), modes) < 3)
         {
             ffStrbufSubstrBefore(&drmDir, drmDirLength);
             continue;
         }
 
         uint32_t width = 0, height = 0;
 
-        int scanned = fscanf(modeFile, "%ux%u", &width, &height);
+        int scanned = sscanf(modes, "%ux%u", &width, &height);
         if(scanned == 2 && width > 0 && height > 0)
         {
             ffStrbufSubstrBefore(&drmDir, drmDirLength);
@@ -71,11 +83,8 @@ static void parseDRM(FFDisplayServerResult* result)
             );
         }
 
-        fclose(modeFile);
         ffStrbufSubstrBefore(&drmDir, drmDirLength);
     }
-
-    closedir(dirp);
 }
 
 void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)