Custom logo colors support

Author: LinusDierheimer

.editorconfig

@@ -7,8 +7,8 @@ tab_width = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.md]
+[*.{md,fflogo}]
 trim_trailing_whitespace = false
 
-[*.txt]
+[*.{txt,fflogo}]
 insert_final_newline = false

DEVELOPMENT.md

@@ -5,9 +5,7 @@ Here i just add things that are easy to forget.
 
 ## Features i am planning to implement
 
-- [ ] Support overwriting logo colors (e.g. --color-1 35 --color-2 31)
 - [ ] Support for color name mapping (e.g. --color red)
-- [ ] Support for colors in user provided logo files (requires point 1 to be implemented)
 - [ ] Support for printing images as ascii art logos (using imlib2 and libcaca probably)
 - [ ] Support for printing images in terminals that support it
 - [ ] Better documentation (especially default config file and the various --help options. Colored output?)

src/common/init.c

@@ -114,6 +114,10 @@ static void defaultConfig(FFinstance* instance)
     instance->config.allowSlowOperations = false;
     instance->config.disableLinewrap = true;
     instance->config.hideCursor = true;
+    instance->config.userLogoIsRaw = false;
+
+    for(uint8_t i = 0; i < (uint8_t) FASTFETCH_LOGO_MAX_COLORS; ++i)
+        ffStrbufInit(&instance->config.logoColors[i]);
 
     ffLoadLogo(instance);
 

src/common/io.c

@@ -12,7 +12,7 @@ void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t mod
     ffPrintLogoLine(instance);
 
     fputs(FASTFETCH_TEXT_MODIFIER_BOLT, stdout);
-    ffStrbufWriteTo(&instance->config.color, stdout);
+    ffPrintColor(&instance->config.color);
 
     if(customKeyFormat == NULL || customKeyFormat->length == 0)
     {
@@ -490,3 +490,10 @@ void ffSuppressIO(bool suppress)
     dup2(suppress ? nullFile : origOut, STDOUT_FILENO);
     dup2(suppress ? nullFile : origErr, STDERR_FILENO);
 }
+
+void ffPrintColor(const FFstrbuf* colorValue)
+{
+    fputs("\033[", stdout);
+    ffStrbufWriteTo(colorValue, stdout);
+    fputc('m', stdout);
+}