Merge pull request #258 from CarterLi/master

[macOS] support Temps, Font; Host pretty print; other improvements

Author: LinusDierheimer

CMakeLists.txt

@@ -193,7 +193,6 @@ set(LIBFASTFETCH_SRC
     src/detection/terminalShell.c
     src/detection/vulkan.c
     src/detection/datetime.c
-    src/detection/temps.c
     src/detection/title.c
     src/detection/host/host.c
     src/detection/os/os.c
@@ -243,6 +242,7 @@ set(LIBFASTFETCH_SRC
     src/modules/colors.c
     src/modules/opengl.c
     src/modules/opencl.c
+    src/modules/users.c
 )
 
 if(BSD OR APPLE)
@@ -262,6 +262,8 @@ if(LINUX OR ANDROID OR BSD)
     list(APPEND LIBFASTFETCH_SRC
         src/detection/cpuUsage/cpuUsage_linux.c
         src/detection/disk/disk_linux.c
+        src/detection/poweradapter/poweradapter_linux.c
+        src/detection/temps/temps_linux.c
     )
 endif()
 
@@ -271,7 +273,6 @@ if(LINUX OR BSD)
         src/detection/os/os_linux.c
         src/detection/gpu/gpu_linux.c
         src/detection/battery/battery_linux.c
-        src/detection/poweradapter/poweradapter_linux.c
         src/detection/displayserver/linux/displayserver_linux.c
         src/detection/displayserver/linux/wayland.c
         src/detection/displayserver/linux/xcb.c
@@ -280,6 +281,7 @@ if(LINUX OR BSD)
         src/detection/terminalfont/terminalfont_linux.c
         src/detection/media/media_linux.c
         src/detection/wmtheme/wmtheme_linux.c
+        src/detection/font/font_linux.c
     )
 endif()
 
@@ -300,6 +302,8 @@ if(APPLE)
         src/detection/media/media_apple.m
         src/detection/disk/disk_apple.m
         src/detection/wmtheme/wmtheme_apple.c
+        src/detection/temps/temps_apple.c
+        src/detection/font/font_apple.m
     )
 endif()
 
@@ -320,6 +324,7 @@ if(ANDROID)
         src/detection/terminalfont/terminalfont_android.c
         src/detection/media/media_android.c
         src/detection/wmtheme/wmtheme_android.c
+        src/detection/font/font_android.c
     )
 endif()
 

completions/bash

@@ -177,9 +177,14 @@ __fastfetch_completion()
         "--allow-slow-operations"
         "--disable-linewrap"
         "--hide-cursor"
+        "--cpu-temp"
+        "--gpu-temp"
+        "--battery-temp"
+        "--font-inline"
         "--localip-show-ipv4"
         "--localip-show-ipv6"
         "--localip-show-loop"
+        "--localip-name-prefix"
         "--escape-bedrock"
         "--pipe"
         "--title-fqdn"

presets/all

@@ -1 +1 @@
---structure Title:Separator:OS:Host:Kernel:Uptime:Processes:Packages:Shell:Resolution:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Swap:Disk:Battery:PowerAdapter:Player:Song:PublicIP:LocalIP:DateTime:Locale:Vulkan:OpenGL:OpenCL:Break:Colors
+--structure Title:Separator:OS:Host:Kernel:Uptime:Processes:Packages:Shell:Resolution:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Swap:Disk:Battery:PowerAdapter:Player:Song:PublicIP:LocalIP:DateTime:Locale:Vulkan:OpenGL:OpenCL:Users:Break:Colors

presets/verbose

@@ -11,7 +11,7 @@
 --wm-theme-format Name: {}
 --theme-format Plasma: {}; Plasma colors: {}; Plasma colors pretty: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}
 --icons-format Plasma: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}
---font-format Plasma raw: {}; Plasma name: {}; Plasma size: {}; Plasma styles: {}; Plasma pretty: {}; GTK2 raw: {}; GTK2 name: {}; GTK2 size: {}; GTK2 styles: {}; GTK2 pretty: {}; GTK3 raw: {}; GTK3 name: {}; GTK3 size: {}; GTK3 styles: {}; GTK3 pretty: {}; GTK4 raw: {}; GTK4 name: {}; GTK4 size: {}; GTK4 styles: {}; GTK4 pretty: {}; GTK: {}
+--font-format Type: {}; Font: {}
 --cursor-format Theme: {}; Size: {}
 --terminal-format Process: {}; Path: {}; Exe: {}
 --terminal-font-format Pretty: {}; Name: {}; Size: {}; Styles: {}

