Logo: add Windows 95; refactor code

From https://github.com/dylanaraps/neofetch/pull/2346/files

src/fastfetch.c

@@ -6,6 +6,7 @@
 #include "common/jsonconfig.h"
 #include "util/stringUtils.h"
 #include "logo/logo.h"
+#include "fastfetch_datatext.h"
 
 #include <stdlib.h>
 #include <ctype.h>

src/fastfetch_config.h.in

@@ -1,3 +1,5 @@
+#pragma once
+
 #ifndef FASTFETCH_INDLUDED_fastfetch_config_h_in
 #define FASTFETCH_INDLUDED_fastfetch_config_h_in
 
@@ -19,13 +21,4 @@
 
 #define FASTFETCH_TARGET_DIR_INSTALL_SYSCONF "@CMAKE_INSTALL_SYSCONFDIR@"
 
-#define FASTFETCH_DATATEXT_STRUCTURE "@DATATEXT_STRUCTURE@"
-#define FASTFETCH_DATATEXT_CONFIG_SYSTEM "@DATATEXT_CONFIG_SYSTEM@"
-#define FASTFETCH_DATATEXT_CONFIG_USER "@DATATEXT_CONFIG_USER@" //Requires FASTFETCH_PROJECT_VERSION and FASTFETCH_DATATEXT_STRUCTURE to be set
-#define FASTFETCH_DATATEXT_MODULES "@DATATEXT_MODULES@"
-#define FASTFETCH_DATATEXT_HELP "@DATATEXT_HELP@"
-#define FASTFETCH_DATATEXT_HELP_COLOR "@DATATEXT_HELP_COLOR@"
-#define FASTFETCH_DATATEXT_HELP_FORMAT "@DATATEXT_HELP_FORMAT@"
-#define FASTFETCH_DATATEXT_HELP_CONFIG "@DATATEXT_HELP_CONFIG@"
-
 #endif // FASTFETCH_INDLUDED_fastfetch_config_h_in

src/fastfetch_datatext.h.in

@@ -0,0 +1,15 @@
+#pragma once
+
+#ifndef FASTFETCH_INDLUDED_fastfetch_datatext_h_in
+#define FASTFETCH_INDLUDED_fastfetch_datatext_h_in
+
+#define FASTFETCH_DATATEXT_STRUCTURE "@DATATEXT_STRUCTURE@"
+#define FASTFETCH_DATATEXT_CONFIG_SYSTEM "@DATATEXT_CONFIG_SYSTEM@"
+#define FASTFETCH_DATATEXT_CONFIG_USER "@DATATEXT_CONFIG_USER@" //Requires FASTFETCH_PROJECT_VERSION and FASTFETCH_DATATEXT_STRUCTURE to be set
+#define FASTFETCH_DATATEXT_MODULES "@DATATEXT_MODULES@"
+#define FASTFETCH_DATATEXT_HELP "@DATATEXT_HELP@"
+#define FASTFETCH_DATATEXT_HELP_COLOR "@DATATEXT_HELP_COLOR@"
+#define FASTFETCH_DATATEXT_HELP_FORMAT "@DATATEXT_HELP_FORMAT@"
+#define FASTFETCH_DATATEXT_HELP_CONFIG "@DATATEXT_HELP_CONFIG@"
+
+#endif

src/logo/ascii/Windows95.txt

@@ -0,0 +1,18 @@
+${c6}                        ___
+                   .--=+++++=-:.
+.              _ *%@@@@@@@@@@@@@@*
+ *:+:.__ :+* @@@ @"${c5}_*&%${c6}@@${c4}%&&&*${c6}"@@@
+  "+.-#+ +%* " _ ${c5}++&&&%${c6}@@${c4}%&&&&&#${c6}@@
+${c5}"          , ${c6}%@@ ${c5}&&&&&%${c6}@@${c4}%&&&&&#${c6}@@
+${c5}   *  oo  *# ${c6}" _ ${c5}&&&&&%${c6}@@${c4}%&&&&&#${c6}@@
+${c5}"          , ${c6}%@@ ${c5}&&&&"${c6}@@@@#*${c4}"&&&${c6}@@
+.${c5}  *  oo  *# ${c6}" _ %@@@@@@@@@@@@@@@@
+ *:+:.__ :=* %@@ @"${c1}**&%${c6}@@${c3}%&&&*${c6}"@@@
+  "+.-#+ +%* " _ ${c1}&&&&&%${c6}@@${c3}%&&&&&#${c6}@@
+${c1}"          , ${c6}%@@ ${c1}&&&&&%${c6}@@${c3}%&&&&&#${c6}@@
+${c1}   *  oo  *# ${c6}" _ ${c1}&&&&&%${c6}@@${c3}%&&&&&#${c6}@@
+${c1}"          , ${c6}%@@ ${c1}&&*"${c6}%@@@@@@${c3}"*%&${c6}@@
+.${c1}  *  oo  *# ${c6}" _ @@@@@@@@@@@@@@@@@
+ *:+:.__ :+# @@@ @%#=+""""""+==%#@
+  "+.-#+ +%* %+" "             ":@
+       " "

