Merge pull request #1184 from fastfetch-cli/dev

Release: v2.21.2
2026-09-13 02:42:09 +02:00 · 2024-08-14 10:55:42 +08:00
parent 5df2a751ea 030f34d405
commit c0774b89d6
357 changed files with 1167 additions and 629 deletions
@@ -422,7 +422,7 @@ jobs:
          run: |
            uname -a
            sudo pkg update
-            sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm libelf glib dconf dbus sqlite3-tcl xfce4-conf ImageMagick6 ImageMagick7 chafa egl libosmesa opencl ocl-icd v4l_compat
+            sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm libelf glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat
            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
            cmake --build . --target package --verbose -j4
            ./fastfetch --list-features
@@ -1,3 +1,20 @@
+# 2.21.2
+
+Features:
+* Support `--stat <num_in_ms>` to display long running modules in yellow or red
+
+Bugfixes:
+* Fix bad Intel Arc GPU name and type detection (GPU, Linux)
+* Fix uninited struct fields (GPU, Linux)
+* Skip cpu model smbios detection on ARM platforms (CPU, Linux)
+* Always use `CurrentControlSet` instead of `ControlSet001` when querying registry (Windows)
+* Fix NVIDIA GPUs are missing in GPU detection sometimes (GPU, Windows)
+* Fixing detection of `pthread_timedjoin_np` (Linux)
+
+Logos:
+* Add HyprOS
+* Add GoldenDog Linux
+
 # 2.21.1

 Hotfix for a regression that breaks WM detection when running `startx` from TTY (Regression from 2.21.0, #1172 / #1162)
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url

 project(fastfetch
-    VERSION 2.21.1
+    VERSION 2.21.2
    LANGUAGES C
    DESCRIPTION "Fast neofetch-like system information tool"
    HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -1210,13 +1210,19 @@ if(NOT WIN32)
    if(HAVE_WORDEXP)
        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_WORDEXP=1)
    endif()
-    CHECK_INCLUDE_FILE("pthread_np.h" HAVE_PTHREAD_NP)
-    if(HAVE_PTHREAD_NP)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_PTHREAD_NP=1)
-    endif()
-    check_function_exists("pthread_timedjoin_np" HAVE_TIMEDJOIN_NP)
-    if(HAVE_TIMEDJOIN_NP)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_TIMEDJOIN_NP=1)
+    if(ENABLE_THREADS AND CMAKE_USE_PTHREADS_INIT)
+        CHECK_INCLUDE_FILE("pthread_np.h" HAVE_PTHREAD_NP)
+        if(HAVE_PTHREAD_NP)
+            target_compile_definitions(libfastfetch PRIVATE FF_HAVE_PTHREAD_NP=1)
+            set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} pthread_np.h)
+        endif()
+        set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} Threads::Threads)
+        check_function_exists("pthread_timedjoin_np" HAVE_TIMEDJOIN_NP)
+        if(HAVE_TIMEDJOIN_NP)
+            target_compile_definitions(libfastfetch PRIVATE FF_HAVE_TIMEDJOIN_NP=1)
+        else()
+            message(WARNING "pthread_timedjoin_np was not found; networking timeout will not work")
+        endif()
    endif()
 endif()

@@ -1,3 +1,9 @@
+fastfetch (2.21.1) jammy; urgency=medium
+
+  * Update to 2.21.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 09 Aug 2024 14:27:10 +0800
+
 fastfetch (2.21.0) jammy; urgency=medium

  * Update to 2.21.0
