minor refactoring

src/fastfetch.c

@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "fastfetch_config.h"
 
-#include <string.h>
+
 
 static void printHelp()
 {

src/fastfetch.h

@@ -8,6 +8,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -76,27 +77,28 @@ void ffPrintLogos(bool color);
 #endif
 
 //Module functions
-void ffPrintBreak(FFinstance* state);
-void ffPrintTitle(FFinstance* state);
-void ffPrintSeperator(FFinstance* state);
-void ffPrintOS(FFinstance* state);
-void ffPrintHost(FFinstance* state);
-void ffPrintKernel(FFinstance* state);
-void ffPrintUptime(FFinstance* state);
-void ffPrintPackages(FFinstance* state);
-void ffPrintShell(FFinstance* state);
-void ffPrintResolution(FFinstance* state);
-void ffPrintDesktopEnvironment(FFinstance* state);
-void ffPrintTheme(FFinstance* state);
-void ffPrintIcons(FFinstance* state);
-void ffPrintFont(FFinstance* state);
-void ffPrintTerminal(FFinstance* state);
-void ffPrintCPU(FFinstance* state);
-void ffPrintGPU(FFinstance* state);
-void ffPrintMemory(FFinstance* state);
-void ffPrintDisk(FFinstance* state);
-void ffPrintBattery(FFinstance* state);
-void ffPrintLocale(FFinstance* state);
-void ffPrintColors(FFinstance* state);
+void ffPrintCustom(FFinstance* instance, const char* key, const char* value);
+void ffPrintBreak(FFinstance* instance);
+void ffPrintTitle(FFinstance* instance);
+void ffPrintSeperator(FFinstance* instance);
+void ffPrintOS(FFinstance* instance);
+void ffPrintHost(FFinstance* instance);
+void ffPrintKernel(FFinstance* instance);
+void ffPrintUptime(FFinstance* instance);
+void ffPrintPackages(FFinstance* instance);
+void ffPrintShell(FFinstance* instance);
+void ffPrintResolution(FFinstance* instance);
+void ffPrintDesktopEnvironment(FFinstance* instance);
+void ffPrintTheme(FFinstance* instance);
+void ffPrintIcons(FFinstance* instance);
+void ffPrintFont(FFinstance* instance);
+void ffPrintTerminal(FFinstance* instance);
+void ffPrintCPU(FFinstance* instance);
+void ffPrintGPU(FFinstance* instance);
+void ffPrintMemory(FFinstance* instance);
+void ffPrintDisk(FFinstance* instance);
+void ffPrintBattery(FFinstance* instance);
+void ffPrintLocale(FFinstance* instance);
+void ffPrintColors(FFinstance* instance);
 
 #endif

src/flashfetch.c

@@ -1,10 +1,14 @@
 #include "fastfetch.h"
 
+#include "string.h"
+
 int main(int argc, char** argv)
 {
     FFinstance instance;
     ffInitState(&instance.state);
 
+    //Configuration
+
     instance.config.logo_seperator = 4;
     instance.config.offsetx = 0;
     instance.config.titleLength = 20; // This is overwritten by ffPrintTitle
@@ -12,6 +16,7 @@ int main(int argc, char** argv)
     instance.config.showErrors = false;
     instance.config.recache = false;
     ffLoadLogoSet(&instance.config, "arch");
+    strcpy(instance.config.color, instance.config.logo.color); //Use the primary color of the logo as key color
 
     //Printing
 

src/logo.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
+
 
 static void loadUnknownLogo(FFlogo* logo)
 {

src/modules/custom.c

@@ -0,0 +1,7 @@
+#include "fastfetch.h"
+
+void ffPrintCustom(FFinstance* instance, const char* key, const char* value)
+{
+    ffPrintLogoAndKey(instance, key);
+    puts(value);
+}

src/modules/desktopenvironment.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
+
 
 static void printKDE()
 {

src/modules/font.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
+
 
 static void parseFont(char* font, char* buffer)
 {

src/modules/gpu.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
+
 #include <pci/pci.h>
 
 static void handleGPU(FFinstance* instance, struct pci_access* pacc, struct pci_dev* dev, uint16_t counter)

src/modules/host.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
+
 
 void ffPrintHost(FFinstance* instance)
 {

src/modules/icons.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
+
 
 void ffPrintIcons(FFinstance* instance)
 {

src/modules/shell.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
+
 
 void ffPrintShell(FFinstance* instance)
 {

src/modules/terminal.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
+
 
 void printTerminalName(FFinstance* instance, const char* pid)
 {

src/modules/theme.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
+
 
 void ffPrintTheme(FFinstance* instance)
 {

src/modules/title.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
+
 
 void ffPrintTitle(FFinstance* instance)
 {

src/util.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
+
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>