Restructure. Working color render.

deck.cpp

@@ -855,7 +855,7 @@ vector<std::string> deck_colors = {std::string("All"),     std::string("Blue"),
                                    std::string("Magenta"), std::string("Red")};
 /**
  * @brief menu render that sets the text color based on the color found in the
- * text itself.
+ * text itself.  This only finds one color.
  *
  * @param c1 [] brackets
  * @param c2 text within brackets
@@ -940,6 +940,142 @@ door::renderFunction makeColorRender(door::ANSIColor c1, door::ANSIColor c2,
   return render;
 }
 
+/**
+ * @brief menu render that sets the text color based on the color found in the
+ * text itself.  This finds all colors.
+ *
+ * @param c1 [] brackets
+ * @param c2 text within brackets
+ * @param c3 base color give (we set the FG, we use the BG)
+ * @return door::renderFunction
+ */
+door::renderFunction makeColorsRender(door::ANSIColor c1, door::ANSIColor c2,
+                                      door::ANSIColor c3) {
+  door::renderFunction render = [c1, c2,
+                                 c3](const std::string &txt) -> door::Render {
+    door::Render r(txt);
+
+    // find all of the words here
+    std::vector<std::pair<int, int>> words = find_words(txt);
+    auto words_it = words.begin();
+
+    // option is "[?]" part of the string
+    bool option = true;
+
+    // I need this mutable
+    door::ANSIColor textColor = c3;
+    door::ANSIColor normal = c3;
+
+    normal.setFg(door::COLOR::WHITE);
+    bool color_word = false;
+    std::pair<int, int> word_pair;
+
+    // Color update:
+    /*
+    {
+      std::string found;
+
+      for (auto &dc : deck_colors) {
+        if (txt.find(dc) != string::npos) {
+          found = dc;
+          break;
+        }
+      }
+
+      if (!found.empty()) {
+        if (found == "All") {
+          // handle this some other way.
+          textColor.setFg(door::COLOR::WHITE);
+        } else {
+          door::ANSIColor c = stringToANSIColor(found);
+          textColor.setFg(c.getFg());
+        }
+      }
+    }
+   */
+
+    if (get_logger) {
+      get_logger() << "makeColorsRender() " << txt << std::endl;
+      for (auto word : words) {
+        get_logger() << word.first << "," << word.second << std::endl;
+      }
+    }
+
+    int tpos = 0;
+    for (char const &c : txt) {
+      if (option) {
+        if (c == '[' or c == ']') {
+          r.append(c1);
+          if (c == ']')
+            option = false;
+        } else {
+          r.append(c2);
+        }
+      } else {
+        // Ok, we are out of the options now.
+
+        if (color_word) {
+          // we're in a COLOR word.
+          if (tpos < word_pair.first + word_pair.second)
+            r.append(textColor);
+          else {
+            color_word = false;
+            r.append(normal);
+          }
+        } else {
+          // look for COLOR word.
+          while ((words_it != words.end()) and (words_it->first < tpos)) {
+            if (get_logger) {
+              get_logger() << "tpos " << tpos << "(next words_it)" << std::endl;
+            }
+            ++words_it;
+          }
+
+          if (words_it == words.end()) {
+            // we're out.
+            r.append(normal);
+          } else {
+            if (words_it->first == tpos) {
+              // start of word -- check it!
+              std::string color = txt.substr(words_it->first, words_it->second);
+              bool found = false;
+
+              if (!iequals(color, std::string("ALL")))
+                for (auto &dc : deck_colors) {
+                  if (color.find(dc) != string::npos) {
+                    found = true;
+                    break;
+                  }
+                }
+
+              if (get_logger) {
+                get_logger() << "word: [" << color << "] : deck_colors "
+                             << found << " pos: " << tpos
+                             << " word_start: " << words_it->first << std::endl;
+              }
+
+              if (found) {
+                door::ANSIColor c = stringToANSIColor(color);
+                textColor.setFg(c.getFg());
+                word_pair = *words_it;
+                r.append(textColor);
+                color_word = true;
+              } else {
+                r.append(normal);
+              }
+            } else {
+              r.append(normal);
+            }
+          }
+        }
+      }
+      ++tpos;
+    }
+    return r;
+  };
+  return render;
+}
+
 // convert a string to an option
 // an option to the string to store
 // This needs to be updated to use deck_colors.