@@ -1 +1 @@
-fastfetch_2.20.0_source.buildinfo universe/utils optional
+fastfetch_2.21.1_source.buildinfo universe/utils optional
@@ -357,9 +357,17 @@
            "additionalProperties": false,
            "properties": {
                "stat": {
-                    "type": "boolean",
-                    "description": "Show time usage (in ms) for individual modules",
-                    "default": false
+                    "description": "Show time usage (in ms) for individual modules with optional threshold",
+                    "oneOf": [
+                        {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        {
+                            "type": "integer",
+                            "minimum": 1
+                        }
+                    ]
                },
                "pipe": {
                    "type": "boolean",
@@ -1,4 +1,5 @@
 #include "commandoption.h"
+#include "common/color.h"
 #include "common/printing.h"
 #include "common/time.h"
 #include "common/jsonconfig.h"
@@ -105,32 +106,35 @@ static void parseStructureCommand(
 void ffPrintCommandOption(FFdata* data, yyjson_mut_doc* jsonDoc)
 {
    //Parse the structure and call the modules
+    int32_t thres = instance.config.display.stat;
    uint32_t startIndex = 0;
    while (startIndex < data->structure.length)
    {
        uint32_t colonIndex = ffStrbufNextIndexC(&data->structure, startIndex, ':');
        data->structure.chars[colonIndex] = '\0';

-        uint64_t ms = 0;
-        if(instance.config.display.stat)
+        double ms = 0;
+        if(thres >= 0)
            ms = ffTimeGetTick();

        parseStructureCommand(data->structure.chars + startIndex, genJsonResult, jsonDoc);

-        if(instance.config.display.stat)
+        if(thres >= 0)
        {
            ms = ffTimeGetTick() - ms;

            if (jsonDoc)
            {
                yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(jsonDoc->root);
-                yyjson_mut_obj_add_uint(jsonDoc, moduleJson, "stat", ms);
+                yyjson_mut_obj_add_real(jsonDoc, moduleJson, "stat", ms);
            }
            else
            {
-                char str[32];
-                int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ms);
-                printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+                char str[64];
+                int len = snprintf(str, sizeof str, "%.3fms", ms);
+                if (thres > 0)
+                    snprintf(str, sizeof str, "\e[%sm%.3fms\e[m", (ms <= thres ? FF_COLOR_FG_GREEN : ms <= 2 * thres ? FF_COLOR_FG_YELLOW : FF_COLOR_FG_RED), ms);
+                printf("\e[s\e[1A\e[9999999C\e[%dD%s\e[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
            }
        }

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/color.h"
 #include "common/jsonconfig.h"
 #include "common/printing.h"
 #include "common/io/io.h"
@@ -181,12 +182,13 @@ static const char* printJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc)
    if (!modules) return NULL;
    if (!yyjson_is_arr(modules)) return "Property 'modules' must be an array of strings or objects";

+    int32_t thres = instance.config.display.stat;
    yyjson_val* item;
    size_t idx, max;
    yyjson_arr_foreach(modules, idx, max, item)
    {
-        uint64_t ms = 0;
-        if(!prepare && instance.config.display.stat)
+        double ms = 0;
+        if(!prepare && thres >= 0)
            ms = ffTimeGetTick();

        yyjson_val* module = item;
@@ -208,19 +210,21 @@ static const char* printJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc)
        else if(!parseModuleJsonObject(type, module, jsonDoc))
            return "Unknown module type";

-        if(!prepare && instance.config.display.stat)
+        if(!prepare && thres >= 0)
        {
            ms = ffTimeGetTick() - ms;
            if (jsonDoc)
            {
                yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(jsonDoc->root);
-                yyjson_mut_obj_add_uint(jsonDoc, moduleJson, "stat", ms);
+                yyjson_mut_obj_add_real(jsonDoc, moduleJson, "stat", ms);
            }
            else
            {
-                char str[32];
-                int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ms);
-                printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+                char str[64];
+                int len = snprintf(str, sizeof str, "%.3fms", ms);
+                if (thres > 0)
+                    snprintf(str, sizeof str, "\e[%sm%.3fms\e[m", (ms <= thres ? FF_COLOR_FG_GREEN : ms <= 2 * thres ? FF_COLOR_FG_YELLOW : FF_COLOR_FG_RED), ms);
+                printf("\e[s\e[1A\e[9999999C\e[%dD%s\e[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
            }
        }

@@ -9,22 +9,22 @@
    #include <sysinfoapi.h>
 #endif

-static inline uint64_t ffTimeGetTick() //In msec
+static inline double ffTimeGetTick(void) //In msec
 {
    #ifdef _WIN32
        LARGE_INTEGER frequency;
        QueryPerformanceFrequency(&frequency);
        LARGE_INTEGER start;
        QueryPerformanceCounter(&start);
-        return (uint64_t)(start.QuadPart * 1000 / frequency.QuadPart);
+        return (double) start.QuadPart * 1000 / (double) frequency.QuadPart;
    #else
        struct timespec timeNow;
        clock_gettime(CLOCK_MONOTONIC, &timeNow);
-        return (uint64_t)(((uint64_t) timeNow.tv_sec * 1000u) + ((uint64_t) timeNow.tv_nsec / 1000000u));
+        return (double) timeNow.tv_sec * 1000. + (double) timeNow.tv_nsec / 1000000.;
    #endif
 }

-static inline uint64_t ffTimeGetNow()
+static inline uint64_t ffTimeGetNow(void)
 {
    #ifdef _WIN32
        uint64_t timeNow;
@@ -46,7 +46,7 @@ const char* ffDetectBootmgr(FFBootmgrResult* result)
    ffEfiFillLoadOption((FFEfiLoadOption *)buffer, result);

    DWORD uefiSecureBootEnabled = 0, bufSize = 0;
-    if (RegGetValueW(HKEY_LOCAL_MACHINE, L"SYSTEM\\ControlSet001\\Control\\SecureBoot\\State", L"UEFISecureBootEnabled", RRF_RT_REG_DWORD, NULL, &uefiSecureBootEnabled, &bufSize) == ERROR_SUCCESS)
+    if (RegGetValueW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\SecureBoot\\State", L"UEFISecureBootEnabled", RRF_RT_REG_DWORD, NULL, &uefiSecureBootEnabled, &bufSize) == ERROR_SUCCESS)
        result->secureBoot = !!uefiSecureBootEnabled;

    return NULL;
@@ -0,0 +1,358 @@
+#pragma once
+
+#include "fastfetch.h"
+
+// https://github.com/util-linux/util-linux/blob/master/sys-utils/lscpu-arm.c
+// We use the util-linux's data but not its code. Call me if it violates util-linux's GPL license.
+
+static const char* hwImplId2Vendor(uint32_t implId)
+{
+    switch (implId)
+    {
+    case 0x41: return "ARM";
+    case 0x42: return "Broadcom";
+    case 0x43: return "Cavium";
+    case 0x44: return "DEC";
+    case 0x46: return "FUJITSU";
+    case 0x48: return "HiSilicon";
+    case 0x49: return "Infineon";
+    case 0x4d: return "Motorola";
+    case 0x4e: return "NVIDIA";
+    case 0x50: return "APM";
+    case 0x51: return "Qualcomm";
+    case 0x53: return "Samsung";
+    case 0x56: return "Marvell";
+    case 0x61: return "Apple";
+    case 0x66: return "Faraday";
+    case 0x69: return "Intel";
+    case 0x6D: return "Microsoft";
+    case 0x70: return "Phytium";
+    case 0xc0: return "Ampere";
+    default: return 0;
+    }
+}
+
+static const char* armPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x810: return "ARM810";
+    case 0x920: return "ARM920";
+    case 0x922: return "ARM922";
+    case 0x926: return "ARM926";
+    case 0x940: return "ARM940";
+    case 0x946: return "ARM946";
+    case 0x966: return "ARM966";
+    case 0xa20: return "ARM1020";
+    case 0xa22: return "ARM1022";
+    case 0xa26: return "ARM1026";
+    case 0xb02: return "ARM11 MPCore";
+    case 0xb36: return "ARM1136";
+    case 0xb56: return "ARM1156";
+    case 0xb76: return "ARM1176";
+    case 0xc05: return "Cortex-A5";
+    case 0xc07: return "Cortex-A7";
+    case 0xc08: return "Cortex-A8";
+    case 0xc09: return "Cortex-A9";
+    case 0xc0d: return "Cortex-A17";	/* Originally A12 */
+    case 0xc0f: return "Cortex-A15";
+    case 0xc0e: return "Cortex-A17";
+    case 0xc14: return "Cortex-R4";
+    case 0xc15: return "Cortex-R5";
+    case 0xc17: return "Cortex-R7";
+    case 0xc18: return "Cortex-R8";
+    case 0xc20: return "Cortex-M0";
+    case 0xc21: return "Cortex-M1";
+    case 0xc23: return "Cortex-M3";
+    case 0xc24: return "Cortex-M4";
+    case 0xc27: return "Cortex-M7";
+    case 0xc60: return "Cortex-M0+";
+    case 0xd01: return "Cortex-A32";
+    case 0xd02: return "Cortex-A34";
+    case 0xd03: return "Cortex-A53";
+    case 0xd04: return "Cortex-A35";
+    case 0xd05: return "Cortex-A55";
+    case 0xd06: return "Cortex-A65";
+    case 0xd07: return "Cortex-A57";
+    case 0xd08: return "Cortex-A72";
+    case 0xd09: return "Cortex-A73";
+    case 0xd0a: return "Cortex-A75";
+    case 0xd0b: return "Cortex-A76";
+    case 0xd0c: return "Neoverse-N1";
+    case 0xd0d: return "Cortex-A77";
+    case 0xd0e: return "Cortex-A76AE";
+    case 0xd13: return "Cortex-R52";
+    case 0xd15: return "Cortex-R82";
+    case 0xd16: return "Cortex-R52+";
+    case 0xd20: return "Cortex-M23";
+    case 0xd21: return "Cortex-M33";
+    case 0xd22: return "Cortex-M55";
+    case 0xd23: return "Cortex-M85";
+    case 0xd40: return "Neoverse-V1";
+    case 0xd41: return "Cortex-A78";
+    case 0xd42: return "Cortex-A78AE";
+    case 0xd43: return "Cortex-A65AE";
+    case 0xd44: return "Cortex-X1";
+    case 0xd46: return "Cortex-A510";
+    case 0xd47: return "Cortex-A710";
+    case 0xd48: return "Cortex-X2";
+    case 0xd49: return "Neoverse-N2";
+    case 0xd4a: return "Neoverse-E1";
+    case 0xd4b: return "Cortex-A78C";
+    case 0xd4c: return "Cortex-X1C";
+    case 0xd4d: return "Cortex-A715";
+    case 0xd4e: return "Cortex-X3";
+    case 0xd4f: return "Neoverse-V2";
+    case 0xd80: return "Cortex-A520";
+    case 0xd81: return "Cortex-A720";
+    case 0xd82: return "Cortex-X4";
+    default: return "Unknown";
+    }
+}
+
+static const char* brcmPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x0f: return "Brahma-B15";
+    case 0x100: return "Brahma-B53";
+    case 0x516: return "ThunderX2";
+    default: return "Unknown";
+    }
+}
+
+static const char* decPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0xa10: return "SA110";
+    case 0xa11: return "SA1100";
+    default: return "Unknown";
+    }
+}
+
+static const char* caviumPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x0a0: return "ThunderX";
+    case 0x0a1: return "ThunderX-88XX";
+    case 0x0a2: return "ThunderX-81XX";
+    case 0x0a3: return "ThunderX-83XX";
+    case 0x0af: return "ThunderX2-99xx";
+    case 0x0b0: return "OcteonTX2";
+    case 0x0b1: return "OcteonTX2-98XX";
+    case 0x0b2: return "OcteonTX2-96XX";
+    case 0x0b3: return "OcteonTX2-95XX";
+    case 0x0b4: return "OcteonTX2-95XXN";
+    case 0x0b5: return "OcteonTX2-95XXMM";
+    case 0x0b6: return "OcteonTX2-95XXO";
+    case 0x0b8: return "ThunderX3-T110";
+    default: return "Unknown";
+    }
+}
+
+static const char* apmPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x000: return "X-Gene";
+    default: return "Unknown";
+    }
+}
+
+static const char* qcomPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x001: return "Oryon";
+    case 0x00f: return "Scorpion";
+    case 0x02d: return "Scorpion";
+    case 0x04d: return "Krait";
+    case 0x06f: return "Krait";
+    case 0x201: return "Kryo";
+    case 0x205: return "Kryo";
+    case 0x211: return "Kryo";
+    case 0x800: return "Falkor-V1/Kryo";
+    case 0x801: return "Kryo-V2";
+    case 0x802: return "Kryo-3XX-Gold";
+    case 0x803: return "Kryo-3XX-Silver";
+    case 0x804: return "Kryo-4XX-Gold";
+    case 0x805: return "Kryo-4XX-Silver";
+    case 0xc00: return "Falkor";
+    case 0xc01: return "Saphira";
+    default: return "Unknown";
+    }
+}
+
+static const char* samsungPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x001: return "exynos-m1";
+    case 0x002: return "exynos-m3";
+    case 0x003: return "exynos-m4";
+    case 0x004: return "exynos-m5";
+    default: return "Unknown";
+    }
+}
+
+static const char* nvidiaPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x000: return "Denver";
+    case 0x003: return "Denver 2";
+    case 0x004: return "Carmel";
+    default: return "Unknown";
+    }
+}
+
+static const char* marvellPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x131: return "Feroceon-88FR131";
+    case 0x581: return "PJ4/PJ4b";
+    case 0x584: return "PJ4B-MP";
+    default: return "Unknown";
+    }
+}
+
+static const char* applePartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x000: return "Swift";
+    case 0x001: return "Cyclone";
+    case 0x002: return "Typhoon";
+    case 0x003: return "Typhoon/Capri";
+    case 0x004: return "Twister";
+    case 0x005: return "Twister/Elba/Malta";
+    case 0x006: return "Hurricane";
+    case 0x007: return "Hurricane/Myst";
+    case 0x008: return "Monsoon";
+    case 0x009: return "Mistral";
+    case 0x00b: return "Vortex";
+    case 0x00c: return "Tempest";
+    case 0x00f: return "Tempest-M9";
+    case 0x010: return "Vortex/Aruba";
+    case 0x011: return "Tempest/Aruba";
+    case 0x012: return "Lightning";
+    case 0x013: return "Thunder";
+    case 0x020: return "Icestorm-A14";
+    case 0x021: return "Firestorm-A14";
+    case 0x022: return "Icestorm-M1";
+    case 0x023: return "Firestorm-M1";
+    case 0x024: return "Icestorm-M1-Pro";
+    case 0x025: return "Firestorm-M1-Pro";
+    case 0x026: return "Thunder-M10";
+    case 0x028: return "Icestorm-M1-Max";
+    case 0x029: return "Firestorm-M1-Max";
+    case 0x030: return "Blizzard-A15";
+    case 0x031: return "Avalanche-A15";
+    case 0x032: return "Blizzard-M2";
+    case 0x033: return "Avalanche-M2";
+    case 0x034: return "Blizzard-M2-Pro";
+    case 0x035: return "Avalanche-M2-Pro";
+    case 0x036: return "Sawtooth-A16";
+    case 0x037: return "Everest-A16";
+    case 0x038: return "Blizzard-M2-Max";
+    case 0x039: return "Avalanche-M2-Max";
+    default: return "Unknown";
+    }
+}
+
+static const char* faradayPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x526: return "FA526";
+    case 0x626: return "FA626";
+    default: return "Unknown";
+    }
+}
+
+static const char* intelPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x200: return "i80200";
+    case 0x210: return "PXA250A";
+    case 0x212: return "PXA210A";
+    case 0x242: return "i80321-400";
+    case 0x243: return "i80321-600";
+    case 0x290: return "PXA250B/PXA26x";
+    case 0x292: return "PXA210B";
+    case 0x2c2: return "i80321-400-B0";
+    case 0x2c3: return "i80321-600-B0";
+    case 0x2d0: return "PXA250C/PXA255/PXA26x";
+    case 0x2d2: return "PXA210C";
+    case 0x411: return "PXA27x";
+    case 0x41c: return "IPX425-533";
+    case 0x41d: return "IPX425-400";
+    case 0x41f: return "IPX425-266";
+    case 0x682: return "PXA32x";
+    case 0x683: return "PXA930/PXA935";
+    case 0x688: return "PXA30x";
+    case 0x689: return "PXA31x";
+    case 0xb11: return "SA1110";
+    case 0xc12: return "IPX1200";
+    default: return "Unknown";
+    }
+}
+
+static const char* fujitsuPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x001: return "A64FX";
+    default: return "Unknown";
+    }
+}
+
+static const char* hisiPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0xd01: return "TaiShan-v110";	/* used in Kunpeng-920 SoC */
+    case 0xd02: return "TaiShan-v120";	/* used in Kirin 990A and 9000S SoCs */
+    case 0xd40: return "Cortex-A76";	/* HiSilicon uses this ID though advertises A76 */
+    case 0xd41: return "Cortex-A77";	/* HiSilicon uses this ID though advertises A77 */
+    default: return "Unknown";
+    }
+}
+
+static const char* amperePartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0xac3: return "Ampere-1";
+    case 0xac4: return "Ampere-1a";
+    default: return "Unknown";
+    }
+}
+
+static const char* ftPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x303: return "FTC310";
+    case 0x660: return "FTC660";
+    case 0x661: return "FTC661";
+    case 0x662: return "FTC662";
+    case 0x663: return "FTC663";
+    case 0x664: return "FTC664";
+    case 0x862: return "FTC862";
+    default: return "Unknown";
+    }
+}
+
+static const char* msPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0xd49: return "Azure-Cobalt-100";
+    default: return "Unknown";
+    }
+}
@@ -74,19 +74,67 @@ static void detectAndroid(FFCPUResult* cpu)
 }
 #endif

