Global: support percent type config in module level

CarterLi · CarterLi · commit c9e3f8d95cb1 · 2024-11-14T13:52:02.000+08:00
diff --git a/src/common/percent.c b/src/common/percent.c
@@ -41,15 +41,18 @@ void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFPercentageModuleConf
     }
     else
     {
-        const char* colorGreen = instance.config.display.percentColorGreen.chars;
-        const char* colorYellow = instance.config.display.percentColorYellow.chars;
-        const char* colorRed = instance.config.display.percentColorRed.chars;
+        const char* colorGreen = options->percentColorGreen.chars;
+        const char* colorYellow = options->percentColorYellow.chars;
+        const char* colorRed = options->percentColorRed.chars;
+
+        FFPercentageTypeFlags percentType = config.type == 0 ? options->percentType : config.type;
+        bool monochrome = !!(percentType & FF_PERCENTAGE_TYPE_BAR_MONOCHROME_BIT);
 
         for (uint32_t i = 0; i < blocksPercent; ++i)
         {
             if(!options->pipe)
             {
-                if (options->percentType & FF_PERCENTAGE_TYPE_BAR_MONOCHROME_BIT)
+                if (monochrome)
                 {
                     const char* color = NULL;
                     if (green <= yellow)
@@ -110,8 +113,9 @@ void ffPercentAppendNum(FFstrbuf* buffer, double percent, FFPercentageModuleConf
     assert(green <= 100 && yellow <= 100);
 
     const FFOptionsDisplay* options = &instance.config.display;
+    FFPercentageTypeFlags percentType = config.type == 0 ? options->percentType : config.type;
 
-    bool colored = !!(options->percentType & FF_PERCENTAGE_TYPE_NUM_COLOR_BIT);
+    bool colored = !!(percentType & FF_PERCENTAGE_TYPE_NUM_COLOR_BIT);
 
     if (parentheses)
         ffStrbufAppendC(buffer, '(');
@@ -187,6 +191,12 @@ bool ffPercentParseCommandOptions(const char* key, const char* subkey, const cha
         return true;
     }
 
+    if (ffStrEqualsIgnCase(subkey, "type"))
+    {
+        config->type = (FFPercentageTypeFlags) ffOptionParseUInt32(key, value);
+        return true;
+    }
+
     return false;
 }
 
@@ -225,6 +235,12 @@ bool ffPercentParseJsonObject(const char* key, yyjson_val* value, FFPercentageMo
         config->yellow = (uint8_t) num;
     }
 
+    yyjson_val* typeVal = yyjson_obj_get(value, "type");
+    if (typeVal)
+    {
+        config->type = (FFPercentageTypeFlags) yyjson_get_int(typeVal);
+    }
+
     return true;
 }
 
@@ -238,4 +254,6 @@ void ffPercentGenerateJsonConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FF
         yyjson_mut_obj_add_uint(doc, percent, "green", config.green);
     if (config.yellow != defaultConfig.yellow)
         yyjson_mut_obj_add_uint(doc, percent, "yellow", config.yellow);
+    if (config.type != defaultConfig.type)
+        yyjson_mut_obj_add_uint(doc, percent, "type", config.type);
 }
diff --git a/src/common/percent.h b/src/common/percent.h
@@ -20,6 +20,7 @@ typedef struct FFPercentageModuleConfig
 {
     uint8_t green;
     uint8_t yellow;
+    FFPercentageTypeFlags type;
 } FFPercentageModuleConfig;
 
 // if (green <= yellow)
diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c
@@ -39,24 +39,26 @@ static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uin
     timeRemaining /= 24;
     uint32_t days = timeRemaining;
 
+    FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
+
     if(options->moduleArgs.outputFormat.length == 0)
     {
         ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
 
         FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
         bool showStatus =
-            !(instance.config.display.percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT) &&
+            !(percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT) &&
             result->status.length > 0 &&
             ffStrbufIgnCaseCompS(&result->status, "Unknown") != 0;
 
         if(result->capacity >= 0)
         {
-            if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
+            if(percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
             {
                 ffPercentAppendBar(&str, result->capacity, options->percent, &options->moduleArgs);
             }
 
-            if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
+            if(percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
             {
                 if(str.length > 0)
                     ffStrbufAppendC(&str, ' ');
@@ -301,7 +303,7 @@ void ffInitBatteryOptions(FFBatteryOptions* options)
     ffOptionInitModuleArg(&options->moduleArgs, "");
     options->temp = false;
     options->tempConfig = (FFColorRangeConfig) { 60, 80 };
-    options->percent = (FFPercentageModuleConfig) { 50, 20 };
+    options->percent = (FFPercentageModuleConfig) { 50, 20, 0 };
 
     #ifdef _WIN32
         options->useSetupApi = false;
diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c
@@ -13,9 +13,20 @@ static void printDevice(FFBluetoothOptions* options, const FFBluetoothResult* de
     {
         ffPrintLogoAndKey(FF_BLUETOOTH_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
 
-        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreateCopy(&device->name);
+        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+        bool showBatteryLevel = device->battery > 0 && device->battery <= 100;
+        FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
 
-        if (device->battery > 0 && device->battery <= 100)
+        if (showBatteryLevel && (percentType & FF_PERCENTAGE_TYPE_BAR_BIT))
+        {
+            ffPercentAppendBar(&buffer, device->battery, options->percent, &options->moduleArgs);
+            ffStrbufAppendC(&buffer, ' ');
+        }
+
+        if (!(percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
+            ffStrbufAppend(&buffer, &device->name);
+
+        if (showBatteryLevel && (percentType & FF_PERCENTAGE_TYPE_NUM_BIT))
         {
             if (buffer.length)
                 ffStrbufAppendC(&buffer, ' ');
@@ -202,7 +213,7 @@ void ffInitBluetoothOptions(FFBluetoothOptions* options)
     );
     ffOptionInitModuleArg(&options->moduleArgs, "");
     options->showDisconnected = false;
-    options->percent = (FFPercentageModuleConfig) { 50, 20 };
+    options->percent = (FFPercentageModuleConfig) { 50, 20, 0 };
 }
 
 void ffDestroyBluetoothOptions(FFBluetoothOptions* options)
diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c
@@ -25,6 +25,8 @@ void ffPrintBrightness(FFBrightnessOptions* options)
         return;
     }
 
+    FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
+
     if (options->compact)
     {
         FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
@@ -48,7 +50,7 @@ void ffPrintBrightness(FFBrightnessOptions* options)
     uint32_t index = 0;
     FF_LIST_FOR_EACH(FFBrightnessResult, item, result)
     {
-        if(options->moduleArgs.key.length == 0)
+        if (options->moduleArgs.key.length == 0)
         {
             ffStrbufAppendF(&key, "%s (%s)", FF_BRIGHTNESS_MODULE_NAME, item->name.chars);
         }
@@ -64,17 +66,17 @@ void ffPrintBrightness(FFBrightnessOptions* options)
 
         const double percent = (item->current - item->min) / (item->max - item->min) * 100;
 
-        if(options->moduleArgs.outputFormat.length == 0)
+        if (options->moduleArgs.outputFormat.length == 0)
         {
             FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
             ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
 
-            if (instance.config.display.percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
+            if (percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
             {
                 ffPercentAppendBar(&str, percent, options->percent, &options->moduleArgs);
             }
 
-            if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
+            if (percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
             {
                 if(str.length > 0)
                     ffStrbufAppendC(&str, ' ');
@@ -237,7 +239,7 @@ void ffInitBrightnessOptions(FFBrightnessOptions* options)
     ffOptionInitModuleArg(&options->moduleArgs, "󰯪");
 
     options->ddcciSleep = 10;
-    options->percent = (FFPercentageModuleConfig) { 100, 100 };
+    options->percent = (FFPercentageModuleConfig) { 100, 100, 0 };
     options->compact = false;
 }
 
diff --git a/src/modules/btrfs/btrfs.c b/src/modules/btrfs/btrfs.c
@@ -245,7 +245,7 @@ void ffInitBtrfsOptions(FFBtrfsOptions* options)
         ffGenerateBtrfsJsonConfig
     );
     ffOptionInitModuleArg(&options->moduleArgs, "󱑛");
-    options->percent = (FFPercentageModuleConfig) { 50, 80 };
+    options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };
 }
 
 void ffDestroyBtrfsOptions(FFBtrfsOptions* options)
diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c
@@ -44,16 +44,18 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options)
     }
     double avgValue = sumValue / (double) valueCount;
 
+    FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
+
     if(options->moduleArgs.outputFormat.length == 0)
     {
         ffPrintLogoAndKey(FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
 
         FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
         if (!options->separate)
         {
-            if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
+            if(percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
                 ffPercentAppendBar(&str, avgValue, options->percent, &options->moduleArgs);
-            if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
+            if(percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
             {
                 if(str.length > 0)
                     ffStrbufAppendC(&str, ' ');
@@ -214,7 +216,7 @@ void ffInitCPUUsageOptions(FFCPUUsageOptions* options)
     );
     ffOptionInitModuleArg(&options->moduleArgs, "󰓅");
     options->separate = false;
-    options->percent = (FFPercentageModuleConfig) { 50, 80 };
+    options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };
     options->waitTime = 200;
 }
 
diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c
@@ -51,6 +51,7 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index
     ffParseSize(disk->bytesTotal, &totalPretty);
 
     double bytesPercentage = disk->bytesTotal > 0 ? (double) disk->bytesUsed / (double) disk->bytesTotal * 100.0 : 0;
+    FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
 
     if(options->moduleArgs.outputFormat.length == 0)
     {
@@ -60,16 +61,16 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index
 
         if(disk->bytesTotal > 0)
         {
-            if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
+            if(percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
             {
                 ffPercentAppendBar(&str, bytesPercentage, options->percent, &options->moduleArgs);
                 ffStrbufAppendC(&str, ' ');
             }
 
-            if(!(instance.config.display.percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
+            if(!(percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
                 ffStrbufAppendF(&str, "%s / %s ", usedPretty.chars, totalPretty.chars);
 
-            if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
+            if(percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
             {
                 ffPercentAppendNum(&str, bytesPercentage, options->percent, str.length > 0, &options->moduleArgs);
                 ffStrbufAppendC(&str, ' ');
@@ -78,7 +79,7 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index
         else
             ffStrbufAppendS(&str, "Unknown ");
 
-        if(!(instance.config.display.percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
+        if(!(percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
         {
             if(disk->filesystem.length)
                 ffStrbufAppendF(&str, "- %s ", disk->filesystem.chars);
@@ -473,7 +474,7 @@ void ffInitDiskOptions(FFDiskOptions* options)
     ffStrbufInit(&options->folders);
     options->showTypes = FF_DISK_VOLUME_TYPE_REGULAR_BIT | FF_DISK_VOLUME_TYPE_EXTERNAL_BIT | FF_DISK_VOLUME_TYPE_READONLY_BIT;
     options->calcType = FF_DISK_CALC_TYPE_FREE;
-    options->percent = (FFPercentageModuleConfig) { 50, 80 };
+    options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };
 }
 
 void ffDestroyDiskOptions(FFDiskOptions* options)
diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c
@@ -13,9 +13,20 @@ static void printDevice(FFGamepadOptions* options, const FFGamepadDevice* device
     {
         ffPrintLogoAndKey(FF_GAMEPAD_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
 
-        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreateCopy(&device->name);
+        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+        bool showBatteryLevel = device->battery > 0 && device->battery <= 100;
+        FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
 
-        if (device->battery > 0 && device->battery <= 100)
+        if (showBatteryLevel && (percentType & FF_PERCENTAGE_TYPE_BAR_BIT))
+        {
+            ffPercentAppendBar(&buffer, device->battery, options->percent, &options->moduleArgs);
+            ffStrbufAppendC(&buffer, ' ');
+        }
+
+        if (!(percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
+            ffStrbufAppend(&buffer, &device->name);
+
+        if (showBatteryLevel && (percentType & FF_PERCENTAGE_TYPE_NUM_BIT))
         {
             if (buffer.length)
                 ffStrbufAppendC(&buffer, ' ');
@@ -160,7 +171,7 @@ void ffInitGamepadOptions(FFGamepadOptions* options)
         ffGenerateGamepadJsonConfig
     );
     ffOptionInitModuleArg(&options->moduleArgs, "󰺵");
-    options->percent = (FFPercentageModuleConfig) { 50, 20 };
+    options->percent = (FFPercentageModuleConfig) { 50, 20, 0 };
 }
 
 void ffDestroyGamepadOptions(FFGamepadOptions* options)
diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c
@@ -439,7 +439,7 @@ void ffInitGPUOptions(FFGPUOptions* options)
     options->temp = false;
     options->hideType = FF_GPU_TYPE_UNKNOWN;
     options->tempConfig = (FFColorRangeConfig) { 60, 80 };
-    options->percent = (FFPercentageModuleConfig) { 50, 80 };
+    options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };
 }
 
 void ffDestroyGPUOptions(FFGPUOptions* options)
diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c
@@ -59,18 +59,19 @@ void ffPrintLoadavg(FFLoadavgOptions* options)
 
                 ffStrbufClear(&buffer);
                 double percent = result[index] * 100 / cpu.coresOnline;
+                FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
 
-                if (instance.config.display.percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
+                if (percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
                     ffPercentAppendBar(&buffer, percent, options->percent, &options->moduleArgs);
 
-                if (!(instance.config.display.percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
+                if (!(percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
                 {
                     if (buffer.length > 0)
                         ffStrbufAppendC(&buffer, ' ');
                     ffStrbufAppendF(&buffer, "%.*f", options->ndigits, result[index]);
                 }
 
-                if (instance.config.display.percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
+                if (percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
                 {
                     if (buffer.length > 0)
                         ffStrbufAppendC(&buffer, ' ');
@@ -204,7 +205,7 @@ void ffInitLoadavgOptions(FFLoadavgOptions* options)
     );
     ffOptionInitModuleArg(&options->moduleArgs, "");
 
-    options->percent = (FFPercentageModuleConfig) { 50, 80 };
+    options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };
     options->ndigits = 2;
     options->compact = true;
 }
diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c
@@ -37,17 +37,18 @@ void ffPrintMemory(FFMemoryOptions* options)
         else
         {
             FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
+            FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
 
-            if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
+            if(percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
             {
                 ffPercentAppendBar(&str, percentage, options->percent, &options->moduleArgs);
                 ffStrbufAppendC(&str, ' ');
             }
 
-            if(!(instance.config.display.percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
+            if(!(percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
                 ffStrbufAppendF(&str, "%s / %s ", usedPretty.chars, totalPretty.chars);
 
-            if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
+            if(percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
                 ffPercentAppendNum(&str, percentage, options->percent, str.length > 0, &options->moduleArgs);
 
             ffStrbufTrimRight(&str, ' ');
@@ -152,7 +153,7 @@ void ffInitMemoryOptions(FFMemoryOptions* options)
         ffGenerateMemoryJsonConfig
     );
     ffOptionInitModuleArg(&options->moduleArgs, "");
-    options->percent = (FFPercentageModuleConfig) { 50, 80 };
+    options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };
 }
 
 void ffDestroyMemoryOptions(FFMemoryOptions* options)
diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c
diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c
diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c
diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ typedef struct FFPercentageModuleConfig`
`20`	`20`	`{`
`21`	`21`	`uint8_t green;`
`22`	`22`	`uint8_t yellow;`
	`23`	`+ FFPercentageTypeFlags type;`
`23`	`24`	`} FFPercentageModuleConfig;`
`24`	`25`
`25`	`26`	`// if (green <= yellow)`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ void ffPrintBrightness(FFBrightnessOptions* options)`
`25`	`25`	`return;`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;`
	`29`	`+`
`28`	`30`	`if (options->compact)`
`29`	`31`	`{`
`30`	`32`	`FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();`
`@@ -48,7 +50,7 @@ void ffPrintBrightness(FFBrightnessOptions* options)`
`48`	`50`	`uint32_t index = 0;`
`49`	`51`	`FF_LIST_FOR_EACH(FFBrightnessResult, item, result)`
`50`	`52`	`{`
`51`		`- if(options->moduleArgs.key.length == 0)`
	`53`	`+ if (options->moduleArgs.key.length == 0)`
`52`	`54`	`{`
`53`	`55`	`ffStrbufAppendF(&key, "%s (%s)", FF_BRIGHTNESS_MODULE_NAME, item->name.chars);`
`54`	`56`	`}`
`@@ -64,17 +66,17 @@ void ffPrintBrightness(FFBrightnessOptions* options)`
`64`	`66`
`65`	`67`	`const double percent = (item->current - item->min) / (item->max - item->min) * 100;`
`66`	`68`
`67`		`- if(options->moduleArgs.outputFormat.length == 0)`
	`69`	`+ if (options->moduleArgs.outputFormat.length == 0)`
`68`	`70`	`{`
`69`	`71`	`FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();`
`70`	`72`	`ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);`
`71`	`73`
`72`		`- if (instance.config.display.percentType & FF_PERCENTAGE_TYPE_BAR_BIT)`
	`74`	`+ if (percentType & FF_PERCENTAGE_TYPE_BAR_BIT)`
`73`	`75`	`{`
`74`	`76`	`ffPercentAppendBar(&str, percent, options->percent, &options->moduleArgs);`
`75`	`77`	`}`
`76`	`78`
`77`		`- if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_NUM_BIT)`
	`79`	`+ if (percentType & FF_PERCENTAGE_TYPE_NUM_BIT)`
`78`	`80`	`{`
`79`	`81`	`if(str.length > 0)`
`80`	`82`	`ffStrbufAppendC(&str, ' ');`
`@@ -237,7 +239,7 @@ void ffInitBrightnessOptions(FFBrightnessOptions* options)`
`237`	`239`	`ffOptionInitModuleArg(&options->moduleArgs, "󰯪");`
`238`	`240`
`239`	`241`	`options->ddcciSleep = 10;`
`240`		`- options->percent = (FFPercentageModuleConfig) { 100, 100 };`
	`242`	`+ options->percent = (FFPercentageModuleConfig) { 100, 100, 0 };`
`241`	`243`	`options->compact = false;`
`242`	`244`	`}`
`243`	`245`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ void ffInitBtrfsOptions(FFBtrfsOptions* options)`
`245`	`245`	`ffGenerateBtrfsJsonConfig`
`246`	`246`	`);`
`247`	`247`	`ffOptionInitModuleArg(&options->moduleArgs, "󱑛");`
`248`		`- options->percent = (FFPercentageModuleConfig) { 50, 80 };`
	`248`	`+ options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`void ffDestroyBtrfsOptions(FFBtrfsOptions* options)`
Original file line number	Diff line number	Diff line change
`@@ -44,16 +44,18 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options)`
`44`	`44`	`}`
`45`	`45`	`double avgValue = sumValue / (double) valueCount;`
`46`	`46`
	`47`	`+ FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;`
	`48`	`+`
`47`	`49`	`if(options->moduleArgs.outputFormat.length == 0)`
`48`	`50`	`{`
`49`	`51`	`ffPrintLogoAndKey(FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);`
`50`	`52`
`51`	`53`	`FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();`
`52`	`54`	`if (!options->separate)`
`53`	`55`	`{`
`54`		`- if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_BAR_BIT)`
	`56`	`+ if(percentType & FF_PERCENTAGE_TYPE_BAR_BIT)`
`55`	`57`	`ffPercentAppendBar(&str, avgValue, options->percent, &options->moduleArgs);`
`56`		`- if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_NUM_BIT)`
	`58`	`+ if(percentType & FF_PERCENTAGE_TYPE_NUM_BIT)`
`57`	`59`	`{`
`58`	`60`	`if(str.length > 0)`
`59`	`61`	`ffStrbufAppendC(&str, ' ');`
`@@ -214,7 +216,7 @@ void ffInitCPUUsageOptions(FFCPUUsageOptions* options)`
`214`	`216`	`);`
`215`	`217`	`ffOptionInitModuleArg(&options->moduleArgs, "󰓅");`
`216`	`218`	`options->separate = false;`
`217`		`- options->percent = (FFPercentageModuleConfig) { 50, 80 };`
	`219`	`+ options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };`
`218`	`220`	`options->waitTime = 200;`
`219`	`221`	`}`
`220`	`222`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index`
`51`	`51`	`ffParseSize(disk->bytesTotal, &totalPretty);`
`52`	`52`
`53`	`53`	`double bytesPercentage = disk->bytesTotal > 0 ? (double) disk->bytesUsed / (double) disk->bytesTotal * 100.0 : 0;`
	`54`	`+ FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;`
`54`	`55`
`55`	`56`	`if(options->moduleArgs.outputFormat.length == 0)`
`56`	`57`	`{`
`@@ -60,16 +61,16 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index`
`60`	`61`
`61`	`62`	`if(disk->bytesTotal > 0)`
`62`	`63`	`{`
`63`		`- if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_BAR_BIT)`
	`64`	`+ if(percentType & FF_PERCENTAGE_TYPE_BAR_BIT)`
`64`	`65`	`{`
`65`	`66`	`ffPercentAppendBar(&str, bytesPercentage, options->percent, &options->moduleArgs);`
`66`	`67`	`ffStrbufAppendC(&str, ' ');`
`67`	`68`	`}`
`68`	`69`
`69`		`- if(!(instance.config.display.percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))`
	`70`	`+ if(!(percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))`
`70`	`71`	`ffStrbufAppendF(&str, "%s / %s ", usedPretty.chars, totalPretty.chars);`
`71`	`72`
`72`		`- if(instance.config.display.percentType & FF_PERCENTAGE_TYPE_NUM_BIT)`
	`73`	`+ if(percentType & FF_PERCENTAGE_TYPE_NUM_BIT)`
`73`	`74`	`{`
`74`	`75`	`ffPercentAppendNum(&str, bytesPercentage, options->percent, str.length > 0, &options->moduleArgs);`
`75`	`76`	`ffStrbufAppendC(&str, ' ');`
`@@ -78,7 +79,7 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index`
`78`	`79`	`else`
`79`	`80`	`ffStrbufAppendS(&str, "Unknown ");`
`80`	`81`
`81`		`- if(!(instance.config.display.percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))`
	`82`	`+ if(!(percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))`
`82`	`83`	`{`
`83`	`84`	`if(disk->filesystem.length)`
`84`	`85`	`ffStrbufAppendF(&str, "- %s ", disk->filesystem.chars);`
`@@ -473,7 +474,7 @@ void ffInitDiskOptions(FFDiskOptions* options)`
`473`	`474`	`ffStrbufInit(&options->folders);`
`474`	`475`	`options->showTypes = FF_DISK_VOLUME_TYPE_REGULAR_BIT \| FF_DISK_VOLUME_TYPE_EXTERNAL_BIT \| FF_DISK_VOLUME_TYPE_READONLY_BIT;`
`475`	`476`	`options->calcType = FF_DISK_CALC_TYPE_FREE;`
`476`		`- options->percent = (FFPercentageModuleConfig) { 50, 80 };`
	`477`	`+ options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };`
`477`	`478`	`}`
`478`	`479`
`479`	`480`	`void ffDestroyDiskOptions(FFDiskOptions* options)`
Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ void ffInitGPUOptions(FFGPUOptions* options)`
`439`	`439`	`options->temp = false;`
`440`	`440`	`options->hideType = FF_GPU_TYPE_UNKNOWN;`
`441`	`441`	`options->tempConfig = (FFColorRangeConfig) { 60, 80 };`
`442`		`- options->percent = (FFPercentageModuleConfig) { 50, 80 };`
	`442`	`+ options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`void ffDestroyGPUOptions(FFGPUOptions* options)`