[vte] Revert "emulation: Add support for OSC 5;0 (bold color)"

[Christian Persch <chpe src gnome org>]

commit 899ce4558fd6c870813b552f78ab98278823e9b1
Author: Christian Persch <chpe src gnome org>
Date:   Tue Mar 27 19:40:12 2018 +0200

    Revert "emulation: Add support for OSC 5;0 (bold color)"
    
    This reverts commit e258bda404f146262545abf7c332d7917a55d5d6.

 src/caps-list.hh   |    6 -----
 src/vteinternal.hh |    2 +-
 src/vteseq-list.hh |    3 --
 src/vteseq.cc      |   57 +++++++++++++++------------------------------------
 4 files changed, 18 insertions(+), 50 deletions(-)
---
diff --git a/src/caps-list.hh b/src/caps-list.hh
index 8557bc2..cc75191 100644
--- a/src/caps-list.hh
+++ b/src/caps-list.hh
@@ -218,7 +218,6 @@ static const vte_matcher_entry_t entries[] = {
         ENTRY(OSC "2;%s" BEL, set_window_title),
         ENTRY(OSC "3;%s" BEL, set_xproperty),
         ENTRY(OSC "4;%s" BEL, change_color_bel),
-        ENTRY(OSC "5;0;%s" BEL, change_bold_color_bel),
         ENTRY(OSC "6;%s" BEL, set_current_file_uri),
         ENTRY(OSC "7;%s" BEL, set_current_directory_uri),
         ENTRY(OSC "8;%s;%s" BEL, set_current_hyperlink),
@@ -237,8 +236,6 @@ static const vte_matcher_entry_t entries[] = {
         ENTRY(OSC "50;%s" BEL, change_font_name),
         ENTRY(OSC "104" BEL, reset_color),
         ENTRY(OSC "104;%m" BEL, reset_color),
-        ENTRY(OSC "105" BEL, reset_bold_color),
-        ENTRY(OSC "105;0" BEL, reset_bold_color),
         ENTRY(OSC "110" BEL, reset_foreground_color),
         ENTRY(OSC "111" BEL, reset_background_color),
         ENTRY(OSC "112" BEL, reset_cursor_background_color),
@@ -260,7 +257,6 @@ static const vte_matcher_entry_t entries[] = {
         ENTRY(OSC "2;%s" ST, set_window_title),
         ENTRY(OSC "3;%s" ST, set_xproperty),
         ENTRY(OSC "4;%s" ST, change_color_st),
-        ENTRY(OSC "5;0;%s" ST, change_bold_color_st),
         ENTRY(OSC "6;%s" ST, set_current_file_uri),
         ENTRY(OSC "7;%s" ST, set_current_directory_uri),
         ENTRY(OSC "8;%s;%s" ST, set_current_hyperlink),
@@ -279,8 +275,6 @@ static const vte_matcher_entry_t entries[] = {
         ENTRY(OSC "50;%s" ST, change_font_name),
         ENTRY(OSC "104" ST, reset_color),
         ENTRY(OSC "104;%m" ST, reset_color),
-        ENTRY(OSC "105" ST, reset_bold_color),
-        ENTRY(OSC "105;0" ST, reset_bold_color),
         ENTRY(OSC "110" ST, reset_foreground_color),
         ENTRY(OSC "111" ST, reset_background_color),
         ENTRY(OSC "112" ST, reset_cursor_background_color),
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 132e5c4..b174038 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -1343,7 +1343,7 @@ public:
         inline void change_special_color(vte::parser::Params const& params,
                                          int index,
                                          int index_fallback,
-                                         const char *osc,
+                                         int osc,
                                          char const *terminator);
 
         void subscribe_accessible_events();
diff --git a/src/vteseq-list.hh b/src/vteseq-list.hh
index a03d2bb..1dda448 100644
--- a/src/vteseq-list.hh
+++ b/src/vteseq-list.hh
@@ -7,8 +7,6 @@ SEQUENCE_HANDLER(bell)
 SEQUENCE_HANDLER(carriage_return)
 SEQUENCE_HANDLER(change_background_color_bel)
 SEQUENCE_HANDLER(change_background_color_st)
-SEQUENCE_HANDLER(change_bold_color_bel)
-SEQUENCE_HANDLER(change_bold_color_st)
 SEQUENCE_HANDLER(change_color_bel)
 SEQUENCE_HANDLER(change_color_st)
 SEQUENCE_HANDLER(change_cursor_background_color_bel)
@@ -97,7 +95,6 @@ SEQUENCE_HANDLER(repeat)
 SEQUENCE_HANDLER(request_locator_position)
 SEQUENCE_HANDLER(request_terminal_parameters)
 SEQUENCE_HANDLER(reset_background_color)
-SEQUENCE_HANDLER(reset_bold_color)
 SEQUENCE_HANDLER(reset_color)
 SEQUENCE_HANDLER(reset_cursor_background_color)
 SEQUENCE_HANDLER(reset_foreground_color)
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 7d3c5f9..4da48c4 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -1534,16 +1534,14 @@ VteTerminalPrivate::change_color(vte::parser::Params const& params,
                for (i = 0; pairs[i] && pairs[i + 1]; i += 2) {
                        idx = strtoul (pairs[i], (char **) NULL, 10);
 
-                       if (idx >= VTE_DEFAULT_FG && idx != 256)
+                       if (idx >= VTE_DEFAULT_FG)
                                continue;
 
                        if (color.parse(pairs[i + 1])) {
-                                set_color(idx == 256 ? VTE_BOLD_FG : idx, VTE_COLOR_SOURCE_ESCAPE, color);
+                                set_color(idx, VTE_COLOR_SOURCE_ESCAPE, color);
                        } else if (strcmp (pairs[i + 1], "?") == 0) {
                                gchar buf[128];
-                               auto c = get_color(idx == 256 ? VTE_BOLD_FG : idx);
-                               if (c == NULL && idx == 256)
-                                       c = get_color(VTE_DEFAULT_FG);
+                               auto c = get_color(idx);
                                g_assert(c != NULL);
                                g_snprintf (buf, sizeof (buf),
                                            _VTE_CAP_OSC "4;%u;rgb:%04x/%04x/%04x%s",
@@ -1584,10 +1582,10 @@ VteTerminalPrivate::seq_reset_color(vte::parser::Params const& params)
                         if (!params.number_at_unchecked(i, value))
                                 continue;
 
-                        if ((value < 0 || value >= VTE_DEFAULT_FG) && value != 256)
+                        if (value < 0 || value >= VTE_DEFAULT_FG)
                                 continue;
 
-                        reset_color(value == 256 ? VTE_BOLD_FG : value, VTE_COLOR_SOURCE_ESCAPE);
+                        reset_color(value, VTE_COLOR_SOURCE_ESCAPE);
                 }
        } else {
                for (unsigned int idx = 0; idx < VTE_DEFAULT_FG; idx++) {
@@ -2923,7 +2921,7 @@ void
 VteTerminalPrivate::change_special_color(vte::parser::Params const& params,
                                          int index,
                                          int index_fallback,
-                                         const char *osc,
+                                         int osc,
                                          const char *terminator)
 {
         char* name;
@@ -2941,45 +2939,24 @@ VteTerminalPrivate::change_special_color(vte::parser::Params const& params,
                                c = get_color(index_fallback);
                        g_assert(c != NULL);
                        g_snprintf (buf, sizeof (buf),
-                                   _VTE_CAP_OSC "%s;rgb:%04x/%04x/%04x%s",
+                                   _VTE_CAP_OSC "%d;rgb:%04x/%04x/%04x%s",
                                    osc, c->red, c->green, c->blue, terminator);
                        feed_child(buf, -1);
                }
 }
 
-/* Change the bold color, BEL terminated */
-void
-VteTerminalPrivate::seq_change_bold_color_bel(vte::parser::Params const& params)
-{
-        change_special_color(params, VTE_BOLD_FG, VTE_DEFAULT_FG, "5;0", BEL);
-}
-
-/* Change the bold color, ST terminated */
-void
-VteTerminalPrivate::seq_change_bold_color_st(vte::parser::Params const& params)
-{
-        change_special_color(params, VTE_BOLD_FG, VTE_DEFAULT_FG, "5;0", ST);
-}
-
-/* Reset the bold color */
-void
-VteTerminalPrivate::seq_reset_bold_color(vte::parser::Params const& params)
-{
-        reset_color(VTE_BOLD_FG, VTE_COLOR_SOURCE_ESCAPE);
-}
-
 /* Change the default foreground cursor, BEL terminated */
 void
 VteTerminalPrivate::seq_change_foreground_color_bel(vte::parser::Params const& params)
 {
-        change_special_color(params, VTE_DEFAULT_FG, -1, "10", BEL);
+        change_special_color(params, VTE_DEFAULT_FG, -1, 10, BEL);
 }
 
 /* Change the default foreground cursor, ST terminated */
 void
 VteTerminalPrivate::seq_change_foreground_color_st(vte::parser::Params const& params)
 {
-        change_special_color(params, VTE_DEFAULT_FG, -1, "10", ST);
+        change_special_color(params, VTE_DEFAULT_FG, -1, 10, ST);
 }
 
 /* Reset the default foreground color */
@@ -2993,14 +2970,14 @@ VteTerminalPrivate::seq_reset_foreground_color(vte::parser::Params const& params
 void
 VteTerminalPrivate::seq_change_background_color_bel(vte::parser::Params const& params)
 {
-        change_special_color(params, VTE_DEFAULT_BG, -1, "11", BEL);
+        change_special_color(params, VTE_DEFAULT_BG, -1, 11, BEL);
 }
 
 /* Change the default background cursor, ST terminated */
 void
 VteTerminalPrivate::seq_change_background_color_st(vte::parser::Params const& params)
 {
-        change_special_color(params, VTE_DEFAULT_BG, -1, "11", ST);
+        change_special_color(params, VTE_DEFAULT_BG, -1, 11, ST);
 }
 
 /* Reset the default background color */
@@ -3014,14 +2991,14 @@ VteTerminalPrivate::seq_reset_background_color(vte::parser::Params const& params
 void
 VteTerminalPrivate::seq_change_cursor_background_color_bel(vte::parser::Params const& params)
 {
-        change_special_color(params, VTE_CURSOR_BG, VTE_DEFAULT_FG, "12", BEL);
+        change_special_color(params, VTE_CURSOR_BG, VTE_DEFAULT_FG, 12, BEL);
 }
 
 /* Change the color of the cursor background, ST terminated */
 void
 VteTerminalPrivate::seq_change_cursor_background_color_st(vte::parser::Params const& params)
 {
-        change_special_color(params, VTE_CURSOR_BG, VTE_DEFAULT_FG, "12", ST);
+        change_special_color(params, VTE_CURSOR_BG, VTE_DEFAULT_FG, 12, ST);
 }
 
 /* Reset the color of the cursor */
@@ -3035,14 +3012,14 @@ VteTerminalPrivate::seq_reset_cursor_background_color(vte::parser::Params const&
 void
 VteTerminalPrivate::seq_change_highlight_background_color_bel(vte::parser::Params const& params)
 {
-        change_special_color(params, VTE_HIGHLIGHT_BG, VTE_DEFAULT_FG, "17", BEL);
+        change_special_color(params, VTE_HIGHLIGHT_BG, VTE_DEFAULT_FG, 17, BEL);
 }
 
 /* Change the highlight background color, ST terminated */
 void
 VteTerminalPrivate::seq_change_highlight_background_color_st(vte::parser::Params const& params)
 {
-        change_special_color(params, VTE_HIGHLIGHT_BG, VTE_DEFAULT_FG, "17", ST);
+        change_special_color(params, VTE_HIGHLIGHT_BG, VTE_DEFAULT_FG, 17, ST);
 }
 
 /* Reset the highlight background color */
@@ -3056,14 +3033,14 @@ VteTerminalPrivate::seq_reset_highlight_background_color(vte::parser::Params con
 void
 VteTerminalPrivate::seq_change_highlight_foreground_color_bel(vte::parser::Params const& params)
 {
-        change_special_color(params, VTE_HIGHLIGHT_FG, VTE_DEFAULT_BG, "19", BEL);
+        change_special_color(params, VTE_HIGHLIGHT_FG, VTE_DEFAULT_BG, 19, BEL);
 }
 
 /* Change the highlight foreground color, ST terminated */
 void
 VteTerminalPrivate::seq_change_highlight_foreground_color_st(vte::parser::Params const& params)
 {
-        change_special_color(params, VTE_HIGHLIGHT_FG, VTE_DEFAULT_BG, "19", ST);
+        change_special_color(params, VTE_HIGHLIGHT_FG, VTE_DEFAULT_BG, 19, ST);
 }
 
 /* Reset the highlight foreground color */