-static const char* parseCpuInfo(FFCPUResult* cpu, FFstrbuf* physicalCoresBuffer, FFstrbuf* cpuMHz, FFstrbuf* cpuIsa, FFstrbuf* cpuUarch)
-{
-    FF_AUTO_CLOSE_FILE FILE* cpuinfo = fopen("/proc/cpuinfo", "r");
-    if(cpuinfo == NULL)
-        return "fopen(\"/proc/cpuinfo\", \"r\") failed";
+#ifdef __aarch64__
+#include "cpu_arm.h"

+static void detectArmName(FILE* cpuinfo, FFCPUResult* cpu, uint32_t implId)
+{
+    FF_AUTO_FREE char* line = NULL;
+    rewind(cpuinfo);
+    size_t len = 0;
+    const char* lastName = NULL;
+    uint32_t num = 0;
+    while(getline(&line, &len, cpuinfo) != -1)
+    {
+        if (!ffStrStartsWith(line, "CPU part\t: ")) continue;
+        uint32_t partId = (uint32_t) strtoul(line + strlen("CPU part\t: "), NULL, 16);
+        const char* name = NULL;
+        switch (implId)
+        {
+            case 0x41: name = armPartId2name(partId); break;
+            case 0x42: name = brcmPartId2name(partId); break;
+            case 0x43: name = caviumPartId2name(partId); break;
+            case 0x44: name = decPartId2name(partId); break;
+            case 0x46: name = fujitsuPartId2name(partId); break;
+            case 0x48: name = hisiPartId2name(partId); break;
+            case 0x4e: name = nvidiaPartId2name(partId); break;
+            case 0x50: name = apmPartId2name(partId); break;
+            case 0x51: name = qcomPartId2name(partId); break;
+            case 0x53: name = samsungPartId2name(partId); break;
+            case 0x56: name = marvellPartId2name(partId); break;
+            case 0x61: name = applePartId2name(partId); break;
+            case 0x66: name = faradayPartId2name(partId); break;
+            case 0x69: name = intelPartId2name(partId); break;
+            case 0x6d: name = msPartId2name(partId); break;
+            case 0x70: name = ftPartId2name(partId); break;
+            case 0xc0: name = amperePartId2name(partId); break;
+            default: name = "Unknown"; break;
+        }
+        if (lastName != name)
+        {
+            if (lastName)
+            {
+                if (num > 1)
+                    ffStrbufAppendF(&cpu->name, "*%u", num);
+                ffStrbufAppendS(&cpu->name, " + ");
+            }
+            ffStrbufAppendS(&cpu->name, name);
+            lastName = name;
+            num = 1;
+        }
+        else
+            ++num;
+    }
+    if (num > 1)
+        ffStrbufAppendF(&cpu->name, "*%u", num);
+}
+#endif
+
+static const char* parseCpuInfo(FILE* cpuinfo, FFCPUResult* cpu, FFstrbuf* physicalCoresBuffer, FFstrbuf* cpuMHz, FFstrbuf* cpuIsa, FFstrbuf* cpuUarch, FFstrbuf* cpuImplementer)
+{
    FF_AUTO_FREE char* line = NULL;
    size_t len = 0;

-    #ifdef __aarch64__
-    FF_STRBUF_AUTO_DESTROY implementer = ffStrbufCreate();
-    #endif
-
    while(getline(&line, &len, cpuinfo) != -1)
    {
        //Stop after the first CPU
@@ -101,35 +149,22 @@ static const char* parseCpuInfo(FFCPUResult* cpu, FFstrbuf* physicalCoresBuffer,
            ffParsePropLine(line, "isa :", cpuIsa) ||
            ffParsePropLine(line, "uarch :", cpuUarch) ||

-            #ifdef __aarch64__
-            (cpu->vendor.length == 0 && ffParsePropLine(line, "CPU implementer :", &implementer)) ||
+            #if __aarch64__
+            (cpu->vendor.length == 0 && ffParsePropLine(line, "CPU implementer :", cpuImplementer)) ||
            #endif
-
+            #if __ANDROID__
            (cpu->name.length == 0 && ffParsePropLine(line, "Hardware :", &cpu->name)) || //For Android devices
+            #endif
+            #if __powerpc__ || __powerpc
            (cpu->name.length == 0 && ffParsePropLine(line, "cpu     :", &cpu->name)) || //For POWER
-            (cpu->name.length == 0 && ffParsePropLine(line, "cpu model               :", &cpu->name)) //For MIPS
+            #endif
+            #if __mips__
+            (cpu->name.length == 0 && ffParsePropLine(line, "cpu model               :", &cpu->name)) || //For MIPS
+            #endif
+            false
        );
    }

-    #ifdef __aarch64__
-    // https://github.com/util-linux/util-linux/blob/2cd89de14549d2b2c079a4f8b73f75500d229fee/sys-utils/lscpu-arm.c#L286
-    if (cpu->vendor.length == 0 && implementer.length > 2 /* 0xX */)
-    {
-        uint32_t implId = (uint32_t) strtoul(implementer.chars, NULL, 16);
-        switch (implId)
-        {
-        case 0x41: ffStrbufSetStatic(&cpu->vendor, "ARM"); break;
-        case 0x42: ffStrbufSetStatic(&cpu->vendor, "Broadcom"); break;
-        case 0x48: ffStrbufSetStatic(&cpu->vendor, "HiSilicon"); break;
-        case 0x4e: ffStrbufSetStatic(&cpu->vendor, "Nvidia"); break;
-        case 0x51: ffStrbufSetStatic(&cpu->vendor, "Qualcomm"); break;
-        case 0x53: ffStrbufSetStatic(&cpu->vendor, "Samsung"); break;
-        case 0x61: ffStrbufSetStatic(&cpu->vendor, "Apple"); break;
-        case 0x69: ffStrbufSetStatic(&cpu->vendor, "Intel"); break;
-        }
-    }
-    #endif
-
    return NULL;
 }

@@ -279,14 +314,19 @@ void detectAsahi(FFCPUResult* cpu)

 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
+    FF_AUTO_CLOSE_FILE FILE* cpuinfo = fopen("/proc/cpuinfo", "r");
+    if(cpuinfo == NULL)
+        return "fopen(\"/proc/cpuinfo\", \"r\") failed";
+
    cpu->temperature = options->temp ? detectCPUTemp() : FF_CPU_TEMP_UNSET;

    FF_STRBUF_AUTO_DESTROY physicalCoresBuffer = ffStrbufCreate();
    FF_STRBUF_AUTO_DESTROY cpuMHz = ffStrbufCreate();
    FF_STRBUF_AUTO_DESTROY cpuIsa = ffStrbufCreate();
    FF_STRBUF_AUTO_DESTROY cpuUarch = ffStrbufCreate();
+    FF_STRBUF_AUTO_DESTROY cpuImplementerStr = ffStrbufCreate();

-    const char* error = parseCpuInfo(cpu, &physicalCoresBuffer, &cpuMHz, &cpuIsa, &cpuUarch);
+    const char* error = parseCpuInfo(cpuinfo, cpu, &physicalCoresBuffer, &cpuMHz, &cpuIsa, &cpuUarch, &cpuImplementerStr);
    if (error) return error;

    cpu->coresLogical = (uint16_t) get_nprocs_conf();
@@ -311,83 +351,23 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
        ffStrbufAppend(&cpu->name, &cpuIsa);
    }

+    #ifdef __aarch64__
+    uint32_t cpuImplementer = (uint32_t) strtoul(cpuImplementerStr.chars, NULL, 16);
+    ffStrbufSetStatic(&cpu->vendor, hwImplId2Vendor(cpuImplementer));
+    #endif
+
    #ifdef __ANDROID__
    detectAndroid(cpu);
    #endif

-    #if defined(__linux__) && defined(__aarch64__)
+    #if defined(__linux__) && defined(__aarch64__) && !defined(__ANDROID__)
    detectAsahi(cpu);
    #endif

+    #ifdef __aarch64__
    if (cpu->name.length == 0)
-    {
-        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
-        if (ffProcessAppendStdOut(&buffer, (char *const[]) { "lscpu", NULL }) == NULL)
-        {
-            char* pstart = buffer.chars;
-
-            if (cpu->vendor.length == 0)
-            {
-                pstart = strstr(pstart, "Vendor ID:");
-                if (pstart)
-                {
-                    pstart += strlen("Vendor ID:");
-                    while (isspace(*pstart)) ++pstart;
-                    if (*pstart)
-                    {
-                        char* pend = strchr(pstart, '\n');
-                        if (pend != NULL)
-                            ffStrbufAppendNS(&cpu->vendor, (uint32_t) (pend - pstart), pstart);
-                        else
-                        {
-                            ffStrbufAppendS(&cpu->vendor, pstart);
-                        }
-                        pstart = pend + 1;
-                        if (pstart >= buffer.chars + buffer.length)
-                            return NULL;
-                    }
-                }
-                else
-                {
-                    pstart = buffer.chars;
-                }
-            }
-
-            while ((pstart = strstr(pstart, "Model name:")))
-            {
-                pstart += strlen("Model name:");
-                while (isspace(*pstart)) ++pstart;
-                if (*pstart == '\0')
-                    break;
-
-                if (cpu->name.length > 0)
-                    ffStrbufAppendS(&cpu->name, " + ");
-
-                if (*pstart == '-')
-                {
-                    if (cpu->vendor.length > 0)
-                        ffStrbufAppend(&cpu->name, &cpu->vendor);
-                    else
-                        ffStrbufAppendS(&cpu->name, "Unknown");
-                    ++pstart;
-                    continue;
-                }
-
-                char* pend = strchr(pstart, '\n');
-                if (pend != NULL)
-                    ffStrbufAppendNS(&cpu->name, (uint32_t) (pend - pstart), pstart);
-                else
-                {
-                    ffStrbufAppendS(&cpu->name, pstart);
-                    break;
-                }
-
-                pstart = pend + 1;
-                if (pstart >= buffer.chars + buffer.length)
-                    return NULL;
-            }
-        }
-    }
+        detectArmName(cpuinfo, cpu, cpuImplementer);
+    #endif

    return NULL;
 }
@@ -34,7 +34,6 @@ FFDisplayResult* ffdsAppendDisplay(

    display->bitDepth = 0;
    display->hdrEnabled = false;
-    display->wcgEnabled = false;

    return display;
 }
@@ -64,7 +64,6 @@ typedef struct FFDisplayResult
    bool primary;
    uint8_t bitDepth;
    bool hdrEnabled;
-    bool wcgEnabled;
 } FFDisplayResult;

 typedef struct FFDisplayServerResult
@@ -8,10 +8,11 @@
 #include <CoreGraphics/CGDirectDisplay.h>
 #include <CoreVideo/CVDisplayLink.h>