@@ -1264,11 +1400,11 @@ door::Menu make_deck_menu(void) {
 
   m.setTitle(std::make_unique<door::Line>(mtitle), 1);
 
-  m.setRender(true, makeColorRender(
+  m.setRender(true, makeColorsRender(
                         door::ANSIColor(door::COLOR::CYAN, door::ATTR::BOLD),
                         door::ANSIColor(door::COLOR::BLUE, door::ATTR::BOLD),
                         door::ANSIColor(door::COLOR::CYAN, door::ATTR::BOLD)));
-  m.setRender(false, makeColorRender(
+  m.setRender(false, makeColorsRender(
                          door::ANSIColor(door::COLOR::YELLOW, door::COLOR::BLUE,
                                          door::ATTR::BOLD),
                          door::ANSIColor(door::COLOR::WHITE, door::COLOR::BLUE,
@@ -1281,6 +1417,7 @@ door::Menu make_deck_menu(void) {
     char c = (*iter)[0];
     m.addSelection(c, (*iter).c_str());
   }
+  m.addSelection('S', "Yellow Red Blue Green Cyan");
   /*
   m.addSelection('A', "All");
   m.addSelection('B', "Blue");

deck.h

@@ -10,6 +10,30 @@
 #include <vector>
 
 /*
+https://en.wikipedia.org/wiki/Code_page_437
+
+using: \xb0, 0xb1, 0xb2, 0xdb
+OR: \u2591, \u2592, \u2593, \u2588
+
+Like so:
+
+##### #####
+##### #####
+##### #####
+
+Cards:  (Black on White, or Red on White)
+8D### TH###
+##D## ##H##
+###D8 ###HT
+
+D, H = Red, Clubs, Spades = Black.
+
+^ Where D = Diamonds, H = Hearts
+
+♥, ♦, ♣, ♠
+\x03, \x04, \x05, \x06
+\u2665, \u2666, \u2663, \u2660
+
 I tried card_height = 5, but the cards looked a little too stretched out/tall.
 3 looks good.
 

main.cpp

@@ -23,83 +23,18 @@ door::ANSIColor stringToANSIColor(std::string colorCode);
 std::function<std::ofstream &(void)> get_logger;
 std::function<void(void)> cls_display_starfield;
 
-/*
-unsigned long score = 0;
-int hand = 1;
-int total_hands = 3;
-int card_number = 28;
-int current_streak = 0;
-int best_streak = 0;
-int active_card = 23;
-
-std::chrono::_V2::system_clock::time_point play_day;
-*/
-
-/*
-
-Cards:
-
-4 layers deep.
-
-https://en.wikipedia.org/wiki/Code_page_437
-
-using: \xb0, 0xb1, 0xb2, 0xdb
-OR: \u2591, \u2592, \u2593, \u2588
-
-Like so:
-
-##### #####
-##### #####
-##### #####
-
-Cards:  (Black on White, or Red on White)
-8D### TH###
-##D## ##H##
-###D8 ###HT
-
-D, H = Red, Clubs, Spades = Black.
-
-^ Where D = Diamonds, H = Hearts
-
-♥, ♦, ♣, ♠
-\x03, \x04, \x05, \x06
-\u2665, \u2666, \u2663, \u2660
-
-Card layout.  Actual cards are 3 lines thick.
-
-         ░░░░░             ░░░░░             ░░░░░
-         ░░░░░             ░░░░░             ░░░░░
-      ▒▒▒▒▒░▒▒▒▒▒       #####░#####       #####░#####
-      ▒▒▒▒▒ ▒▒▒▒▒       ##### #####       ##### #####
-   ▓▓▓▓▓▒▓▓▓▓▓▒▓▓▓▓▓ #####=#####=##### #####=#####=#####
-   ▓▓▓▓▓ ▓▓▓▓▓ ▓▓▓▓▓ ##### ##### ##### ##### ##### #####
-█████▓█████▓█████▓#####=#####=#####=#####=#####=#####=#####
-█████ █████ █████ ##### ##### ##### ##### ##### ##### #####
-█████ █████ █████ ##### ##### ##### ##### ##### ##### #####
-
-                           #####
-Player Information         #####        Time in: xx Time out: xx
-Name:                      #####    Playing Day: November 3rd
-Hand Score   :                            Current Streak: N
-Todays Score :      XX Cards Remaining    Longest Streak: NN
-Monthly Score:      Playing Hand X of X   Most Won: xxx Lost: xxx
- [4] Lf [6] Rt  [Space] Play Card [Enter] Draw [D]one [H]elp [R]edraw
-
-►, ◄, ▲, ▼
-\x10, \x11, \x1e, \x1f
-\u25ba, \u25c4, \u25b2, \u25bc
-
-
-The Name is <- 6 to the left.
-
-# is back of card.  = is upper card showing between.
-
-There's no fancy anything here.  Cards overlap the last
-line of the previous line/card.
-
-
+/**
+ * @brief Make renderFunction that colors status: value
+ *
+ * "status:" text is status color, the rest is value color.
+ *
+ * If ":" is not located in the string, text is displayed in status
+ * color, digits are displayed in value color.
+ *
+ * @param status
+ * @param value
+ * @return door::renderFunction
  */
-
 door::renderFunction statusValue(door::ANSIColor status,
                                  door::ANSIColor value) {
   door::renderFunction rf = [status,
@@ -152,39 +87,6 @@ door::renderFunction statusValue(door::ANSIColor status,
   return rf;
 }
 
-/*
-door::renderFunction rStatus = [](const std::string &txt) -> door::Render {
-  door::Render r(txt);
-  door::ColorOutput co;
-
-  // default colors STATUS: value
-  door::ANSIColor status(door::COLOR::BLUE, door::ATTR::BOLD);
-  door::ANSIColor value(door::COLOR::YELLOW, door::ATTR::BOLD);
-
-  co.pos = 0;
-  co.len = 0;
-  co.c = status;
-
-  size_t pos = txt.find(':');
-  if (pos == std::string::npos) {
-    // failed to find - use entire string as status color.
-    co.len = txt.length();
-    r.outputs.push_back(co);
-  } else {
-    pos++; // Have : in status color
-    co.len = pos;
-    r.outputs.push_back(co);
-    co.reset();
-    co.pos = pos;
-    co.c = value;
-    co.len = txt.length() - pos;
-    r.outputs.push_back(co);
-  }
-
-  return r;
-};
-*/
-
 std::string return_current_time_and_date() {
   auto now = std::chrono::system_clock::now();
   auto in_time_t = std::chrono::system_clock::to_time_t(now);
@@ -202,17 +104,6 @@ int press_a_key(door::Door &door) {
   return r;
 }
 
-// DOES THIS WORK?
-bool iequals(const string &a, const string &b) {
-  unsigned int sz = a.size();
-  if (b.size() != sz)
-    return false;
-  for (unsigned int i = 0; i < sz; ++i)
-    if (tolower(a[i]) != tolower(b[i]))
-      return false;
-  return true;
-}
-
 // This does not seem to be working.  I keep getting zero.
 int opt_from_string(std::string colorCode) {
   for (std::size_t pos = 0; pos != deck_colors.size(); ++pos) {

play.cpp

@@ -9,34 +9,15 @@
 #include <sstream>
 
 /**
- * @brief Allow any card to be played on any other card.
+ * @brief This config option allow any card to be played on any other card.
  *
- * This is for testing BONUS and scoring, etc.
+ * This is for testing BONUS and scoring, etc.  This disables saving of streak.
  *
  */
 #define CHEATER "_CHEAT_YOUR_ASS_OFF"
 
-// static std::function<std::ofstream &(void)> get_logger;
-
-/*
-static int press_a_key(door::Door &door) {
-  door << door::reset << "Press a key to continue...";
-  int r = door.sleep_key(door.inactivity);
-  door << door::nl;
-  return r;
-}
-*/
-
-/*
-In the future, this will probably check to see if they can play today or not, as
-well as displaying a calendar to show what days are available to be played.
-
-For now, it will play today.
-*/
-
 PlayCards::PlayCards(door::Door &d, DBData &dbd, std::mt19937 &r)
     : door{d}, db{dbd}, rng{r} {
-  get_logger = [this]() -> ofstream & { return door.log(); };
   init_values();
 
   play_day = std::chrono::system_clock::now();
@@ -83,7 +64,7 @@ PlayCards::PlayCards(door::Door &d, DBData &dbd, std::mt19937 &r)
   */
 }
 
-PlayCards::~PlayCards() { get_logger = nullptr; }
+PlayCards::~PlayCards() {}
 
 void PlayCards::init_values(void) {
   // beware of hand=1 !  We might not be playing the first hand here!

utils.cpp

@@ -1,6 +1,7 @@
 #include "utils.h"
 
 #include <algorithm>
+#include <regex>
 
 bool replace(std::string &str, const std::string &from, const std::string &to) {
   size_t start_pos = str.find(from);
@@ -31,3 +32,33 @@ bool file_exists(const char *name) {
 void string_toupper(std::string &str) {
   std::transform(str.begin(), str.end(), str.begin(), ::toupper);
 }
+
+/**
+ * @brief Case Insensitive std::string compare
+ *
+ * @param a
+ * @param b
+ * @return true
+ * @return false
+ */
+bool iequals(const std::string &a, const std::string &b) {
+  unsigned int sz = a.size();
+  if (b.size() != sz)
+    return false;
+  for (unsigned int i = 0; i < sz; ++i)
+    if (std::tolower(a[i]) != std::tolower(b[i]))
+      return false;
+  return true;
+}
+
+std::vector<std::pair<int, int>> find_words(const std::string &text) {
+  std::vector<std::pair<int, int>> words;
+  std::regex word("([a-zA-Z]+)");
+
+  for (auto it = std::sregex_iterator(text.begin(), text.end(), word);
+       it != std::sregex_iterator(); ++it) {
+
+    words.push_back(std::make_pair(it->position(), it->length()));
+  }
+  return words;
+}

utils.h

@@ -5,6 +5,8 @@
 #include <functional>
 #include <string.h>
 #include <string>
+#include <utility> // pair
+#include <vector>
 
 // utility functions go here
 
@@ -13,6 +15,9 @@ bool replace(std::string &str, const char *from, const char *to);
 bool file_exists(const std::string &name);
 bool file_exists(const char *name);
 void string_toupper(std::string &str);
+bool iequals(const std::string &a, const std::string &b);
+
+std::vector<std::pair<int, int>> find_words(const std::string &text);
 
 // logger access
 extern std::function<std::ofstream &(void)> get_logger;