src/common/init.c

@@ -220,6 +220,10 @@ static void defaultConfig(FFinstance* instance)
     ffStrbufInitA(&instance->config.libplist, 0);
     ffStrbufInitA(&instance->config.libcJSON, 0);
 
+    instance->config.cpuTemp = false;
+    instance->config.gpuTemp = false;
+    instance->config.batteryTemp = false;
+
     instance->config.titleFQDN = false;
 
     ffStrbufInitA(&instance->config.diskFolders, 0);
@@ -229,9 +233,12 @@ static void defaultConfig(FFinstance* instance)
 
     ffStrbufInitA(&instance->config.separatorString, 0);
 
+    instance->config.fontInline = true;
+
     instance->config.localIpShowIpV4 = true;
     instance->config.localIpShowIpV6 = false;
     instance->config.localIpShowLoop = false;
+    ffStrbufInit(&instance->config.localIpNamePrefix);
 
     instance->config.publicIpTimeout = 0;
 

src/data/help.txt

@@ -94,9 +94,14 @@ Module specific options:
     --disk-folders <folders>:     A colon separated list of folder paths for the disk output. Default is "/:/home"
     --disk-removable <?value>:    Sets if removable volume should be printed. Default is false
     --battery-dir <folder>:       The directory where the battery folders are. Standard: /sys/class/power_supply/
+    --cpu-temp  <?value>:         Detect and display CPU temperature if supported. Default is false
+    --gpu-temp  <?value>:         Detect and display GPU temperature if supported. Default is false
+    --battery-temp  <?value>:     Detect and display Battery temperature if supported. Default is false
+    --font-inline <?value>:       Display fonts of different DE in one line
     --localip-show-ipv4 <?value>: Show ipv4 addresses in local ip module. Default is true
     --localip-show-ipv6 <?value>: Show ipv6 addresses in local ip module. Default is false
     --localip-show-loop <?value>: Show loop back addresses (127.0.0.1) in local ip module. Default is false
+    --localip-name-prefix <str>:  Show ips with given name prefix only. Default is empty
     --public-ip-timeout:          Time in milliseconds to wait for the public ip server to respond. Default is disabled (0)
     --player-name:                The name of the player to use
     --gl <value>:                 Sets the opengl context creation library to use. Must be auto, egl, glx or osmesa. Default is auto

src/detection/battery/battery.h

@@ -5,13 +5,16 @@
 
 #include "fastfetch.h"
 
+#define FF_BATTERY_TEMP_UNSET (0/0.0)
+
 typedef struct BatteryResult
 {
     FFstrbuf manufacturer;
     FFstrbuf modelName;
     FFstrbuf technology;
     FFstrbuf capacity;
     FFstrbuf status;
+    double temperature;
 } BatteryResult;
 
 const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results);

src/detection/battery/battery_apple.c

@@ -1,9 +1,34 @@
 #include "fastfetch.h"
 #include "battery.h"
 #include "util/apple/cf_helpers.h"
+#include "detection/temps/temps_apple.h"
 
 #include <IOKit/IOKitLib.h>
 
+static double detectBatteryTemp()
+{
+    FFlist temps;
+    ffListInit(&temps, sizeof(FFTempValue));
+
+    ffDetectCoreTemps(FF_TEMP_BATTERY, &temps);
+
+    if(temps.length == 0)
+        return FF_BATTERY_TEMP_UNSET;
+
+    double result = 0;
+    for(uint32_t i = 0; i < temps.length; ++i)
+    {
+        FFTempValue* tempValue = (FFTempValue*)ffListGet(&temps, i);
+        result += tempValue->value;
+        //TODO: do we really need this?
+        ffStrbufDestroy(&tempValue->name);
+        ffStrbufDestroy(&tempValue->deviceClass);
+    }
+    result /= temps.length;
+    ffListDestroy(&temps);
+    return result;
+}
+
 const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results)
 {
     FF_UNUSED(instance);
@@ -69,6 +94,11 @@ const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results)
         else
             ffStrbufAppendS(&battery->status, "");
 
+        if(instance->config.batteryTemp)
+            battery->temperature = detectBatteryTemp();
+        else
+            battery->temperature = FF_BATTERY_TEMP_UNSET;
+
         CFRelease(properties);
         IOObjectRelease(registryEntry);
     }

src/detection/battery/battery_linux.c

@@ -70,6 +70,8 @@ static void parseBattery(FFstrbuf* dir, FFlist* results)
     ffStrbufAppendS(dir, "/status");
     ffReadFileBuffer(dir->chars, &result->status);
     ffStrbufSubstrBefore(dir, dirLength);