+#ifdef MAC_OS_X_VERSION_10_15
 extern CFDictionaryRef CoreDisplay_DisplayCreateInfoDictionary(CGDirectDisplayID display) __attribute__((weak_import));
-#ifndef MAC_OS_X_VERSION_10_15
-#import <IOKit/graphics/IOGraphicsLib.h>
-extern CFDictionaryRef CoreDisplay_IODisplayCreateInfoDictionary(io_service_t framebuffer, IOOptionBits options)  __attribute__((weak_import));
+extern Boolean CoreDisplay_Display_IsHDRModeEnabled(CGDirectDisplayID display) __attribute__((weak_import));
+#else
+#include <IOKit/graphics/IOGraphicsLib.h>
 #endif

 static void detectDisplays(FFDisplayServerResult* ds)
@@ -43,30 +44,22 @@ static void detectDisplays(FFDisplayServerResult* ds)
            }

            FF_STRBUF_AUTO_DESTROY name = ffStrbufCreate();
+            CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = NULL;
            #ifdef MAC_OS_X_VERSION_10_15
            if(CoreDisplay_DisplayCreateInfoDictionary)
-            {
-                CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = CoreDisplay_DisplayCreateInfoDictionary(screen);
-                if(displayInfo)
-                {
-                    CFDictionaryRef productNames;
-                    if(!ffCfDictGetDict(displayInfo, CFSTR(kDisplayProductName), &productNames))
-                        ffCfDictGetString(productNames, CFSTR("en_US"), &name);
-                }
-            }
+                displayInfo = CoreDisplay_DisplayCreateInfoDictionary(screen);
            #else
-            if(CoreDisplay_IODisplayCreateInfoDictionary)
            {
                io_service_t servicePort = CGDisplayIOServicePort(screen);
-                CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = CoreDisplay_IODisplayCreateInfoDictionary(servicePort, kIODisplayOnlyPreferredName);
-                if(displayInfo)
-                {
-                    CFDictionaryRef productNames;
-                    if(!ffCfDictGetDict(displayInfo, CFSTR(kDisplayProductName), &productNames))
-                        ffCfDictGetString(productNames, CFSTR("en_US"), &name);
-                }
+                displayInfo = IODisplayCreateInfoDictionary(servicePort, kIODisplayOnlyPreferredName);
            }
            #endif
+            if(displayInfo)
+            {
+                CFDictionaryRef productNames;
+                if(!ffCfDictGetDict(displayInfo, CFSTR(kDisplayProductName), &productNames))
+                    ffCfDictGetString(productNames, CFSTR("en_US"), &name);
+            }

            CGSize size = CGDisplayScreenSize(screen);

@@ -95,6 +88,11 @@ static void detectDisplays(FFDisplayServerResult* ds)
                    ffCfDictGetInt(dict, kCGDisplayBitsPerSample, &bitDepth);
                    display->bitDepth = (uint8_t) bitDepth;
                }
+
+                if (CoreDisplay_Display_IsHDRModeEnabled)
+                {
+                    display->hdrEnabled = CoreDisplay_Display_IsHDRModeEnabled(screen);
+                }
            }
            CGDisplayModeRelease(mode);
        }
@@ -178,7 +178,6 @@ static void detectDisplays(FFDisplayServerResult* ds)
                if (DisplayConfigGetDeviceInfo(&advColorInfo.header) == ERROR_SUCCESS)
                {
                    display->hdrEnabled = !!advColorInfo.advancedColorEnabled;
-                    display->wcgEnabled = !!advColorInfo.wideColorEnforced;
                    display->bitDepth = (uint8_t) advColorInfo.bitsPerColorChannel;
                }
            }
@@ -119,12 +119,6 @@ static void waylandKdeHdrListener(void *data, FF_MAYBE_UNUSED struct kde_output_
    display->hdrEnabled = !!hdr_enabled;
 }

-static void waylandKdeWcgListener(void *data, FF_MAYBE_UNUSED struct kde_output_device_v2 *kde_output_device_v2, uint32_t wcg_enabled)
-{
-    WaylandDisplay* display = data;
-    display->wcgEnabled = !!wcg_enabled;
-}
-
 static struct kde_output_device_v2_listener outputListener = {
    .geometry = waylandKdeGeometryListener,
    .current_mode = waylandKdeCurrentModeListener,
@@ -143,7 +137,7 @@ static struct kde_output_device_v2_listener outputListener = {
    .name = waylandKdeNameListener,
    .high_dynamic_range = waylandKdeHdrListener,
    .sdr_brightness = (void*) stubListener,
-    .wide_color_gamut = waylandKdeWcgListener,
+    .wide_color_gamut = (void*) stubListener,
    .auto_rotate_policy = (void*) stubListener,
    .icc_profile_path = (void*) stubListener,
    .brightness_metadata = (void*) stubListener,
@@ -202,7 +196,6 @@ void ffWaylandHandleKdeOutput(WaylandData* wldata, struct wl_registry* registry,
    if (item)
    {
        item->hdrEnabled = display.hdrEnabled;
-        item->wcgEnabled = display.wcgEnabled;
    }

    ffStrbufDestroy(&display.description);
@@ -47,7 +47,6 @@ typedef struct WaylandDisplay
    FFstrbuf edidName;
    uint64_t id;
    bool hdrEnabled;
-    bool wcgEnabled;
    void* internal;
 } WaylandDisplay;

@@ -33,11 +33,11 @@ typedef struct FFGPUResult
    FFstrbuf driver;
    FFstrbuf platformApi;
    double temperature;
+    double coreUsage;
    int32_t coreCount;
    uint32_t frequency; // Maximum time clock frequency in MHz
    FFGPUMemory dedicated;
    FFGPUMemory shared;
-    double coreUsage;
    uint64_t deviceId; // Used internally, may be uninitialized
 } FFGPUResult;

@@ -47,5 +47,5 @@ const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus);
 const char* ffGetGPUVendorString(unsigned vendorId);

 #if defined(__linux__) || defined(__FreeBSD__) || defined(__sun)
-void ffGPUParsePciIds(FFstrbuf* content, uint8_t subclass, uint16_t vendor, uint16_t device, FFGPUResult* gpu);
+void ffGPUParsePciIds(FFstrbuf* content, uint8_t subclass, uint16_t vendor, uint16_t device, FFGPUResult* gpu, FFstrbuf* coreName);
 #endif
@@ -3,6 +3,7 @@
 #include "common/io/io.h"
 #include "common/properties.h"
 #include "util/mallocHelper.h"
+#include "util/stringUtils.h"

 #include <dev/pci/pcireg.h>
 #include <sys/pciio.h>
@@ -70,11 +71,12 @@ const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus)
            ffParsePropFileData("libdrm/amdgpu.ids", query, &gpu->name);
        }

+        FF_STRBUF_AUTO_DESTROY coreName = ffStrbufCreate();
        if (gpu->name.length == 0)
        {
            if (pciids.length == 0)
                loadPciIds(&pciids);
-            ffGPUParsePciIds(&pciids, pc->pc_subclass, pc->pc_vendor, pc->pc_device, gpu);
+            ffGPUParsePciIds(&pciids, pc->pc_subclass, pc->pc_vendor, pc->pc_device, gpu, &coreName);
        }

        if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_NVIDIA && (options->temp || options->driverSpecific))
@@ -114,7 +116,12 @@ const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus)
            }
            else if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_INTEL)
            {
-                gpu->type = ffStrbufStartsWithIgnCaseS(&gpu->name, "Arc ") ? FF_GPU_TYPE_DISCRETE : FF_GPU_TYPE_INTEGRATED;
+                if ((coreName.chars[0] == 'D' || coreName.chars[0] == 'S') &&
+                        coreName.chars[1] == 'G' &&
+                        ffCharIsDigit(coreName.chars[2]))
+                    gpu->type = FF_GPU_TYPE_DISCRETE; // DG1 / DG2 / SG1
+                else
+                    gpu->type = FF_GPU_TYPE_INTEGRATED;
            }
        }
    }
@@ -199,14 +199,20 @@ static void pciDetectAmdSpecific(const FFGPUOptions* options, FFGPUResult* gpu,
    }
 }

-static void pciDetectIntelSpecific(FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf* buffer)
+static void pciDetectIntelSpecific(FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf* buffer, const FFstrbuf* coreName)
 {
    // Works for Intel GPUs
    // https://patchwork.kernel.org/project/intel-gfx/patch/1422039866-11572-3-git-send-email-ville.syrjala@linux.intel.com/

    if (ffStrbufStartsWithS(&gpu->name, "Intel "))
        ffStrbufSubstrAfter(&gpu->name, (uint32_t) strlen("Intel "));
-    gpu->type = ffStrbufStartsWithIgnCaseS(&gpu->name, "Arc ") ? FF_GPU_TYPE_DISCRETE : FF_GPU_TYPE_INTEGRATED;
+
+    if ((coreName->chars[0] == 'D' || coreName->chars[0] == 'S') &&
+            coreName->chars[1] == 'G' &&
+            ffCharIsDigit(coreName->chars[2]))
+        gpu->type = FF_GPU_TYPE_DISCRETE; // DG1 / DG2 / SG1
+    else
+        gpu->type = FF_GPU_TYPE_INTEGRATED;

    if (ffStrbufEqualS(&gpu->driver, "xe"))
    {
@@ -293,6 +299,7 @@ static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf
    ffStrbufInit(&gpu->driver);
    ffStrbufInit(&gpu->platformApi);
    gpu->temperature = FF_GPU_TEMP_UNSET;
+    gpu->coreUsage = FF_GPU_CORE_USAGE_UNSET;
    gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
    gpu->type = FF_GPU_TYPE_UNKNOWN;
    gpu->dedicated.total = gpu->dedicated.used = gpu->shared.total = gpu->shared.used = FF_GPU_VMEM_SIZE_UNSET;
@@ -322,6 +329,7 @@ static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf
        ffStrbufSubstrBefore(deviceDir, drmDirPathLength);
    }

+    FF_STRBUF_AUTO_DESTROY coreName = ffStrbufCreate();
    if (gpu->name.length == 0)
    {
        static FFstrbuf pciids;
@@ -330,7 +338,7 @@ static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf
            ffStrbufInit(&pciids);
            loadPciIds(&pciids);
        }
-        ffGPUParsePciIds(&pciids, subclassId, (uint16_t) vendorId, (uint16_t) deviceId, gpu);
+        ffGPUParsePciIds(&pciids, subclassId, (uint16_t) vendorId, (uint16_t) deviceId, gpu, &coreName);
    }

    pciDetectDriver(gpu, deviceDir, buffer, drmKey);
@@ -343,7 +351,7 @@ static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf
    }
    else if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_INTEL)
    {
-        pciDetectIntelSpecific(gpu, deviceDir, buffer);
+        pciDetectIntelSpecific(gpu, deviceDir, buffer, &coreName);
        ffStrbufSubstrBefore(deviceDir, drmDirPathLength);
    }
    else
