This fixes horrible ^CS ^CR bug, sometimes fail.

Color Save, Color Restored (sometimes broken)!

Symptom was missing Main Menu top line.
It was in wordplay mangle.  When we divide
the buffer into text/ansi, we were using the
"main" console.  Which we would play the
buffer into *AGAIN* later on.

We now use a copy of console (to split things
up), and play the buffer just once into the
console.  We now NAIL the color everytime!

I [email protected]:666 restore color [4/0/1]

Before this would vary, depending on what was in
the buffer.  It should always be the same because
Mystic prompt and input is always the same color,
which is the last color before CLRSCR.

render.cpp

@@ -239,7 +239,7 @@ void Render::process_trigger(std::string str, size_t &pos) {
       pos++;
       color_history.push_back(term.color_restore());
       // console_history.push_back(console);
-      ZF_LOGI("saved color.");
+      ZF_LOGI("saved color [%s].", term.color_restore().c_str());
       break;
     }
     if (str[pos] == 'R') {
@@ -250,6 +250,7 @@ void Render::process_trigger(std::string str, size_t &pos) {
       }
       std::string restore = color_history.back();
       color_history.pop_back();
+      ZF_LOGI("restored color [%s].", restore.c_str());
       write(fd, restore.c_str(), restore.size());
       break;
     }
