[ansi] handle hi-color escapes with colons instead of semi-colons

Related to #1516

Author: tstack

src/base/ansi_scrubber.cc

@@ -44,7 +44,7 @@ static const lnav::pcre2pp::code&
 ansi_regex()
 {
     static const auto retval = lnav::pcre2pp::code::from_const(
-        R"(\x1b\[([\d=;\?]*)([a-zA-Z])|\x1b\](\d+);(.*?)(?:\x07|\x1b\\)|(?:\X\x08\X)+|(\x16+))");
+        R"(\x1b\[([\d=;:\?]*)([a-zA-Z])|\x1b\](\d+);(.*?)(?:\x07|\x1b\\)|(?:\X\x08\X)+|(\x16+))");
 
     return retval;
 }
@@ -122,6 +122,8 @@ scrub_ansi_string(std::string& str, string_attrs_t* sa)
 {
     thread_local auto md = lnav::pcre2pp::match_data::unitialized();
     static constexpr auto semi_pred = string_fragment::tag1{';'};
+    static constexpr auto colon_pred
+        = [](char ch) { return ch == ';' || ch == ':'; };
 
     const auto& regex = ansi_regex();
     std::optional<std::string> href;
@@ -327,8 +329,8 @@ scrub_ansi_string(std::string& str, string_attrs_t* sa)
                         }
                         if (ansi_code == 38 || ansi_code == 48) {
                             auto color_code_pair
-                                = seq.split_when(semi_pred).second.split_pair(
-                                    semi_pred);
+                                = seq.split_when(colon_pred)
+                                      .second.split_pair(colon_pred);
                             if (!color_code_pair) {
                                 break;
                             }
@@ -338,19 +340,24 @@ scrub_ansi_string(std::string& str, string_attrs_t* sa)
                                 break;
                             }
                             if (color_type->value() == 2) {
-                                auto scan_res
-                                    = scn::scan<uint8_t, uint8_t, uint8_t>(
+                                auto scan_res = scn::
+                                    scan<uint8_t, char, uint8_t, char, uint8_t>(
                                         color_code_pair->second
                                             .to_string_view(),
-                                        "{};{};{}");
+                                        "{}{}{}{}{}");
                                 if (scan_res) {
-                                    auto [r, g, b] = scan_res->values();
-                                    attrs.ta_fg_color = rgb_color{r, g, b};
+                                    auto [r, sep1, g, sep2, b]
+                                        = scan_res->values();
+                                    if ((sep1 == ';' && sep2 == ';')
+                                        || (sep1 == ':' && sep2 == ':'))
+                                    {
+                                        attrs.ta_fg_color = rgb_color{r, g, b};
+                                    }
                                 }
                             } else if (color_type->value() == 5) {
                                 auto color_index_pair
                                     = color_code_pair->second.split_when(
-                                        semi_pred);
+                                        colon_pred);
                                 auto color_index = scn::scan_value<short>(
                                     color_index_pair.first.to_string_view());
                                 if (!color_index.has_value()

test/test_ansi_scrubber.cc

@@ -48,6 +48,42 @@ main(int argc, char* argv[])
 {
     printf("BEGIN test\n");
 
+    {
+        auto input = std::string("\x1b[0;1;38:2:1:2:3mHello");
+        string_attrs_t sa;
+
+        scrub_ansi_string(input, &sa);
+        assert(input == "Hello");
+        assert(sa.size() == 1);
+        assert(sa[0].sa_type == &VC_STYLE);
+        auto ta = sa[0].sa_value.get<text_attrs>();
+        auto rgb = ta.ta_fg_color.cu_value.get<rgb_color>();
+        assert(rgb.rc_r == 1);
+        assert(rgb.rc_g == 2);
+        assert(rgb.rc_b == 3);
+    }
+
+    {
+        auto input = std::string("\x1b[0;1;38:5:245mHello");
+        string_attrs_t sa;
+
+        scrub_ansi_string(input, &sa);
+        assert(input == "Hello");
+        assert(sa.size() == 1);
+        assert(sa[0].sa_type == &VC_STYLE);
+        auto ta = sa[0].sa_value.get<text_attrs>();
+        assert(ta.ta_fg_color.cu_value.get<palette_color>()
+               == palette_color{245});
+    }
+
+    {
+        auto input = std::string("\x1b[0;1;38;5;245mHello");
+        string_attrs_t sa;
+
+        scrub_ansi_string(input, &sa);
+        assert(input == "Hello");
+    }
+
     {
         auto input = std::string("\x1b[66O\x1b[66O");
         string_attrs_t sa;