@@ -1,6 +1,6 @@
 #include "gpu.h"

-void ffGPUParsePciIds(FFstrbuf* content, uint8_t subclass, uint16_t vendor, uint16_t device, FFGPUResult* gpu)
+void ffGPUParsePciIds(FFstrbuf* content, uint8_t subclass, uint16_t vendor, uint16_t device, FFGPUResult* gpu, FFstrbuf* coreName)
 {
    if (content->length)
    {
@@ -44,13 +44,20 @@ void ffGPUParsePciIds(FFstrbuf* content, uint8_t subclass, uint16_t vendor, uint
                if (!end)
                    end = content->chars + content->length;

-                char* openingBracket = memchr(start, '[', (uint32_t) (end - start));
-                if (openingBracket)
+                char* closingBracket = end - 1;
+                if (*closingBracket == ']')
                {
-                    openingBracket++;
-                    char* closingBracket = memchr(openingBracket, ']', (uint32_t) (end - openingBracket));
-                    if (closingBracket)
+                    char* openingBracket = memrchr(start, '[', (size_t) (closingBracket - start));
+                    if (openingBracket)
+                    {
+                        openingBracket++;
                        ffStrbufSetNS(&gpu->name, (uint32_t) (closingBracket - openingBracket), openingBracket);
+                        if (coreName)
+                        {
+                            ffStrbufSetNS(coreName, (uint32_t) (openingBracket - start) - 1, start);
+                            ffStrbufTrimRight(coreName, ' ');
+                        }
+                    }
                }
                if (!gpu->name.length)
                    ffStrbufSetNS(&gpu->name, (uint32_t) (end - start), start);
@@ -76,7 +76,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
        {
            if (pciids.length == 0)
                ffReadFileBuffer(FASTFETCH_TARGET_DIR_ROOT "/usr/share/hwdata/pci.ids", &pciids);
-            ffGPUParsePciIds(&pciids, (uint8_t) subclass, (uint16_t) vendorId, (uint16_t) deviceId, gpu);
+            ffGPUParsePciIds(&pciids, (uint8_t) subclass, (uint16_t) vendorId, (uint16_t) deviceId, gpu, NULL);
        }
    }

@@ -15,7 +15,12 @@ static inline void wrapSetupDiDestroyDeviceInfoList(HDEVINFO* hdev)
 }

 #define FF_EMPTY_GUID_STR L"{00000000-0000-0000-0000-000000000000}"
-#define FF_GUID_STRLEN (sizeof(FF_EMPTY_GUID_STR) / sizeof(wchar_t) - 1)
+enum { FF_GUID_STRLEN = sizeof(FF_EMPTY_GUID_STR) / sizeof(wchar_t) - 1 };
+
+wchar_t regDirectxKey[] = L"SOFTWARE\\Microsoft\\DirectX\\" FF_EMPTY_GUID_STR;
+const uint32_t regDirectxKeyPrefixLength = (uint32_t) __builtin_strlen("SOFTWARE\\Microsoft\\DirectX\\");
+wchar_t regDriverKey[] = L"SYSTEM\\CurrentControlSet\\Control\\Class\\" FF_EMPTY_GUID_STR L"\\0000";
+const uint32_t regDriverKeyPrefixLength = (uint32_t) __builtin_strlen("SYSTEM\\CurrentControlSet\\Control\\Class\\");

 const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* gpus)
 {
@@ -25,39 +30,14 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
    if(hdev == INVALID_HANDLE_VALUE)
        return "SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY) failed";

-    wchar_t regDirectxKey[] = L"SOFTWARE\\Microsoft\\DirectX\\" FF_EMPTY_GUID_STR;
-    const uint32_t regDirectxKeyPrefixLength = (uint32_t) strlen("SOFTWARE\\Microsoft\\DirectX\\");
-    wchar_t regControlVideoKey[] = L"SYSTEM\\CurrentControlSet\\Control\\Video\\" FF_EMPTY_GUID_STR L"\\0000";
-    const uint32_t regControlVideoKeyPrefixLength = (uint32_t) strlen("SYSTEM\\CurrentControlSet\\Control\\Video\\");
-
    SP_DEVINFO_DATA did = { .cbSize = sizeof(did) };
    for (DWORD idev = 0; SetupDiEnumDeviceInfo(hdev, idev, &did); ++idev)
    {
-        wchar_t hardwareId[256];
-        if (!SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_HARDWAREID, NULL, (PBYTE) hardwareId, sizeof(hardwareId), NULL))
-            continue;
-
-        wchar_t videoId[39];
-        {
-            FF_HKEY_AUTO_DESTROY hKey = SetupDiOpenDevRegKey(hdev, &did, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_QUERY_VALUE);
-            if (!hKey) continue;
-            DWORD videoIdLength = sizeof(videoId);
-            if (RegGetValueW(hKey, NULL, L"VideoID", RRF_RT_REG_SZ, NULL, videoId, &videoIdLength) != ERROR_SUCCESS || videoIdLength != (FF_GUID_STRLEN + 1) * sizeof(wchar_t))
-                continue;
-        }
-
-        wmemcpy(regControlVideoKey + regControlVideoKeyPrefixLength, videoId, FF_GUID_STRLEN);
-        FF_HKEY_AUTO_DESTROY hKey = NULL;
-        if (!ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, regControlVideoKey, &hKey, NULL)) continue;
-
-        unsigned vendorId = 0, deviceId = 0, subSystemId = 0, revId = 0;
-        swscanf(hardwareId, L"PCI\\VEN_%x&DEV_%x&SUBSYS_%x&REV_%x", &vendorId, &deviceId, &subSystemId, &revId);
-
        FFGPUResult* gpu = (FFGPUResult*)ffListAdd(gpus);
-        ffStrbufInitStatic(&gpu->vendor, ffGetGPUVendorString(vendorId));
+        ffStrbufInit(&gpu->vendor);
        ffStrbufInit(&gpu->name);
        ffStrbufInit(&gpu->driver);
-        ffStrbufInitStatic(&gpu->platformApi, "Direct3D");
+        ffStrbufInitStatic(&gpu->platformApi, "SetupAPI");
        gpu->temperature = FF_GPU_TEMP_UNSET;
        gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
        gpu->coreUsage = FF_GPU_CORE_USAGE_UNSET;
@@ -66,55 +46,77 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
        gpu->deviceId = 0;
        gpu->frequency = FF_GPU_FREQUENCY_UNSET;

-        if (!ffRegReadStrbuf(hKey, L"DriverDesc", &gpu->name, NULL)) // faster, for some reason
-        {
-            wchar_t name[256];
-            if (SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_DEVICEDESC, NULL, (PBYTE) name, sizeof(name), NULL))
-                ffStrbufSetWS(&gpu->name, name);
-        }
-        ffRegReadStrbuf(hKey, L"DriverVersion", &gpu->driver, NULL);
+        wchar_t buffer[256];
+        if (SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_DEVICEDESC, NULL, (PBYTE) buffer, sizeof(buffer), NULL))
+            ffStrbufSetWS(&gpu->name, buffer);

-        wmemcpy(regDirectxKey + regDirectxKeyPrefixLength, videoId, FF_GUID_STRLEN);
-        FF_HKEY_AUTO_DESTROY hDirectxKey = NULL;
-        if (ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, regDirectxKey, &hDirectxKey, NULL))
+        FF_HKEY_AUTO_DESTROY hVideoIdKey = SetupDiOpenDevRegKey(hdev, &did, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_QUERY_VALUE);
+        if (!hVideoIdKey) continue;
+        DWORD bufferLen = sizeof(buffer);
+        if (RegGetValueW(hVideoIdKey, NULL, L"VideoID", RRF_RT_REG_SZ, NULL, buffer, &bufferLen) == ERROR_SUCCESS &&
+            bufferLen == (FF_GUID_STRLEN + 1) * sizeof(wchar_t))
        {
-            uint64_t dedicatedVideoMemory = 0;
-            if(ffRegReadUint64(hDirectxKey, L"DedicatedVideoMemory", &dedicatedVideoMemory, NULL))
-                gpu->type = dedicatedVideoMemory >= 1024 * 1024 * 1024 ? FF_GPU_TYPE_DISCRETE : FF_GPU_TYPE_INTEGRATED;
-
-            uint64_t dedicatedSystemMemory, sharedSystemMemory;
-            if(ffRegReadUint64(hDirectxKey, L"DedicatedSystemMemory", &dedicatedSystemMemory, NULL) &&
-                ffRegReadUint64(hDirectxKey, L"SharedSystemMemory", &sharedSystemMemory, NULL))
+            wmemcpy(regDirectxKey + regDirectxKeyPrefixLength, buffer, FF_GUID_STRLEN);
+            FF_HKEY_AUTO_DESTROY hDirectxKey = NULL;
+            if (ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, regDirectxKey, &hDirectxKey, NULL))
            {
-                gpu->dedicated.total = dedicatedVideoMemory + dedicatedSystemMemory;
-                gpu->shared.total = sharedSystemMemory;
+                uint64_t dedicatedVideoMemory = 0;
+                if(ffRegReadUint64(hDirectxKey, L"DedicatedVideoMemory", &dedicatedVideoMemory, NULL))
+                    gpu->type = dedicatedVideoMemory >= 1024 * 1024 * 1024 ? FF_GPU_TYPE_DISCRETE : FF_GPU_TYPE_INTEGRATED;
+
+                uint64_t dedicatedSystemMemory, sharedSystemMemory;
+                if(ffRegReadUint64(hDirectxKey, L"DedicatedSystemMemory", &dedicatedSystemMemory, NULL) &&
+                    ffRegReadUint64(hDirectxKey, L"SharedSystemMemory", &sharedSystemMemory, NULL))
+                {
+                    gpu->dedicated.total = dedicatedVideoMemory + dedicatedSystemMemory;
+                    gpu->shared.total = sharedSystemMemory;
+                }
+
+                ffRegReadUint64(hDirectxKey, L"AdapterLuid", &gpu->deviceId, NULL);
+
+                uint32_t featureLevel = 0;
+                if(ffRegReadUint(hDirectxKey, L"MaxD3D12FeatureLevel", &featureLevel, NULL) && featureLevel)
+                    ffStrbufSetF(&gpu->platformApi, "Direct3D 12.%u", (featureLevel & 0x0F00) >> 8);
+                else if(ffRegReadUint(hDirectxKey, L"MaxD3D11FeatureLevel", &featureLevel, NULL) && featureLevel)
+                    ffStrbufSetF(&gpu->platformApi, "Direct3D 11.%u", (featureLevel & 0x0F00) >> 8);
+
+                uint64_t driverVersion = 0;
+                if(ffRegReadUint64(hDirectxKey, L"DriverVersion", &driverVersion, NULL) && driverVersion)
+                {
+                    ffStrbufSetF(&gpu->driver, "%u.%u.%u.%u",
+                        (unsigned) (driverVersion >> 48) & 0xFFFF,
+                        (unsigned) (driverVersion >> 32) & 0xFFFF,
+                        (unsigned) (driverVersion >> 16) & 0xFFFF,
+                        (unsigned) (driverVersion >> 0) & 0xFFFF
+                    );
+                }
+
+                uint32_t vendorId = 0;
+                if(ffRegReadUint(hDirectxKey, L"VendorId", &vendorId, NULL) && vendorId)
+                    ffStrbufSetStatic(&gpu->vendor, ffGetGPUVendorString(vendorId));
            }
