From f65105d181bcceb13963ce5eba94700951855170 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Thu, 4 Mar 2021 20:49:12 +0100
Subject: [PATCH] battery-format

---
 src/common.c             |  1 +
 src/fastfetch.c          | 35 +++++++++++++++++++++++++++++++++--
 src/fastfetch.h          |  1 +
 src/flashfetch.c         |  2 --
 src/modules/battery.c    |  7 +++++++
 src/modules/resolution.c |  2 +-
 src/modules/terminal.c   |  2 +-
 src/util/FFvaluestore.c  |  5 +----
 8 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/common.c b/src/common.c
index bedc91e8f..d1da3c56b 100644
--- a/src/common.c
+++ b/src/common.c
@@ -29,6 +29,7 @@ void ffDefaultConfig(FFconfig* config)
     config->batteryShowTechnology = true;
     config->batteryShowCapacity = true;
     config->batteryShowStatus = true;
+    config->batteryFormat[0] = '\0';
 }
 
 void ffPrintKey(FFconfig* config, const char* key)
diff --git a/src/fastfetch.c b/src/fastfetch.c
index ae4beb3a9..0a6623aa1 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -75,6 +75,7 @@ static void printHelp()
         "   --battery-technology <?value>:   Show the technology of the battery, if possible\n"
         "   --battery-capacity <?value>:     Show the capacity of the battery, if possible\n"
         "   --battery-status <?value>:       Show the status of the battery, if possible\n"
+        "   --battery-formart <format>:      Provide the printf format string for battery output (+)\n"
         "\n"
         "If an value starts with an ?, it is optional. \"true\" will be used if not set.\n"
         "An (+) at the end indicates that more help can be printed with --help <option>\n"
@@ -82,7 +83,7 @@ static void printHelp()
     );
 }
 
-static void printCommandHelpColor()
+static inline void printCommandHelpColor()
 {
     puts(
         "usage: fastfetch --color <color>\n"
@@ -97,10 +98,25 @@ static void printCommandHelpColor()
     );
 }
 
+static inline void printCommandHelpBatteryFormat()
+{
+    puts(
+        "usage fastfetch --battery-format <format>\n"
+        "\n"
+        "<format> is a string of maximum length 32, which is passed to printf as the format string.\n"
+        "The arguments passed to printf are 5 strings in following order:\n"
+        "manufacturer, model, technology, capacity, status\n"
+        "If an value was disabled via battery-* argument, or could not be determined, it will be an zero length string.\n"
+        "The default value is something like \"%s %s (%s) [%s; %s]\"."
+    );
+}
+
 static void printCommandHelp(const char* command)
 {
-    if(strcasecmp(command, "c") == 0 || strcasecmp(command, "-c") == 0 || strcasecmp(command, "color") == 0 || strcasecmp(command, "--color") == 0)
+    if(strcasecmp(command, "c") == 0 || strcasecmp(command, "color") == 0)
         printCommandHelpColor();
+    else if(strcasecmp(command, "battery-format") == 0)
+        printCommandHelpBatteryFormat();
     else
         printf("No specific help for command %s provided\n", command);
 }
@@ -331,6 +347,21 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
         else
             instance->config.batteryShowStatus = parseBoolean(value);
     }
+    else if(strcasecmp(key, "--battery-format") == 0)
+    {
+        if(value == NULL)
+        {
+            printf("Error: usage: %s <format>\n", key);
+            exit(48);
+        }
+        size_t len = strlen(value);
+        if(len > 32)
+        {
+            printf("max battery format string length is 32, %zu given\n", len);
+            exit(49);
+        }
+        strcpy(instance->config.batteryFormat, value);
+    }
     else
     {
         printf("Error: unknown option: %s\n", key);
diff --git a/src/fastfetch.h b/src/fastfetch.h
index 255666227..6885cfb21 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -40,6 +40,7 @@ typedef struct FFconfig
     bool showErrors;
     bool recache;
 
+    char batteryFormat[32];
     bool batteryShowManufacturer;
     bool batteryShowModel;
     bool batteryShowTechnology;
diff --git a/src/flashfetch.c b/src/flashfetch.c
index fc06f8c60..3607a3f17 100644
--- a/src/flashfetch.c
+++ b/src/flashfetch.c
@@ -1,7 +1,5 @@
 #include "fastfetch.h"
 
-#include "string.h"
-
 int main(int argc, char** argv)
 {
     FFinstance instance;
diff --git a/src/modules/battery.c b/src/modules/battery.c
index 846834cc9..074930aaf 100644
--- a/src/modules/battery.c
+++ b/src/modules/battery.c
@@ -65,6 +65,13 @@ static void printBattery(FFinstance* instance, uint8_t index)
 
     ffPrintLogoAndKey(instance, key);
 
+    if(instance->config.batteryFormat[0] != '\0')
+    {
+        printf(instance->config.batteryFormat, manufactor, model, technology, capacity, status);
+        putchar('\n');
+        return;
+    }
+
     if(manufactor[0] != '\0')
         printf("%s ", manufactor);
 
diff --git a/src/modules/resolution.c b/src/modules/resolution.c
index bf36a6578..1d1b5313d 100644
--- a/src/modules/resolution.c
+++ b/src/modules/resolution.c
@@ -3,7 +3,7 @@
 #include "X11/extensions/Xrandr.h"
 #include "dlfcn.h"
 
-short getCurrentRate(Display* display)
+static short getCurrentRate(Display* display)
 {
     void* xrandr = dlopen("libXrandr.so", RTLD_LAZY);
     if(xrandr == NULL)
diff --git a/src/modules/terminal.c b/src/modules/terminal.c
index 3336f6286..4c9261659 100644
--- a/src/modules/terminal.c
+++ b/src/modules/terminal.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-void printTerminalName(FFinstance* instance, const char* pid)
+static void printTerminalName(FFinstance* instance, const char* pid)
 {
     char file[256];
     sprintf(file, "/proc/%s/stat", pid);
diff --git a/src/util/FFvaluestore.c b/src/util/FFvaluestore.c
index de080b20a..8a037a0da 100644
--- a/src/util/FFvaluestore.c
+++ b/src/util/FFvaluestore.c
@@ -24,10 +24,7 @@ void ffValuestoreSet(FFvaluestore* vs, const char* name, const char* value)
 
     if(vs->size == vs->capacity)
     {
-        FFvaluestorePair* pairs = (FFvaluestorePair*) calloc(vs->capacity * 2, sizeof(FFvaluestorePair));
-        memcpy(pairs, vs->pairs, sizeof(FFvaluestorePair) * vs->size);
-        free(vs->pairs);
-        vs->pairs = pairs;
+        vs->pairs = realloc(vs->pairs, vs->capacity * sizeof(FFvaluestorePair) * 2);
         vs->capacity *= 2;
     }