Logo (Builtin): use meaningful macros

instead of raw color codes

doc/json_schema.json

@@ -3,7 +3,11 @@
     "$defs": {
         "colors": {
             "type": "string",
-            "enum": ["reset_", "bright_", "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"]
+            "enum": [
+                "reset_", "bright_", "dim_",
+                "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white", "default",
+                "bright_black", "bright_red", "bright_green", "bright_yellow", "bright_blue", "bright_magenta", "bright_cyan", "bright_white"
+            ]
         },
         "key": {
             "title": "Key of the module",

src/common/color.h

@@ -0,0 +1,55 @@
+#pragma once
+
+#define FF_COLOR_MODE_RESET "0;"
+#define FF_COLOR_MODE_BOLD "1;"
+#define FF_COLOR_MODE_DIM "2;"
+#define FF_COLOR_MODE_ITALIC "3;"
+#define FF_COLOR_MODE_UNDERLINE "4;"
+#define FF_COLOR_MODE_BLINK "5;"
+#define FF_COLOR_MODE_INVERSE "7;"
+#define FF_COLOR_MODE_HIDDEN "8;"
+#define FF_COLOR_MODE_STRIKETHROUGH "9;"
+
+#define FF_COLOR_FG_BLACK "30"
+#define FF_COLOR_FG_RED "31"
+#define FF_COLOR_FG_GREEN "32"
+#define FF_COLOR_FG_YELLOW "33"
+#define FF_COLOR_FG_BLUE "34"
+#define FF_COLOR_FG_MAGENTA "35"
+#define FF_COLOR_FG_CYAN "36"
+#define FF_COLOR_FG_WHITE "37"
+#define FF_COLOR_FG_DEFAULT "39"
+
+#define FF_COLOR_FG_LIGHT_BLACK "90"
+#define FF_COLOR_FG_LIGHT_RED "91"
+#define FF_COLOR_FG_LIGHT_GREEN "92"
+#define FF_COLOR_FG_LIGHT_YELLOW "93"
+#define FF_COLOR_FG_LIGHT_BLUE "94"
+#define FF_COLOR_FG_LIGHT_MAGENTA "95"
+#define FF_COLOR_FG_LIGHT_CYAN "96"
+#define FF_COLOR_FG_LIGHT_WHITE "97"
+
+#define FF_COLOR_BG_BLACK "40"
+#define FF_COLOR_BG_RED "41"
+#define FF_COLOR_BG_GREEN "42"
+#define FF_COLOR_BG_YELLOW "43"
+#define FF_COLOR_BG_BLUE "44"
+#define FF_COLOR_BG_MAGENTA "45"
+#define FF_COLOR_BG_CYAN "46"
+#define FF_COLOR_BG_WHITE "47"
+#define FF_COLOR_BG_DEFAULT "49"
+
+#define FF_COLOR_BG_LIGHT_BLACK "100"
+#define FF_COLOR_BG_LIGHT_RED "101"
+#define FF_COLOR_BG_LIGHT_GREEN "102"
+#define FF_COLOR_BG_LIGHT_YELLOW "103"
+#define FF_COLOR_BG_LIGHT_BLUE "104"
+#define FF_COLOR_BG_LIGHT_MAGENTA "105"
+#define FF_COLOR_BG_LIGHT_CYAN "106"
+#define FF_COLOR_BG_LIGHT_WHITE "107"
+
+#define FF_COLOR_FG_256 "38;5;"
+#define FF_COLOR_BG_256 "48;5;"
+
+#define FF_COLOR_FG_RGB "38;2;"
+#define FF_COLOR_BG_RGB "48;2;"

src/common/option.c

@@ -1,4 +1,5 @@
 #include "common/option.h"
+#include "common/color.h"
 #include "util/stringUtils.h"
 
 // Return start position of the inner key if the argument key belongs to the module specified, NULL otherwise
@@ -138,16 +139,26 @@ void ffOptionParseColor(const char* value, FFstrbuf* buffer)
         #define FF_APPEND_COLOR_CODE_COND(prefix, code) \
             if(strncasecmp(value, #prefix, strlen(#prefix)) == 0) { ffStrbufAppendS(buffer, code); value += strlen(#prefix); }
 
-        FF_APPEND_COLOR_CODE_COND(reset_, "0;")
-        else FF_APPEND_COLOR_CODE_COND(bright_, "1;")
-        else FF_APPEND_COLOR_CODE_COND(black, "30")
-        else FF_APPEND_COLOR_CODE_COND(red, "31")
-        else FF_APPEND_COLOR_CODE_COND(green, "32")
-        else FF_APPEND_COLOR_CODE_COND(yellow, "33")
-        else FF_APPEND_COLOR_CODE_COND(blue, "34")
-        else FF_APPEND_COLOR_CODE_COND(magenta, "35")
-        else FF_APPEND_COLOR_CODE_COND(cyan, "36")
-        else FF_APPEND_COLOR_CODE_COND(white, "37")
+        FF_APPEND_COLOR_CODE_COND(reset_, FF_COLOR_MODE_RESET)
+        else FF_APPEND_COLOR_CODE_COND(bright_, FF_COLOR_MODE_BOLD)
+        else FF_APPEND_COLOR_CODE_COND(dim_, FF_COLOR_MODE_DIM)
+        else FF_APPEND_COLOR_CODE_COND(black, FF_COLOR_FG_BLACK)
+        else FF_APPEND_COLOR_CODE_COND(red, FF_COLOR_FG_RED)
+        else FF_APPEND_COLOR_CODE_COND(green, FF_COLOR_FG_GREEN)
+        else FF_APPEND_COLOR_CODE_COND(yellow, FF_COLOR_FG_YELLOW)
+        else FF_APPEND_COLOR_CODE_COND(blue, FF_COLOR_FG_BLUE)
+        else FF_APPEND_COLOR_CODE_COND(magenta, FF_COLOR_FG_MAGENTA)
+        else FF_APPEND_COLOR_CODE_COND(cyan, FF_COLOR_FG_CYAN)
+        else FF_APPEND_COLOR_CODE_COND(white, FF_COLOR_FG_WHITE)
+        else FF_APPEND_COLOR_CODE_COND(default, FF_COLOR_FG_DEFAULT)
+        else FF_APPEND_COLOR_CODE_COND(light_black, FF_COLOR_FG_LIGHT_BLACK)
+        else FF_APPEND_COLOR_CODE_COND(light_red, FF_COLOR_FG_LIGHT_RED)
+        else FF_APPEND_COLOR_CODE_COND(light_green, FF_COLOR_FG_LIGHT_GREEN)
+        else FF_APPEND_COLOR_CODE_COND(light_yellow, FF_COLOR_FG_LIGHT_YELLOW)
+        else FF_APPEND_COLOR_CODE_COND(light_blue, FF_COLOR_FG_LIGHT_BLUE)
+        else FF_APPEND_COLOR_CODE_COND(light_magenta, FF_COLOR_FG_LIGHT_MAGENTA)
+        else FF_APPEND_COLOR_CODE_COND(light_cyan, FF_COLOR_FG_LIGHT_CYAN)
+        else FF_APPEND_COLOR_CODE_COND(light_white, FF_COLOR_FG_LIGHT_WHITE)
         else
         {
             ffStrbufAppendC(buffer, *value);