-
-            ffRegReadUint64(hDirectxKey, L"AdapterLuid", &gpu->deviceId, NULL);
-
-            uint32_t featureLevel = 0;
-            if(ffRegReadUint(hDirectxKey, L"MaxD3D12FeatureLevel", &featureLevel, NULL) && featureLevel)
-                ffStrbufSetF(&gpu->platformApi, "Direct3D 12.%u", (featureLevel & 0x0F00) >> 8);
-            else if(ffRegReadUint(hDirectxKey, L"MaxD3D11FeatureLevel", &featureLevel, NULL) && featureLevel)
-                ffStrbufSetF(&gpu->platformApi, "Direct3D 11.%u", (featureLevel & 0x0F00) >> 8);
-        }
-        else if (!ffRegReadUint64(hKey, L"HardwareInformation.qwMemorySize", &gpu->dedicated.total, NULL))
-        {
-            uint32_t vmem = 0;
-            if (ffRegReadUint(hKey, L"HardwareInformation.MemorySize", &vmem, NULL))
-                gpu->dedicated.total = vmem;
-            gpu->type = gpu->dedicated.total > 1024 * 1024 * 1024 ? FF_GPU_TYPE_DISCRETE : FF_GPU_TYPE_INTEGRATED;
        }

        if (gpu->vendor.length == 0)
        {
-            ffRegReadStrbuf(hKey, L"ProviderName", &gpu->vendor, NULL);
-            if (ffStrbufContainS(&gpu->vendor, "Intel"))
-                ffStrbufSetStatic(&gpu->vendor, FF_GPU_VENDOR_NAME_INTEL);
-            else if (ffStrbufContainS(&gpu->vendor, "NVIDIA"))
-                ffStrbufSetStatic(&gpu->vendor, FF_GPU_VENDOR_NAME_NVIDIA);
-            else if (ffStrbufContainS(&gpu->vendor, "AMD") || ffStrbufContainS(&gpu->vendor, "ATI"))
-                ffStrbufSetStatic(&gpu->vendor, FF_GPU_VENDOR_NAME_AMD);
+            bufferLen = sizeof(buffer);
+            if (SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_DRIVER, NULL, (PBYTE) buffer, sizeof(buffer), &bufferLen) && bufferLen == (FF_GUID_STRLEN + strlen("\\0000") + 1) * 2)
+            {
+                wmemcpy(regDriverKey + regDriverKeyPrefixLength, buffer, FF_GUID_STRLEN + strlen("\\0000"));
+                FF_HKEY_AUTO_DESTROY hRegDriverKey = NULL;
+                if (ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, regDriverKey, &hRegDriverKey, NULL))
+                {
+                    if (ffRegReadStrbuf(hRegDriverKey, L"ProviderName", &gpu->vendor, NULL))
+                    {
+                        if (ffStrbufContainS(&gpu->vendor, "Intel"))
+                            ffStrbufSetStatic(&gpu->vendor, FF_GPU_VENDOR_NAME_INTEL);
+                        else if (ffStrbufContainS(&gpu->vendor, "NVIDIA"))
+                            ffStrbufSetStatic(&gpu->vendor, FF_GPU_VENDOR_NAME_NVIDIA);
+                        else if (ffStrbufContainS(&gpu->vendor, "AMD") || ffStrbufContainS(&gpu->vendor, "ATI"))
+                            ffStrbufSetStatic(&gpu->vendor, FF_GPU_VENDOR_NAME_AMD);
+                    }
+                }
+            }
        }

        __typeof__(&ffDetectNvidiaGpuInfo) detectFn;
@@ -122,6 +124,13 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*

        if (getDriverSpecificDetectionFn(gpu->vendor.chars, &detectFn, &dllName) && (options->temp || options->driverSpecific))
        {
+            unsigned vendorId = 0, deviceId = 0, subSystemId = 0, revId = 0;
+            if (SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_HARDWAREID, NULL, (PBYTE) buffer, sizeof(buffer), NULL))
+            {
+                swscanf(buffer, L"PCI\\VEN_%x&DEV_%x&SUBSYS_%x&REV_%x", &vendorId, &deviceId, &subSystemId, &revId);
+                ffStrbufSetStatic(&gpu->vendor, ffGetGPUVendorString(vendorId));
+            }
+
            uint32_t pciBus, pciAddr;
            if (SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_BUSNUMBER, NULL, (PBYTE) &pciBus, sizeof(pciBus), NULL) &&
                SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_ADDRESS, NULL, (PBYTE) &pciAddr, sizeof(pciAddr), NULL))