src/logo/builtin.c

@@ -1,4 +1,5 @@
 #include "logo.h"
+#include "src_logo_builtin.h" // Generated with `src/logo/builtin.h`
 
 #define FF_LOGO_INIT static FFlogo logo; static bool init = false; if(init) return &logo; init = true;
 // The names of small logo must end with `_small` or `-small`
@@ -335,25 +336,25 @@ static const FFlogo* getLogoBSD(void)
     FF_LOGO_INIT
     FF_LOGO_NAMES("bsd")
     FF_LOGO_LINES(
-"$1             ,        ,\n"
-"            /(        )`\n"
-"            \\ \\___   / |\n"
-"            /- _  `-/  '\n"
-"           ($2/\\/ \\ $1\\   /\\\n"
-"           $2/ /   | `    $1\\\n"
-"           $3O O   $2) $1/    |\n"
-"           $2`-^--'$1`<     '\n"
-"          (_.)  _  )   /\n"
-"           `.___/`    /\n"
-"             `-----' /\n"
-"$4<----.     __ / __   \\\n"
-"$4<----|====$1O)))$4==$1) \\) /$4====|\n"
-"<----'    $1`--' `.__,' \\\n"
-"             |        |\n"
-"              \\       /       /\\\n"
-"         $5______$1( (_  / \\______/\n"
-"       $5,'  ,-----'   |\n"
-"       `--{__________)\n"
+        "$1             ,        ,\n"
+        "            /(        )`\n"
+        "            \\ \\___   / |\n"
+        "            /- _  `-/  '\n"
+        "           ($2/\\/ \\ $1\\   /\\\n"
+        "           $2/ /   | `    $1\\\n"
+        "           $3O O   $2) $1/    |\n"
+        "           $2`-^--'$1`<     '\n"
+        "          (_.)  _  )   /\n"
+        "           `.___/`    /\n"
+        "             `-----' /\n"
+        "$4<----.     __ / __   \\\n"
+        "$4<----|====$1O)))$4==$1) \\) /$4====|\n"
+        "<----'    $1`--' `.__,' \\\n"
+        "             |        |\n"
+        "              \\       /       /\\\n"
+        "         $5______$1( (_  / \\______/\n"
+        "       $5,'  ,-----'   |\n"
+        "       `--{__________)\n"
     )
     FF_LOGO_COLORS(
         "31",
@@ -1724,6 +1725,24 @@ static const FFlogo* getLogoWindows(void)
     FF_LOGO_RETURN
 }
 
+static const FFlogo* getLogoWindows95(void)
+{
+    FF_LOGO_INIT
+    FF_LOGO_NAMES("Windows 9x", "Windows 95")
+    FF_LOGO_LINES(FASTFETCH_DATATEXT_LOGO_WINDOWS95)
+    FF_LOGO_COLORS(
+        "36", //cyan
+        "34", //blue
+        "33", //yellow
+        "32", //green
+        "31",
+        "30"
+    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("34"); //blue
+    FF_LOGO_RETURN
+}
+
 static const FFlogo* getLogoNixOS(void)
 {
     FF_LOGO_INIT
@@ -2759,6 +2778,7 @@ GetLogoMethod* ffLogoBuiltinGetAll(void)
         getLogoWindows11Small,
         getLogoWindows8,
         getLogoWindows,
+        getLogoWindows95,
         getLogoNixOS,
         getLogoNixOsOld,
         getLogoNixOsSmall,

src/logo/builtin.h.in

@@ -0,0 +1,8 @@
+#pragma once
+
+#ifndef FASTFETCH_INDLUDED_logo_builtin_h_in
+#define FASTFETCH_INDLUDED_logo_builtin_h_in
+
+#define FASTFETCH_DATATEXT_LOGO_WINDOWS95 @DATATEXT_LOGO_WINDOWS95@
+
+#endif