Precompiled headers. Cleaned up boxes (no color)

Pass color to it for boxes and text.

CMakeLists.txt

@@ -36,3 +36,9 @@ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
 ADD_EXECUTABLE( twproxy twproxy.cpp config.cpp session.cpp dispatchers.cpp boxes.cpp )
 TARGET_LINK_LIBRARIES( twproxy ${Boost_LIBRARIES} pthread )
 
+target_precompile_headers(twproxy PRIVATE pch.hpp)
+
+# target_precompile_headers(
+#   twproxy PUBLIC 
+#   ${Boost_INCLUDE/DIR}boost/asio.hpp boost/log/core.hpp boost/log/trivial boost/log/support/date_time.hpp boost/bind.hpp boost/format regex iostream iomapip string map
+# )

boxes.cpp

@@ -1,20 +1,18 @@
 #include "boxes.h"
 
-Boxes::Boxes(int size, int style, int color, bool newline) {
-  size_ = size;
+Boxes::Boxes(int width, int style, bool newline) {
+  width_ = width;
   style_ = style;
-  color_ = color;
   newline_ = newline;
 }
 
 std::string Boxes::top(void) {
   std::string line;
   box_style &bs = boxes[style_];
-  const char *clr = colors[color_];
 
-  line.append(clr);
+  line.append(boxcolor);
   line.append(bs.top_left);
-  for (int x = 0; x < size_; ++x)
+  for (int x = 0; x < width_; ++x)
     line.append(bs.top);
   line.append(bs.top_right);
   line.append(reset);
@@ -26,43 +24,44 @@ std::string Boxes::top(void) {
 std::string Boxes::middle(void) {
   std::string line;
   box_style &bs = boxes[style_];
-  const char *clr = colors[color_];
-  line.append(clr);
+  line.append(boxcolor);
   line.append(bs.middle_left);
-  for (int x = 0; x < size_; ++x)
+  for (int x = 0; x < width_; ++x)
     line.append(bs.top);
   line.append(bs.middle_right);
   line.append(reset);
   if (newline_)
     line.append(nl);
-
   return line;
 }
 
 std::string Boxes::row(std::string &text) {
   std::string line;
   box_style &bs = boxes[style_];
-  const char *clr = colors[color_];
-  line.append(clr);
+  line.append(boxcolor);
   line.append(bs.side);
-  line.append(reset);
+  if (boxcolor != textcolor) {
+    line.append(reset);
+    line.append(textcolor);
+  }
   line.append(text);
-  line.append(clr);
+  if (textcolor != boxcolor) {
+    line.append(reset);
+    line.append(boxcolor);
+  }
   line.append(bs.side);
   line.append(reset);
   if (newline_)
     line.append(nl);
-
   return line;
 }
 
 std::string Boxes::bottom(void) {
   std::string line;
   box_style &bs = boxes[style_];
-  const char *clr = colors[color_];
-  line.append(clr);
+  line.append(boxcolor);
   line.append(bs.bottom_left);
-  for (int x = 0; x < size_; ++x)
+  for (int x = 0; x < width_; ++x)
     line.append(bs.top);
   line.append(bs.bottom_right);
   line.append(reset);
@@ -72,20 +71,15 @@ std::string Boxes::bottom(void) {
   return line;
 }
 
-
-std::tuple<std::string, std::string, std::string>
-Boxes::alert(std::string message, int color, int style, int size) {
- size_t len = size;
-  if (len == 0) {
-    len = message.length();
-  } else {
-    while (message.length() < len)
-    message.append(" ");
-  }
-  Boxes abox(len, style, color);
-  std::string s1, s2, s3;
-  s1 = abox.top();
-  s2 = abox.row(message);
-  s3 = abox.bottom();
-  return std::make_tuple(s1, s2, s3);
+std::array<std::string, 3> Boxes::alert(std::string message, std::string bcolor,
+                                        std::string tcolor, int width,
+                                        int style, bool newline) {
+  std::array<std::string, 3> results;
+  Boxes abox(width, style, newline);
+  abox.boxcolor = bcolor;
+  abox.textcolor = tcolor;
+  results[0] = abox.top();
+  results[1] = abox.row(message);
+  results[2] = abox.bottom();
+  return results;
 }

boxes.h

@@ -2,17 +2,8 @@
 #define BOXES_H
 
 #include <string>
-#include <tuple>
+#include <array>
 
-enum { NORMAL = 0, BRIGHT = 1 } ATTR;
-
-enum {
-
-} FORE;
-
-enum {
-
-} BACK;
 
 /*
 
@@ -37,25 +28,23 @@ class Boxes {
       {"\xd6", "\xb8", "\xcd", "\xb3", "\xd4", "\xbe", "\xc6", "\xb5"},
       {"\xd6", "\xb7", "\xc4", "\xba", "\xd3", "\xbd", "\xc7", "\xb6"}};
   int style_;
-  int color_;
-  int size_;
+  int width_;
   bool newline_;
   const char *nl = "\n\r";
   const char *reset = "\x1b[0m";
-  // Black Red Green Yellow Blue Magenta Cyan White
-  const char *colors[8] = {"\x1b[1;33;40m", "\1b[1;33;41m",  "\x1b[1;33;42m",
-                           "\x1b[1;33;43m", "\x1b[1;33;44m", "\x1b[1;33;45m",
-                           "\x1b[1;33;46m", "\x1b[1;33;47m"};
 
 public:
-  Boxes(int size, int style = 1, int color = 1, bool newline = true);
+  std::string boxcolor;
+  std::string textcolor;
+
+  Boxes(int width, int style = 1, bool newline = true);
   std::string top(void);
   std::string middle(void);
   std::string row(std::string &line);
   std::string bottom(void);
 
-  static std::tuple<std::string, std::string, std::string>
-    alert(std::string message, int color, int style = 1, int size = 0);
+  static std::array<std::string, 3>
+    alert(std::string message, std::string bcolor, std::string tcolor, int width, int style=1, bool newline=true);
   
 };
 

dispatchers.cpp

@@ -15,6 +15,7 @@ const std::string &Dispatch::get_prompt(void) { return sess->get_prompt(); }
 
 void Dispatch::setNotify(notifyFunc nf) { notify_ = nf; }
 
+
 void Dispatch::notify(void) {
   if (notify_) {
     sess->post(notify_);
@@ -39,7 +40,9 @@ void MainDispatch::activate(void) {
   sess->talk_direct = false; // do not auto-send client to server
   count = 0;
   old_prompt = sess->get_prompt();
-  Boxes box(40, 1, 4);
+  Boxes box(40, 1, true);
+  box.boxcolor = "\x1b[1;33;44m";
+  box.textcolor = "\x1b[1;37;44m";
   to_client("\n\r");
   to_client(box.top());
   std::string output = "Proxy ACTIVE! Welcome!";
@@ -62,6 +65,13 @@ void MainDispatch::have_input(void) {
 
   to_client(output);
   if (count >= 5) {
+    auto lines = Boxes::alert(" Returning you to the game... ", "",
+                              "\x1b[1;32m", 30, 1, true);
+    // I'm not setting the box color, so the last color bleeds over.
+    to_client("\x1b[0m");
+    for (auto line : lines) {
+      to_client(line);
+    };
     to_client("Returning you to the game...\n\r");
     deactivate();
   } else {

dispatchers.h

@@ -41,6 +41,12 @@ public:
   void to_client(const std::string &send);
 };
 
+/*
+ * Some options for input:
+ *
+ * numeric only 
+ * 
+ */
 class InputDispatch : public Dispatch {
 private:
   DispatchSettings ds;

pch.hpp

@@ -0,0 +1,13 @@
+
+#pragma once
+#include <boost/asio.hpp>
+#include <boost/log/core.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/log/support/date_time.hpp>
+#include <boost/bind.hpp>
+#include <boost/format.hpp>
+#include <regex>
+#include <iostream>
+#include <iomanip>
+#include <string>
+#include <map>

session.cpp

@@ -42,7 +42,9 @@ void ansi_clean(std::string &str) {
 }
 
 void high_ascii(std::string &str) {
-  static std::regex high_cleaner("[\x80-\xff]+",
+  // the + replaces all of them into one.  I want each high ascii replaced with
+  // #.
+  static std::regex high_cleaner("[\x80-\xff]",
                                  std::regex_constants::ECMAScript);
   str = std::regex_replace(str, high_cleaner, "#");
 }