@@ -133,7 +142,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
                    &(FFGpuDriverCondition) {
                        .type = FF_GPU_DRIVER_CONDITION_TYPE_DEVICE_ID
                              | (gpu->deviceId > 0 ? FF_GPU_DRIVER_CONDITION_TYPE_LUID : 0)
-                              | FF_GPU_DRIVER_CONDITION_TYPE_BUS_ID,
+                              | (vendorId > 0 ? FF_GPU_DRIVER_CONDITION_TYPE_BUS_ID : 0),
                        .pciDeviceId = {
                            .deviceId = deviceId,
                            .vendorId = vendorId,
@@ -7,11 +7,10 @@
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>

+#ifdef MAC_OS_X_VERSION_10_15
 extern CFDictionaryRef CoreDisplay_DisplayCreateInfoDictionary(CGDirectDisplayID display) __attribute__((weak_import));
-
-#ifndef MAC_OS_X_VERSION_10_15
-#import <IOKit/graphics/IOGraphicsLib.h>
-extern CFDictionaryRef CoreDisplay_IODisplayCreateInfoDictionary(io_service_t framebuffer, IOOptionBits options)  __attribute__((weak_import));
+#else
+#include <IOKit/graphics/IOGraphicsLib.h>
 #endif

 static bool detectHdrSupportWithNSScreen(FFDisplayResult* display)
@@ -57,7 +56,7 @@ const char* ffDetectMonitor(FFlist* results)
        CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = CoreDisplay_DisplayCreateInfoDictionary((CGDirectDisplayID) display->id);
        #else
        io_service_t servicePort = CGDisplayIOServicePort((CGDirectDisplayID) display->id);
-        CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = CoreDisplay_IODisplayCreateInfoDictionary(servicePort, kIODisplayOnlyPreferredName);
+        CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = IODisplayCreateInfoDictionary(servicePort, kIODisplayOnlyPreferredName);
        #endif
        if(!displayInfo) continue;

@@ -67,7 +66,7 @@ const char* ffDetectMonitor(FFlist* results)

        uint8_t edidData[128] = {};
        uint32_t edidLength = 0;
-        if (ffCfDictGetData(displayInfo, CFSTR("IODisplayEDID"), 0, sizeof(edidData), edidData, &edidLength) == NULL)
+        if (ffCfDictGetData(displayInfo, CFSTR(kIODisplayEDIDKey), 0, sizeof(edidData), edidData, &edidLength) == NULL)
        {
            uint32_t width, height;
            ffEdidGetPhysicalResolution(edidData, &width, &height);
@@ -13,4 +13,4 @@ ${c1}   ///////${c3}\\\\\\\\\\//
         /\\\/${c1}\\/
         /\\\\//
        //////
-      /// ${c3}\\\\\
+      /// ${c3}\\\\\
@@ -18,4 +18,4 @@ oOO                                           OOo
      oO                                OOo
         oOO                         OOo
             oOO                 OOo
-                 ooo OOO OOO ooo
+                 ooo OOO OOO ooo
@@ -12,4 +12,4 @@ ${c1}g@@@@M"     ${c2}"VP`${c3}.L!     ${c4}<@JJJJ`
         ${c3}.@FJJJF`${c4},@LFFFF`
       ${c3}_@FFFFF   ${c4}VLLLP`
     ${c3}J@@LL@"      ${c4}`"
-      ${c3}V@@"
+      ${c3}V@@"
@@ -3,4 +3,4 @@ ${c1}   /\\ /\\
 /${c2}//  ${c1}\\  \\
 /${c2}//    ${c1}\\  \\
 ${c2}//      ${c1}\\  \\
-         \\
+         \\
@@ -17,4 +17,4 @@
    @~:~~: ~:~~:~:(zltlltlO    a,wwwwww
   8~~:~~:~~~~:~~~~_1ltltu          ,www
  5~~:~~:~~:~~:~~:~~~_1ltq             N,,
- g~:~~:~~~:~~:~~:~:~~~~1q                N,
+ g~:~~:~~~:~~:~~:~:~~~~1q                N,
@@ -19,4 +19,4 @@
     #####$2##%:$3######$2:############$1##
       ##$2+##*$3########$2############$1
         $2###$3#########$2##########$1
-             $3########$2######
+             $3########$2######
@@ -16,4 +16,4 @@ dMMMMMMMMMMMMMMMMh    yMMMMMMMMMMMMMMMMd
 dMMMMMMMMMMMMMMMMh    yMMMMMMMMMMMMMMMMd
 .:+ydNMMMMMMMMMMMh    yMMMMMMMMMMMNdy+:.
     `.:+shNMMMMMh    yMMMMMNhs+:``
-            `-+shy    shs+:`
+            `-+shy    shs+:`
@@ -7,4 +7,4 @@
   ~~~         /
     ~~._.   _/
        _/ _/
-      _/m/'
+      _/m/'
@@ -16,4 +16,4 @@ ${c1}             ___________
 |          /   ____/       |
 \_________/   /            |
               \         __/
-                \_______/
+                \_______/
@@ -25,4 +25,4 @@
     ${c2}.${c1}                       ${c2}.:+++${c1}.
                                ${c2}.:${c1}:
                                   ${c2}..${c1}
-                                    ${c2}..${c1}
+                                    ${c2}..${c1}
@@ -16,4 +16,4 @@ dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh
 -dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd-
 .smmmmddddddddhhhhhhhhhdddddddddmmmms.
   `+ydmmmdddddddddddddddddddmmmmdy/.
-      `.:+ooyyddddddddddddyyso+:.`
+      `.:+ooyyddddddddddddyyso+:.`
@@ -9,4 +9,4 @@
 \,_/\_/  |  |_/|_/|_/_/    \,
   ,                  /     ,\
     ,               /  , '   \
-      ' - , _ _ _ ,  '
+      ' - , _ _ _ ,  '
@@ -14,4 +14,4 @@ ${c4}^MMM@@@@@@@@@@@MP" ${c3},ggppww__
     ${c3}_gBNNNNNNNNNNNNNNNNNP"
 ${c3}_wNNNNNNNNNNNNNNNNNNNM^
 ${c3}""Y^^MNNNNNNNNNNNNP`
-         ${c3}`"""""""
+         ${c3}`"""""""
@@ -17,4 +17,4 @@
     +NMMMMMms/.`    mMMMMMMMMMMMN+
      `+mMMMMMMMMNmddMMMMMMMMMMm+`
         .ohNMMMMMMMMMMMMMMNho.
-             .:+syhhhhys+:.
+             .:+syhhhhys+:.
@@ -15,4 +15,4 @@ ${c2}          .........
  ${c3}................        ${c4}***********
  ${c3}................        ${c4}###########
  ${c3}****************
-  ${c3}################
+  ${c3}################
@@ -6,4 +6,4 @@ ${c2}    _____   ${c1}_____${c2}
 \\  / _____ \\${c4}___
  ${c3}|${c2}/_/  ${c3}|   ${c4}|   |
  ${c3}|     |   ${c4}|___|
-  ${c3}|_____|
+  ${c3}|_____|
@@ -17,4 +17,4 @@
     =XMMM@MM@MM#H;,-+HMM@M+ /MMMX=
       =%@M@M#@S-.=S@MM@@@M; %M%=
         ,:+S+-,/H#MMMMMMM@= =,
-               =++%%%%+/:-.
+               =++%%%%+/:-.
@@ -15,4 +15,4 @@ MMMMMM/`.-/ohmNMMMMMMy-
 MMMMMMNmNNMMMMMMMMmo.
 MMMMMMMMMMMMMMMms:`
 MMMMMMMMMMNds/.
-dhhyys+/-`
+dhhyys+/-`
@@ -16,4 +16,4 @@ $2       .oossssso-````/ossssss+`
  `/ossssso+/:-        -:/+osssso+-
 `+sso+:-`                 `.-/+oso:
 `++:.                           `-/+/
-.`                                 `/
+.`                                 `/
@@ -16,4 +16,4 @@ $2       ▟█████████▛▀▀▜████████▙
   ▟██████████▛        ▜█████████▙
  ▟██████▀▀▀              ▀▀██████▙
 ▟███▀▘                       ▝▀███▙
-▟▛▀                               ▀▜▙
+▟▛▀                               ▀▜▙
@@ -16,4 +16,4 @@ $2        /      ,.-+-..      \
   /     __,--+"     "+--.__     \
  /  _,+'"                 "'+._  \
 /,-'                           `-.\
-'                                   '
+'                                   '
@@ -4,4 +4,4 @@
   /      \
 $2  /   ,,   \
 /   |  |   \
-/_-''    ''-_\
+/_-''    ''-_\
@@ -16,4 +16,4 @@
 /:::+`hhhhoos`     `hhhhhhhhhhhhhhhhhs+`
    `--/:`   /:     `hhhhhhhhhhhho/-
             -/:.   `hhhhhhs+:-`
-                ::::/ho/-`
+                ::::/ho/-`
@@ -17,4 +17,4 @@ ${c4}⠄⠄⠄⠄${c1}⢀⣾⣿⣿⣿⣿⣿⣿⣷⣤⡀${c4}⠄⠄⠄${c1}⠻⣿
 ${c5}⠄⠄⠄${c1}⢠⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⠏${c5}⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄${c1}⢿⣿⣿⣿⣿⣿⣿⣿⣿⣦⡀${c5}⠄⠄⠄
 ${c6}⠄⠄${c1}⢠⣿⣿⣿⣿⣿⣿⣿⡿⠟⠋⠁${c6}⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄${c1}⠙⠻⣿⣿⣿⣿⣿⣿⣿⣿⡄${c6}⠄⠄
 ${c1}⠄${c1}⣠⣿⣿⣿⣿⠿⠛⠋⠁${c1}⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄${c1}⠉⠙⠻⢿⣿⣿⣿⣿⣆${c1}⠄
-${c1}⡰⠟⠛⠉⠁${c2}⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄${c1}⠉⠙⠛⠿⢆
+${c1}⡰⠟⠛⠉⠁${c2}⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄${c1}⠉⠙⠛⠿⢆
@@ -17,4 +17,4 @@
    +ooooooooos.          .=sooooooo+-
  .+osossos+-`              `-+osososs+.
 :sss+=-:`                     `:-=+ssss:
-:=-:`                                `-=+:
+:=-:`                                `-=+:
@@ -18,4 +18,4 @@
    'xKXXXXK0kdl:.     $2.ok; $1.cdk0KKXXXKx'
   'xKK0koc,..         $2'c, $1    ..,cok0KKk,
  ,xko:'.             $2.. $1           .':okx;
- .,'.                                   .',.
+ .,'.                                   .',.
@@ -14,4 +14,4 @@ ${c1}                   *
      ****${c2}/${c1}****    ${c2}/////${c1}***${c2}/${c1}****
     ******${c2}/${c1}***  ${c2}////   ${c1}**${c2}/${c1}******
    ********${c2}/${c1}* ${c2}///      ${c1}*${c2}/${c1}********
-  ,******     ${c2}// ______ /    ${c1}******,
+  ,******     ${c2}// ______ /    ${c1}******,
@@ -8,4 +8,4 @@
   ooooo     ooooo
  ooooo  ${c2}<oooooooo>${c1}
 ooooo      ${c2}<oooooo>${c1}
-ooooo          ${c2}<oooo>
+ooooo          ${c2}<oooo>
@@ -20,4 +20,4 @@ $2.-==+++***++*$3*#########$1=:::.
 $2.-=++++*++++**$3#######%%###$1=
   $2.:==++++++**$3#############$1:
            $2.$1-+*++*+++==$3###$1+
-                       -$3*+$1:
+                       -$3*+$1:
@@ -19,4 +19,4 @@ l**c)tttttttttttttttttttttttt(z**,
      'I)$2))(\()($1tt$2))|\()($1{;'
        $2.~~~~~~~|)~~~~~~~<$1
        '$2[)))))1$1|($2)))))))$1?
-          $2",,,"    ",,,^
+          $2",,,"    ",,,^
@@ -11,4 +11,4 @@
 ▄▄██   ██         ██   ██▄▄
 ▄▄██                   ██▄▄
  ███████████████████████
-   █ █ █ █ █ █ █ █ █ █ █
+   █ █ █ █ █ █ █ █ █ █ █
@@ -12,4 +12,4 @@
 ⢸⣿⠀⠀⠀⠀⠀⣤⣤⣴⣶⣾⠿⠟⣿⡏⠙⠛⠛⠛⠋⠉⢀⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
 ⠀⣿⡄⠀⠀⠀⠀⠈⠉⠉⠀⠀⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⢸⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
 ⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢿⠇⠀⠀⠀⠀⠀⠀⠘⠿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
-⠀⠈⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠈⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
@@ -10,4 +10,4 @@
   'ookxxkoo'`   .'oo'
  'ooxoo'`     .:ooxxo'
 'io'`             `'oo'
-'`                     `'
+'`                     `'
@@ -12,4 +12,4 @@ ${c1}     +yyyyyys :yyyyyy/${c2}-yyyyyy+
 ${c1}   .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ ---------
 ${c1}  .syyyyyy+`  :yyyyyy/${c2}-yyyyy+-+syyyyyyyy
 ${c1} -syyyyyy/    :yyyyyy/${c2}-yyys:.syyyyyyyyyy
-${c1}:syyyyyy/     :yyyyyy/${c2}-yyo.:syyyyyyyyyyy
+${c1}:syyyyyy/     :yyyyyy/${c2}-yyo.:syyyyyyyyyyy
@@ -15,4 +15,4 @@ $3((((((((((((((((((((($5@@@$6&%&$5@@@%$4,..........
        $3/(((((((((((($5@@@@@@/$4.../&&
           $3.((((((((($5@@@@($4....
               $3/((((($5@@#$4...
-                  $3.(($4&,
+                  $3.(($4&,
@@ -15,4 +15,4 @@ $4_MMMMMMMMMMMMMMMMMMMM$5MMMM$7M0$5MMMW$6MMMMMMMMMM_
          $4~MMMMMMMMMM$5MMMMM$60MMM~~
              $4~MMMMMM$5MMM$60MM~
                  $4~MM$5M$6@~
-                    $4M
+                    $4M
@@ -15,4 +15,4 @@ cMM;        dMMW'
  OMMc   ...
   xMMx
    ;XMN:
-      ,.
+      ,.
@@ -14,4 +14,4 @@ ${c3}           /########   ########
 ${c4}              #######%#######
 ${c4}                (#%%%%%%%#
 ${c4}                   %%%%%
-${c4}                    %%%
+${c4}                    %%%
@@ -20,4 +20,4 @@ uURF$##Bv       nKWB$%ABc       aM@3R@D@b
 8       M       @       O       #       %
 %       &       G       U       @       @
 &       @       #       %       %       #
-!HGN@MNCf       t&S9#%HQr       ?@G#6S@QP
+!HGN@MNCf       t&S9#%HQr       ?@G#6S@QP
@@ -19,4 +19,4 @@ ${c1}       aA${c2}/${c1}a${c2}\\\\\\${c1}Aa${c2}\\/${c1}AA${c2}\\\\\\\\\\${c1}A
 ${c1}       aA${c2}/${c1}aA${c2}\\\\/${c1}aAa  aAa${c2}\\\\\\${c1}Aa${c2}\\${c1}Aa
 ${c1}      aA${c2}/\\${c1}A${c2}\\/${c1}Aa        aA${c2}\\\\${c1}A${c2}\\\\${c1}Aa
 ${c1}      A${c2}|/${c1}aaAa            aAaa${c2}\\|${c1}A
-${c1}     aAaa                    aaAa
+${c1}     aAaa                    aaAa
@@ -21,4 +21,4 @@ ${c1}          ###### ${c2}########${c1} #
 ${c1}               ### ${c2}#######${c1}
 ${c1}                     ${c2}######${c1}
 ${c1}                        ${c2}####${c1}
-${c1}                          ${c2}##${c1}
+${c1}                          ${c2}##${c1}
@@ -14,4 +14,4 @@ ${c1}//////// /////////          ${c2}          &(((((((( @((((((((
 ${c1}////////  //////            ${c2}            @((((   @((((((((
 ${c1}////////                    ${c2}                    @((((((((
 ${c1}////////                    ${c2}                    @((((((((
-${c1} /////                      ${c2}                      (((((
+${c1} /////                      ${c2}                      (((((
@@ -16,4 +16,4 @@ ${c3} .X.       oMMMMW.                      l.
  dMk:..;xWMMMMW,
   kMMMMMMMMMMX.
    :XMMMMMMK:
-      ':MM:"      Made in Brazil
+      ':MM:"      Made in Brazil
@@ -14,4 +14,4 @@
 :NMMMNmmmmmMMh
 /MN/-------oNN:
 hMd.       .dMh
-sm/         /ms
+sm/         /ms
@@ -18,4 +18,4 @@ ${c2}        .oossssso-`${c3}//${c1}`/ossssss+`
   `/ossssso+/:-   ${c3}//${c1}   -:/+osssso+-
  `+sso+:-`        ${c3}//${c1}       `.-/+oso:
 `++:.             ${c3}//${c1}            `-/+/
- .`                ${c3}/${c1}                `/
+ .`                ${c3}/${c1}                `/
@@ -17,4 +17,4 @@ H@:         :HHHHHHHHHHHHHHHHHHX,    =@H
    =X@@@@@@@@@@@@@@@@@@@@@@@@@@@X=
      :$$@@@@@@@@@@@@@@@@@@M@@@@$$:
        \$$@@@@@@@@@@@@@@@@@@X/-
-           .-;+$$XXHHHHHX$$+;-.
+           .-;+$$XXHHHHHX$$+;-.
@@ -20,4 +20,4 @@ ${c3}                         ........
           `╙▀█▄@»»»;`▀███▌¿              ,▄▀Ñ"`
             `"╨▀█▄▄▄░`▐█████▄,       ,▄▄▀▀░`
                `"╙╩▀▀▀▀████████▓▌▌▌▀▀▀╨"``
-                    ``""░╚╨╝╝╝╝╨╨░""``
+                    ``""░╚╨╝╝╝╝╨╨░""``
@@ -14,4 +14,4 @@
          .NMMMMMNd.     `':ldko
           OMMMK:
           oWk,
-           ;:
+           ;:
@@ -14,4 +14,4 @@ ${c2}  +MMMMMMMNho:.`  `.:ohNMMMMMMNo ${c1}`yyyyys
 ${c2}   -hMMMMMMMMNNNmmNNNMMMMMMMMh-  ${c1}`yyyyys
 ${c2}     :yNMMMMMMMMMMMMMMMMMMNy:`   ${c1}`yyyyys
 ${c2}       .:sdNMMMMMMMMMMNds/.      ${c1}`yyyyyo
-${c2}           `.:/++++/:.`           ${c1}:oys+.
+${c2}           `.:/++++/:.`           ${c1}:oys+.
@@ -16,4 +16,4 @@
           ./oyyyyyyyyyo......${c1}+mMMMMMMMM${c2}
              omdyyyyyyo....${c1}+mMMMMMMMMMM${c2}
              ${c1}oMMM${c2}mdhyyo..${c1}+mMMMMMMMMMMMM
-              oNNNNNNm${c2}dso${c1}mMMMMMMMMMMMMMM
+              oNNNNNNm${c2}dso${c1}mMMMMMMMMMMMMMM
@@ -15,4 +15,4 @@ TH${c1}L*     ${c3}TKKKKKK##KKKN@KKKK^         ${c1}|I${c2}M
    Yp${c1}LL                      ${c1}' |L${c2}$M`
     `Tp${c1}pLL,                ,|||${c2}p'L
        "Kpp${c1}LL++,.,    ,,|||$$$${c2}#K*   ${c1}'.
-           ${c2}`"MKWpppppppp#KM"`        ${c1}`h,
+           ${c2}`"MKWpppppppp#KM"`        ${c1}`h,
@@ -13,4 +13,4 @@ ${c1} #
 #                        O
 ##, ,##,',##, ,##  ,#,   ,
 # # #  # #''# #,,  # #   #
- '#' '##' #  #  ,,# '##;, #
+ '#' '##' #  #  ,,# '##;, #
@@ -16,4 +16,4 @@ $4<----|====$1O)))$4==$1) \) /$4====|
              \       /       /\
         $5______$1( (_  / \______/
       $5,'  ,-----'   |
-       `--{__________)
+       `--{__________)
@@ -17,4 +17,4 @@
          `NMM/
          +MN:
          mh.
-         -/
+         -/
@@ -5,4 +5,4 @@
 \......\
 \......\
  \.............../
-   \............./
+   \............./
@@ -17,4 +17,4 @@
           ..,,*********#####****+.
     ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1}
      ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1}
-     ${c2}.,,,,++++,..  .,,,,,.....,+++,.,,${c1}
+     ${c2}.,,,,++++,..  .,,,,,.....,+++,.,,${c1}
@@ -22,4 +22,4 @@
 ⠀⠀⠀⠀⠀⠀⠀⠈⠢⡈⠙⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠋⣡⠞⠁⠀⠀⠀⠀⠀⠀⠀
 ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠓⢤⡈⠛⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠛⣁⠴⠊⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀
 ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠑⠢⢄⣉⠙⠛⠿⠿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠿⠛⠋⣉⡤⠖⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
-⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠓⠒⠢⠤⠤⠤⠤⠤⠤⠤⠤⠖⠒⠋⠉⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠓⠒⠢⠤⠤⠤⠤⠤⠤⠤⠤⠖⠒⠋⠉⠀
@@ -12,4 +12,4 @@
 ⠀⠀⠡⡘⢿⣿⣿⣿⣦⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣴⣿⣷⣦⡀⢀⠊⠀⠀
 ⠀⠀⠀⠈⠊⡻⢿⣿⣿⣿⣿⣶⣤⣤⣤⣤⣤⣤⣶⣿⣿⣿⣿⡿⢟⠕⠁⠀⠀⠀
 ⠀⠀⠀⠀⠀⠈⠢⢙⠻⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠟⡩⠐⠁⠀⠀⠀⠀⠀
-⠀⠀⠀⠀⠀⠀⠀⠀⠈⠐⠂⠭⠉⠙⣛⣛⠋⠉⠭⠐⠂⠁⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠈⠐⠂⠭⠉⠙⣛⣛⠋⠉⠭⠐⠂⠁⠀⠀⠀⠀
@@ -15,4 +15,4 @@
      ..:lolc,'.......',cll,.
        ..;cllllccccclllc;'.
          ...',;;;;;;,,...
-                .....
+                .....
@@ -15,4 +15,4 @@
 :=======-              .-========-
 :--------.                :========-
                    ..:::--=========-
-            ..::---================-=-
+            ..::---================-=-
@@ -10,4 +10,4 @@
          :d:.,xcld,.,:.
        ;l,    .l;     ';'
               .o;
-                l,
+                l,
@@ -24,4 +24,4 @@ $5  .;::'        $2 .,:llllllllll,
 $5   .,::;.      $2   .';lllllllll'
 $5     .,::;'..   $2     .';lllllll,.
 $5       ..,;::;,.  $2      ...,;lll:.
-$5          ...''.  $2           ..',;'.
+$5          ...''.  $2           ..',;'.
@@ -15,4 +15,4 @@
     ';'    'kkkkkkkkkkkk.,
             ';kkkkkkkkkk'
               ';kkkkkk'
-                  "''"
+                  "''"
@@ -17,4 +17,4 @@
     oNNs-                    :yMm/
      .+mMdo:`            `:smMd/`
         -ohNNmhsoo++osshmNNh+.
-            `./+syyhhyys+:``
+            `./+syyhhyys+:``
@@ -15,4 +15,4 @@
  `///////${c2}ohmNMMMNNdy+${c1}///////
    `//////////${c2}++${c1}//////////
       `////////////////.
-           -////////-
+           -////////-
@@ -18,4 +18,4 @@
    .=*#%%%%%%%%%%%%%%%%%%%%%%%%#*=.
      :=*##%%%%%%%%%%%%%%%%%%##*=:
        .:=+*##%%%%%%%%%%##*+=:.
-            .:-=++****++=-:.
+            .:-=++****++=-:.
@@ -15,4 +15,4 @@ ${c1}  .:ccccccccllllllllo${c3}O0000000OOO,
 ${c1}    ,:ccccccccclllcd${c3}0000OOOOOOl.
 ${c1}      '::ccccccccc${c3}dOOOOOOOkx:.
 ${c1}        ..,::cccc${c3}xOOOkkko;.
-${c1}            ..,:${c3}dOkxl:.
+${c1}            ..,:${c3}dOkxl:.
@@ -9,4 +9,4 @@
 █████████████████████████
 █████████████████████████
 █████████████████████████
-▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
@@ -4,4 +4,4 @@
 █████
 █████
 ████████████████
-████████████████
+████████████████
@@ -17,4 +17,4 @@ ${c4}GGGGGGGG${c3}WWWWWWWWWWW
 ${c4}GG${c3}WWWWWWWWWWWWWWWW
 WWWWWWWWWWWWWWWW
      WWWWWWWWWW
-          WWW
+          WWW
@@ -17,4 +17,4 @@
     .://:   `///:    :///`   -//:.
       .::   `///:    :///`   -:.
             `///:    :///`
-              `...    ...`
+              `...    ...`
@@ -17,4 +17,4 @@ oNMMMMMMMMMMMNs`  `sy`  `oNMMMMMMMMMMMNo
          +NMMMMMMMMMMMMMMMMNo
           `oNMMMMMMMMMMMMNo`
             `oNMMMNNMMMNs`
-               `omo``oNs`
+               `omo``oNs`
@@ -13,4 +13,4 @@ ${c4} *****${c3},,,,,,,,,,,,,,,,,,,,,,,,,,,,,${c4}*****
    *******${c3}......................${c4}*******
      ******${c3}....${c4}***********************
        ****************************
-         *****
+         *****
@@ -14,4 +14,4 @@ ${c2}/hhddddddddy${c1}-syyyyyys+${c3}ooooo++++++++++++:
 ${c2}/hhhddddddddy${c1}-+yyyy+${c3}/ooooo+++++++++++++:
 ${c2}/hhhhhdddddhhy${c1}./yo:${c3}+oooooo+++++++++++++/
 ${c2}/hhhhhhhhhhhhhy${c1}:-.${c3}+sooooo+++++++++++///:
-${c2}:sssssssssssso++${c1}${c3}`:/:--------.````````
+${c2}:sssssssssssso++${c1}${c3}`:/:--------.````````
@@ -15,4 +15,4 @@ xx$2dx$1kxxOKN$3WMMWN$10xdoxo::c
 $2xOkkO$10oo$3odOW$2WW$1XkdodOxc:l
 $2dkkkxkkk$3OKX$2NNNX0Oxx$1xc:cd
 $2odxxdx$3xllo$2dddooxx$1dc:ldo
-   $2lodd$1dolccc$2ccox$1xoloo
+   $2lodd$1dolccc$2ccox$1xoloo
--- a/Show More
+++ b/Show More