@@ -291,7 +292,7 @@ void Render::process_trigger(std::string str, size_t &pos) {
 
   case 'R': {
     i = digit(str, pos);
-    if ((i > 0) && (i < 10)) {
+    if ((i >= 0) && (i < 10)) {
       ZF_LOGI("RENDER %d", i);
       effect = i;
     } else {
@@ -300,7 +301,7 @@ void Render::process_trigger(std::string str, size_t &pos) {
   } break;
   case 'S': {
     i = digit(str, pos);
-    if ((i > 0) && (i < 10)) {
+    if ((i >= 0) && (i < 10)) {
       ZF_LOGI("SPEED %d", i);
       speed = i;
     } else {
@@ -309,7 +310,7 @@ void Render::process_trigger(std::string str, size_t &pos) {
   } break;
   case 'P': {
     i = digit(str, pos);
-    if ((i > 0) && (i < 10)) {
+    if ((i >= 0) && (i < 10)) {
       ZF_LOGI("PAWS %d", i);
       // sleep(i);
       if (!overlimit) {
@@ -650,7 +651,7 @@ void process_trigger(int fd, std::string str, size_t &pos) {
     if (str[pos] == 'S') {
       pos++;
       console_history.push_back(console);
-      ZF_LOGI("saved color.");
+      ZF_LOGI("saved color [%d/%d/%d].", console.fgcolor, console.bgcolor, console.status);
       break;
     }
     if (str[pos] == 'R') {
@@ -662,6 +663,7 @@ void process_trigger(int fd, std::string str, size_t &pos) {
       console_details old_color = console_history.back();
       console_history.pop_back();
       const char *restore = color_restore(&old_color);
+      ZF_LOGI("restore color [%d/%d/%d] %s", old_color.fgcolor, old_color.bgcolor, old_color.status, repr(restore));
       write(fd, restore, strlen(restore));
       break;
     }

terminal.cpp

@@ -59,6 +59,7 @@ bool Terminal::ansiempty(void) { return ansi.empty(); }
 
 void Terminal::ansi_color(int color) {
   // ZF_LOGV("ansi_color(%d)", color);
+
   if (color == 0) {
     this->status = 0;
     this->fgcolor = 7;
@@ -434,7 +435,9 @@ void console_init(struct console_details *cdp) {
  * Figure out fg, bg and status.
  */
 void ansi_color(struct console_details *cdp, int color) {
+  // There are many calls to this.  
   // ZF_LOGV("ansi_color(%d)", color);
+
   if (color == 0) {
     cdp->status = 0;
     cdp->fgcolor = 7;

test-terminal.cpp

@@ -149,6 +149,25 @@ TEST(ConsoleCRNL, NLCRTests) {
   ASSERT_EQ(console.posy, 1);
 }
 
+TEST(ConsoleColor, Colors) {
+  console_init(&console);
+  std::string send("\x1b[0m");
+  console_receive(&console, send);
+  ASSERT_EQ(console.fgcolor, 7);
+  ASSERT_EQ(console.bgcolor, 0);
+  ASSERT_EQ(console.status, 0);  
+  send = "\x1b[1;34m";
+  console_receive(&console, send);
+  ASSERT_EQ(console.fgcolor, 4);
+  ASSERT_EQ(console.bgcolor, 0);
+  ASSERT_EQ(console.status, 1);
+  send = "\x1b[0;44m";
+  console_receive(&console, send);
+  ASSERT_EQ(console.fgcolor, 7);
+  ASSERT_EQ(console.bgcolor, 4);
+  ASSERT_EQ(console.status, 0);  
+}
+
 TEST(Terminal, init) {
   Terminal term;
 

wordplay.cpp

@@ -114,7 +114,8 @@ void harry_idle_event(int fd) {
            << phrases[r] << "^P2^CR^D" << std::setw(2) << strlen(phrases[r]);
     */
     buffer << TRIGGER "CS" TRIGGER "S2" TRIGGER "C" << std::setfill('0')
-           << std::setw(2) << color << selected
+           << std::setw(2) << color
+           << selected
            // Reset SPEED and RENDER
            << TRIGGER "S0" TRIGGER "R0" TRIGGER "P" << pause
            << TRIGGER "CR" TRIGGER "D" << std::setw(2) << selected.size();
@@ -144,6 +145,8 @@ int mangle_clrscr(std::string &buffer, std::string &work, size_t pos) {
   if (!level)
     return 0;
 
+  // Don't activate on the first ANSI_CLS (that's the BBS Version display/login)
+
   if (ANSI_CLS_count > 1) {
 
     // if (random_activate((level + 1) / 2)) {
@@ -237,7 +240,41 @@ int mangle_clrscr(std::string &buffer, std::string &work, size_t pos) {
             homes cursor and changes to another color.  (This can be seen.)
              */
             TRIGGER "G0101" TRIGGER "C07" TRIGGER
-                    "S9Segmentation fault (core dumped)" TRIGGER "P2"};
+                    "S9Segmentation fault (core dumped)" TRIGGER "P2",
+            TRIGGER
+            "G0101" TRIGGER "C07" TRIGGER "S0"
+            "/usr/include/c++/7/bits/basic_string.h:1057: "
+            "std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::reference "
+            "std::__cxx11::basic_string<_CharT, _Traits, "
+            "_Alloc>::operator[](std::__cxx11::basic_string<_CharT, _Traits, "
+            "_Alloc>::size_type) [with _CharT = char; _Traits = "
+            "std::char_traits<char>; _Alloc = std::allocator<char>; "
+            "std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::reference = "
+            "char&; std::__cxx11::basic_string<_CharT, _Traits, "
+            "_Alloc>::size_type = long unsigned int]: Assertion '__pos <= "
+            "size()' failed." TRIGGER "P1"
+            "\r\nAborted (core dumped)" TRIGGER "P2" TRIGGER "S0",
+            TRIGGER "G0101" TRIGGER "C07" TRIGGER "S0"
+                    "/usr/include/c++/7/debug/vector:417:\r\n"
+                    "Error: attempt to subscript container with out-of-bounds "
+                    "index 13, but\r\n"
+                    "container only holds 0 elements.\r\n"
+                    "\r\n"
+                    "Objects involved in the operation:\r\n"
+                    "    sequence \"this\" @ 0x0x7fff43fa94a0 {\r\n"
+                    "      type = "
+                    "std::__debug::vector<std::__cxx11::basic_string<char, "
+                    "std::char_traits<char>, std::allocator<char> >, "
+                    "std::allocator<std::__cxx11::basic_string<char, "
+                    "std::char_traits<char>, std::allocator<char> > > >;\r\n"
+                    "    }\r\n"
+                    "Aborted (core dumped)" TRIGGER "P2" TRIGGER "S0"
+
+        };
+
+        // the Vector error could use some randomness in the element accessed,
+        // as well as how many elements and the memory location.
+
         const int max_phrases = sizeof(phrasing) / sizeof(char *);
         static LastSeen last_phrasing(LastSeen::best_guess(max_phrases));
 
@@ -432,8 +469,12 @@ int mangle(int fd, std::string &buffer) {
   text.clear();
   text_offsets.clear();
 
+  // Don't use console, this for just spliting text and ansi into different
+  // buffers.
+  console_details chew = console;
+
   for (stri = 0; stri < buffer.size(); ++stri) {
-    termchar tc = console_char(&console, work[stri]);
+    termchar tc = console_char(&chew, work[stri]);
 
     if (tc.in_ansi) {
       if (tc.ansi != START) {