+
+    result->temperature = FF_BATTERY_TEMP_UNSET;
 }
 
 const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results) {

src/detection/cpu/cpu_apple.c

@@ -1,5 +1,6 @@
 #include "cpu.h"
 #include "common/sysctl.h"
+#include "detection/temps/temps_apple.h"
 
 static double getFrequency(const char* propName)
 {
@@ -12,33 +13,64 @@ static double getFrequency(const char* propName)
     return herz / 1000.0; //to GHz
 }
 
+static double detectCpuTemp(const FFstrbuf* cpuName)
+{
+    FFlist temps;
+    ffListInit(&temps, sizeof(FFTempValue));
+
+    if(ffStrbufStartsWithS(cpuName, "Apple M1"))
+        ffDetectCoreTemps(FF_TEMP_CPU_M1X, &temps);
+    else if(ffStrbufStartsWithS(cpuName, "Apple M2"))
+        ffDetectCoreTemps(FF_TEMP_CPU_M2X, &temps);
+    else //TODO: PPC?
+        ffDetectCoreTemps(FF_TEMP_CPU_X64, &temps);
+
+    if(temps.length == 0)
+        return FF_CPU_TEMP_UNSET;
+
+    double result = 0;
+    for(uint32_t i = 0; i < temps.length; ++i)
+    {
+        FFTempValue* tempValue = (FFTempValue*)ffListGet(&temps, i);
+        result += tempValue->value;
+        //TODO: do we really need this?
+        ffStrbufDestroy(&tempValue->name);
+        ffStrbufDestroy(&tempValue->deviceClass);
+    }
+    result /= temps.length;
+    ffListDestroy(&temps);
+    return result;
+}
+
 void ffDetectCPUImpl(const FFinstance* instance, FFCPUResult* cpu, bool cached)
 {
     FF_UNUSED(instance);
 
-    //TODO find a way to detect this
-    cpu->temperature = FF_CPU_TEMP_UNSET;
-
-    if(cached)
-        return;
+    if(!cached)
+    {
+        ffSysctlGetString("machdep.cpu.brand_string", &cpu->name);
+        ffSysctlGetString("machdep.cpu.vendor", &cpu->vendor);
 
-    ffSysctlGetString("machdep.cpu.brand_string", &cpu->name);
-    ffSysctlGetString("machdep.cpu.vendor", &cpu->vendor);
+        cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.physicalcpu_max", 1);
+        if(cpu->coresPhysical == 1)
+            cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.physicalcpu", 1);
 
-    cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.physicalcpu_max", 1);
-    if(cpu->coresPhysical == 1)
-        cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.physicalcpu", 1);
+        cpu->coresLogical = (uint16_t) ffSysctlGetInt("hw.logicalcpu_max", 1);
+        if(cpu->coresLogical == 1)
+            cpu->coresLogical = (uint16_t) ffSysctlGetInt("hw.ncpu", 1);
 
-    cpu->coresLogical = (uint16_t) ffSysctlGetInt("hw.logicalcpu_max", 1);
-    if(cpu->coresLogical == 1)
-        cpu->coresLogical = (uint16_t) ffSysctlGetInt("hw.ncpu", 1);
+        cpu->coresOnline = (uint16_t) ffSysctlGetInt("hw.logicalcpu", 1);
+        if(cpu->coresOnline == 1)
+            cpu->coresOnline = (uint16_t) ffSysctlGetInt("hw.activecpu", 1);
 
-    cpu->coresOnline = (uint16_t) ffSysctlGetInt("hw.logicalcpu", 1);
-    if(cpu->coresOnline == 1)
-        cpu->coresOnline = (uint16_t) ffSysctlGetInt("hw.activecpu", 1);
+        cpu->frequencyMin = getFrequency("hw.cpufrequency_min");
+        cpu->frequencyMax = getFrequency("hw.cpufrequency_max");
+        if(cpu->frequencyMax == 0.0)
+            cpu->frequencyMax = getFrequency("hw.cpufrequency");
+    }
 
-    cpu->frequencyMin = getFrequency("hw.cpufrequency_min");
-    cpu->frequencyMax = getFrequency("hw.cpufrequency_max");
-    if(cpu->frequencyMax == 0.0)
-        cpu->frequencyMax = getFrequency("hw.cpufrequency");
+    if (instance->config.cpuTemp)
+        cpu->temperature = detectCpuTemp(&cpu->name);
+    else
+        cpu->temperature = FF_CPU_TEMP_UNSET;
 }