From 0c3a562ec662d82a8b675f421f06cd235633bcad Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Sat, 27 Feb 2021 19:22:28 +0100 Subject: [PATCH] minor refactoring --- CMakeLists.txt | 1 + src/fastfetch.c | 2 +- src/fastfetch.h | 46 +++++++++++++++++--------------- src/flashfetch.c | 5 ++++ src/logo.c | 2 +- src/modules/custom.c | 7 +++++ src/modules/desktopenvironment.c | 2 +- src/modules/font.c | 2 +- src/modules/gpu.c | 2 +- src/modules/host.c | 2 +- src/modules/icons.c | 2 +- src/modules/shell.c | 2 +- src/modules/terminal.c | 2 +- src/modules/theme.c | 2 +- src/modules/title.c | 2 +- src/util.c | 2 +- 16 files changed, 49 insertions(+), 34 deletions(-) create mode 100644 src/modules/custom.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 024094922..3a182310a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ set(SRCS src/util.c src/logo.c src/modules/break.c + src/modules/custom.c src/modules/title.c src/modules/seperator.c src/modules/os.c diff --git a/src/fastfetch.c b/src/fastfetch.c index d1bfa7c25..5d1626664 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -1,7 +1,7 @@ #include "fastfetch.h" #include "fastfetch_config.h" -#include + static void printHelp() { diff --git a/src/fastfetch.h b/src/fastfetch.h index 275fa39ba..b43a96a40 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -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 \ No newline at end of file diff --git a/src/flashfetch.c b/src/flashfetch.c index edee52cf4..f9a9edd2f 100644 --- a/src/flashfetch.c +++ b/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 diff --git a/src/logo.c b/src/logo.c index 605bc26ac..ad481b8d6 100644 --- a/src/logo.c +++ b/src/logo.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include + static void loadUnknownLogo(FFlogo* logo) { diff --git a/src/modules/custom.c b/src/modules/custom.c new file mode 100644 index 000000000..c712d9dc1 --- /dev/null +++ b/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); +} \ No newline at end of file diff --git a/src/modules/desktopenvironment.c b/src/modules/desktopenvironment.c index f9d3a3a4d..ec2d72b89 100644 --- a/src/modules/desktopenvironment.c +++ b/src/modules/desktopenvironment.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include + static void printKDE() { diff --git a/src/modules/font.c b/src/modules/font.c index 79d0c6527..f9134c774 100644 --- a/src/modules/font.c +++ b/src/modules/font.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include + static void parseFont(char* font, char* buffer) { diff --git a/src/modules/gpu.c b/src/modules/gpu.c index ffa19dfa2..ed27eeafc 100644 --- a/src/modules/gpu.c +++ b/src/modules/gpu.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include + #include static void handleGPU(FFinstance* instance, struct pci_access* pacc, struct pci_dev* dev, uint16_t counter) diff --git a/src/modules/host.c b/src/modules/host.c index 73e7cec52..af6775906 100644 --- a/src/modules/host.c +++ b/src/modules/host.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include + void ffPrintHost(FFinstance* instance) { diff --git a/src/modules/icons.c b/src/modules/icons.c index 8885be525..90ba9c3c6 100644 --- a/src/modules/icons.c +++ b/src/modules/icons.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include + void ffPrintIcons(FFinstance* instance) { diff --git a/src/modules/shell.c b/src/modules/shell.c index 8be5e3199..94f44f5e4 100644 --- a/src/modules/shell.c +++ b/src/modules/shell.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include + void ffPrintShell(FFinstance* instance) { diff --git a/src/modules/terminal.c b/src/modules/terminal.c index c7a61a5df..5b8f1bb6f 100644 --- a/src/modules/terminal.c +++ b/src/modules/terminal.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include + void printTerminalName(FFinstance* instance, const char* pid) { diff --git a/src/modules/theme.c b/src/modules/theme.c index 2d9485c97..30d67e3d5 100644 --- a/src/modules/theme.c +++ b/src/modules/theme.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include + void ffPrintTheme(FFinstance* instance) { diff --git a/src/modules/title.c b/src/modules/title.c index 1f8d88e4b..5fa584f98 100644 --- a/src/modules/title.c +++ b/src/modules/title.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include + void ffPrintTitle(FFinstance* instance) { diff --git a/src/util.c b/src/util.c index ff8b3da13..f48e4f096 100644 --- a/src/util.c +++ b/src/util.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include + #include #include #include