Working InputDispatch.

CMakeLists.txt

@@ -65,7 +65,7 @@ add_test(NAME test-galaxy
 
 
 # dispatchers.cpp 
-ADD_EXECUTABLE( twproxy twproxy.cpp utils.cpp session.cpp boxes.cpp director.cpp galaxy.cpp )
+ADD_EXECUTABLE( twproxy twproxy.cpp utils.cpp session.cpp boxes.cpp director.cpp galaxy.cpp dispatchers.cpp )
 TARGET_LINK_LIBRARIES( twproxy ${Boost_LIBRARIES} pthread yaml-cpp)
 
 target_precompile_headers(twproxy PRIVATE pch.hpp)

director.cpp

@@ -1,8 +1,9 @@
 #include "director.h"
+#include <boost/format.hpp>
+#include "boxes.h"
 #include "galaxy.h"
 #include "logging.h"
 #include "utils.h"
-#include "boxes.h"
 
 Director::Director() {
   BUGZ_LOG(warning) << "Director::Director()";
@@ -15,6 +16,7 @@ Director::Director() {
   // reset everything back to good state
   talk_direct = true;
   show_client = true;
+  count = 0;
 }
 
 Director::~Director() { BUGZ_LOG(warning) << "Director::~Director()"; }
@@ -22,12 +24,16 @@ Director::~Director() { BUGZ_LOG(warning) << "Director::~Director()"; }
 void Director::client_input(const std::string &input) {
   // If we're already active, don't try to activate.
 
+  if (chain) {
+    chain->client_input(input);
+    return;
+  }
+  
   if (active) {
-    if( input == "Q" || input == "q") 
-      proxy_deactivate();
+    if (input == "Q" || input == "q") proxy_deactivate();
     return;
-  } else   if (input == "\x1b" || input == "~") {
-    std::string &prompt = current_prompt; 
+  } else if (input == "\x1b" || input == "~") {
+    std::string &prompt = current_prompt;
     BUGZ_LOG(trace) << "CI: ACTIVATE prompt shows: [" << prompt << "]";
 
     if (prompt == "Selection (? for menu): ") {
@@ -90,6 +96,7 @@ void Director::client_input(const std::string &input) {
   if (emit_client_input)
     emit_client_input(line);
   */
+
 }
 
 void Director::server_line(const std::string &line) {
@@ -120,15 +127,20 @@ void Director::server_line(const std::string &line) {
     emit_server_line(line);
   }
    */
+  if (chain) {
+    chain->server_line(line);
+  }
 }
 
-void Director::server_prompt(const std::string &prompt, const std::string &raw_prompt) {
+void Director::server_prompt(const std::string &prompt,
+                             const std::string &raw_prompt) {
   current_prompt = prompt;
   current_raw_prompt = raw_prompt;
   /*
   if (emit_server_prompt)
     emit_server_prompt(prompt);
    */
+  if (chain) chain->server_prompt(prompt);
 }
 
 void Director::proxy_activate(void) {
@@ -160,6 +172,32 @@ void Director::proxy_activate(void) {
   to_client(box.row(output));
   to_client(box.bottom());
 
+  std::shared_ptr<Dispatch> readline = std::make_shared<InputDispatch>(*this);
+  chain = readline;
+  InputDispatch *id = static_cast<InputDispatch *>(&(*readline));
+  id->prompt = "\x1b[0m    \x1b[1;33;44m-=>\x1b[0m \x1b[1;37;44m";
+  id->max_length = 15;
+  id->setNotify([this]() { this->have_input(); });
+  readline->activate();
+}
+
+void Director::have_input(void) {
+  ++count;
+  InputDispatch *id = dynamic_cast<InputDispatch *>(&(*chain));
+  if (id) {
+    std::string output =
+        str(boost::format("Your Input (%2%): [%1%]\n\r") % id->input % count);
+    to_client("\x1b[0m");
+    to_client(output);
+  } else {
+    proxy_deactivate();
+    return;
+  }
+  if (count > 3) {
+    proxy_deactivate();
+  } else {
+    chain->activate();
+  }
 }
 
 void Director::proxy_deactivate(void) {
@@ -171,7 +209,7 @@ void Director::proxy_deactivate(void) {
   current_prompt = old_prompt;
   current_raw_prompt = old_raw_prompt;
   */
-
+  chain.reset();
   to_client("\n\r");
   to_client(current_raw_prompt);
 }

director.h

@@ -1,7 +1,12 @@
+#ifndef DIRECTOR_H
+#define DIRECTOR_H
 #include "session_common.h"
 
+class Dispatch;
+
 class Director {
  public:
+  std::shared_ptr<Dispatch> chain;
   StringFunc to_client;
   StringFunc to_server;
   // void Session::post(notifyFunc nf)
@@ -37,6 +42,9 @@ class Director {
   Director();
   ~Director();
 
+  void have_input(void);
+  int count;
+  
  private:
   StringFunc SL_parser;
   void SL_cimline(const std::string &line);
@@ -45,3 +53,7 @@ class Director {
   void SL_portline(const std::string &line);
   void SL_warpline(const std::string &line);
 };
+
+#include "dispatchers.h"
+
+#endif

dispatchers.cpp

@@ -1,44 +1,65 @@
+#include "dispatchers.h"
+
 #include <boost/format.hpp>
 #include <cctype>
 
 #include "boxes.h"
-#include "dispatchers.h"
 #include "logging.h"
 
-Dispatch::Dispatch(Session *s) : sess{s} {};
-
+Dispatch::Dispatch(Director &d) : director{d} {};
 Dispatch::~Dispatch(){};
 
-void Dispatch::to_server(const std::string &send) { sess->to_server(send); }
-void Dispatch::to_client(const std::string &send) { sess->to_client(send); }
-const std::string &Dispatch::get_prompt(void) { return sess->get_prompt(); }
+void Dispatch::to_server(const std::string &send) { director.to_server(send); }
+void Dispatch::to_client(const std::string &send) { director.to_client(send); }
+const std::string &Dispatch::get_prompt(void) {
+  return director.current_prompt;
+}
 
 void Dispatch::setNotify(notifyFunc nf) { notify_ = nf; }
 
 void Dispatch::notify(void) {
-  if (notify_) {
-    sess->post(notify_);
-    notify_ = nullptr;
+  if (director.post) {
+    director.post(notify_);
+  }
+}
+
+void Dispatch::chain_client_input(const std::string &input) {
+  if (chain) {
+    chain->chain_client_input(input);
+  } else {
+    client_input(input);
+  }
+}
+
+void Dispatch::chain_server_line(const std::string &line) {
+  if (chain) {
+    chain->chain_server_line(line);
+  } else {
+    server_line(line);
   }
 }
 
-MainDispatch::MainDispatch(Session *s) : Dispatch{s}, id{s}, md{s} {
+void Dispatch::chain_server_prompt(const std::string &prompt) {
+  if (chain) {
+    chain->chain_server_prompt(prompt);
+  } else {
+    server_prompt(prompt);
+  }
+}
+
+void Dispatch::server_line(const std::string &line) {}
+void Dispatch::server_prompt(const std::string &prompt) {}
+void Dispatch::client_input(const std::string &input) {}
+
+MainDispatch::MainDispatch(Director &d) : Dispatch{d}, id{d}, md{d} {
   BUGZ_LOG(warning) << "MainDispatch()";
 }
 
 MainDispatch::~MainDispatch() { BUGZ_LOG(warning) << "~MainDispatch()"; }
 
 void MainDispatch::activate(void) {
-  // how to set this event to our method?
-  sess->emit_server_line = [this](const std::string &s) { server_line(s); };
-  sess->emit_server_prompt = [this](const std::string &s) { server_prompt(s); };
-  sess->emit_client_input = nullptr;
-  // sess->emit_client_input = [this](const std::string &s) { client_input(s);
-  // };
-  sess->show_client = false; // don not auto-send server to client
-  sess->talk_direct = false; // do not auto-send client to server
   count = 0;
-  old_prompt = sess->get_prompt();
+  old_prompt = get_prompt();
 
   /*
   ╔══════════════════════════════╗
@@ -86,10 +107,11 @@ void MainDispatch::have_input(void) {
 
     // md.menu_prompt = "\x1b[0;31;47m\xdb\xb2\xb1\xb0\x1b[0;30;47m RED
     // GREEN\x1b[37;42m\xdb\xb2\xb1\xb0\x1b[0m : ";
-    const char *CP437_GRADIENT = "\xdb\xb2\xb1\xb0 "; // 100, 75, 50, 25, 0
+    const char *CP437_GRADIENT = "\xdb\xb2\xb1\xb0 ";  // 100, 75, 50, 25, 0
 
-    md.menu_prompt = "\x1b[0;31;40m\xdb\xb2\xb1\xb0 \x1b[31;40mRED "
-                     "\x1b[32;40mGREEN\x1b[30;42m\xdb\xb2\xb1\xb0 \x1b[0m : ";
+    md.menu_prompt =
+        "\x1b[0;31;40m\xdb\xb2\xb1\xb0 \x1b[31;40mRED "
+        "\x1b[32;40mGREEN\x1b[30;42m\xdb\xb2\xb1\xb0 \x1b[0m : ";
     md.lazy = true;
     md.menu = {{"A", "Apple"}, {"B", "Blue"}, {"R", "Rabbit"}, {"Z", "ZOOO!"}};
     md.setNotify([this]() { this->menu_choice(); });
@@ -138,12 +160,9 @@ void MainDispatch::menu_choice(void) {
 
 void MainDispatch::deactivate(void) {
   // Since we're the main thing there --
-  sess->emit_server_line = nullptr;
-  sess->emit_server_prompt = nullptr;
-  sess->emit_client_input = nullptr;
-  sess->show_client = true;
-  sess->talk_direct = true;
-  sess->set_prompt(old_prompt);
+  // sess->show_client = true;
+  // sess->talk_direct = true;
+
   notify();
 }
 
@@ -161,7 +180,7 @@ void MainDispatch::server_prompt(const std::string &prompt) {
 #ifdef NEVERMORE
 void MainDispatch::client_input(const std::string &input) {
   // I don't care what the old prompt looked liked at this point.
-  BUGZ_LOG(warning) << "Got: " << input; //  << " prompt=" << get_prompt();
+  BUGZ_LOG(warning) << "Got: " << input;  //  << " prompt=" << get_prompt();
 
   // Serious problem when the input = "\x1b" ESC.  The output gets gummed/locked
   // up.
@@ -179,34 +198,24 @@ void MainDispatch::client_input(const std::string &input) {
 }
 #endif
 
-InputDispatch::InputDispatch(Session *s) : Dispatch(s) {
+InputDispatch::InputDispatch(Director &d) : Dispatch(d) {
   BUGZ_LOG(warning) << "InputDispatch()";
 }
 
 InputDispatch::~InputDispatch() { BUGZ_LOG(warning) << "~InputDispatch()"; }
 
 void InputDispatch::activate(void) {
-  ds = sess->save_settings();
-  sess->emit_server_line = [this](const std::string &s) { server_line(s); };
-  sess->emit_server_prompt =
-      nullptr; // [this](const std::string &s) { server_prompt(s); };
-  sess->emit_client_input = [this](const std::string &s) { client_input(s); };
-  sess->show_client = false; // don not auto-send server to client
-  sess->talk_direct = false; // do not auto-send client to server
-
   input.clear();
   to_client(prompt);
 }
 
-void InputDispatch::deactivate(void) {
-  sess->restore_settings(ds);
-  notify();
-}
+void InputDispatch::deactivate(void) { notify(); }
 
 void InputDispatch::server_line(const std::string &line) {}
 // void InputDispatch::server_prompt(const std::string &prompt) {}
 
 void InputDispatch::client_input(const std::string &cinput) {
+  // BUGZ_LOG(info) << "InputDispatch::client_input(" << cinput << ")";
   for (const char ch : cinput) {
     if (isprint(ch)) {
       // Ok!
@@ -239,7 +248,7 @@ void InputDispatch::client_input(const std::string &cinput) {
  *
  */
 
-MenuDispatch::MenuDispatch(Session *s) : Dispatch{s} {
+MenuDispatch::MenuDispatch(Director &d) : Dispatch(d) {
   BUGZ_LOG(warning) << "MenuDispatch()";
 }
 
@@ -252,11 +261,6 @@ void MenuDispatch::activate(void) {
   BUGZ_LOG(warning) << "MenuDispatch::activate() " << max_width << ", "
                     << max_option_width;
 
-  ds = sess->save_settings();
-  sess->emit_server_line = [this](const std::string &s) { server_line(s); };
-  sess->emit_server_prompt = nullptr;
-  sess->emit_client_input = [this](const std::string &s) { client_input(s); };
-
   if (lazy)
     menubox();
   else
@@ -264,10 +268,7 @@ void MenuDispatch::activate(void) {
   to_client(menu_prompt);
 }
 
-void MenuDispatch::deactivate(void) {
-  sess->restore_settings(ds);
-  notify();
-}
+void MenuDispatch::deactivate(void) { notify(); }
 
 void MenuDispatch::help(void) {
   size_t max = max_width;
@@ -283,8 +284,7 @@ void MenuDispatch::help(void) {
       text.append(menu_item.first);
       text.append(" - ");
       text.append(menu_item.second);
-      while (text.length() < max)
-        text.append(1, ' ');
+      while (text.length() < max) text.append(1, ' ');
       to_client(mbox.row(text));
     }
     to_client(mbox.bottom());
@@ -303,8 +303,7 @@ void MenuDispatch::help(void) {
       text.append(menu_item.first);
       text.append(" - ");
       text.append(menu_item.second);
-      while (text.length() < max)
-        text.append(1, ' ');
+      while (text.length() < max) text.append(1, ' ');
       to_client(mbox.row(text));
     }
     to_client(mbox.bottom());
@@ -320,8 +319,7 @@ std::string MenuDispatch::centered(int length, const std::string &s) {
     text.append(count, ' ');
   }
 
-  if (leftovers % 1 == 1)
-    text.append(1, ' ');
+  if (leftovers % 1 == 1) text.append(1, ' ');
   return text;
 }
 
@@ -353,8 +351,7 @@ void MenuDispatch::calculate_widths(void) {
   for (auto key : menu) {
     size_t menu_line_length =
         1 + key.first.length() + 3 + key.second.length() + 1;
-    if (menu_line_length > max_width)
-      max_width = menu_line_length;
+    if (menu_line_length > max_width) max_width = menu_line_length;
     if (key.first.length() > max_option_width)
       max_option_width = key.first.length();
   }
@@ -370,8 +367,7 @@ void MenuDispatch::client_input(const std::string &cinput) {
 
     if (ch == '\r') {
       // enter
-      if (instant)
-        return;
+      if (instant) return;
 
       for (auto const mnu : menu) {
         if (mnu.first == input) {
@@ -386,7 +382,7 @@ void MenuDispatch::client_input(const std::string &cinput) {
         to_client("\b \b");
         input.erase(input.length() - 1);
       }
-      return; // don't continue ...
+      return;  // don't continue ...
     }
 
     if (ch == '\x1b') {
@@ -409,7 +405,7 @@ void MenuDispatch::client_input(const std::string &cinput) {
     }
 
     if (ch == '?') {
-      to_client(cinput); // display what they entered.
+      to_client(cinput);  // display what they entered.
       to_client("\x1b[0m\n\r");
       help();
       to_client(menu_prompt);
@@ -418,8 +414,7 @@ void MenuDispatch::client_input(const std::string &cinput) {
 
     if (isprint(ch)) {
       char c = ch;
-      if (!case_sensitive)
-        c = toupper(ch);
+      if (!case_sensitive) c = toupper(ch);
 
       // ok, it's a printable character
       if (input.length() < max_option_width) {
@@ -445,7 +440,7 @@ void MenuDispatch::client_input(const std::string &cinput) {
  * CoreDispatch:  This is an example class that does dispatch.
  * Copy this and make changes from there...
  */
-CoreDispatch::CoreDispatch(Session *s) : Dispatch{s} {
+CoreDispatch::CoreDispatch(Director &d) : Dispatch(d) {
   BUGZ_LOG(warning) << "CoreDispatch()";
 }
 

dispatchers.h

@@ -2,8 +2,10 @@
 #define DISPATCHERS_H
 
 #include <map>
+#include <memory>
 #include <string>
 
+#include "director.h"
 #include "session_common.h"
 
 /*
@@ -22,15 +24,14 @@ possibly:  io_service::post( DONE );  !
 
  */
 
-class Session;
-
 class Dispatch {
-protected:
-  Session *sess;
+ protected:
+  Director &director;
   notifyFunc notify_;
+  std::shared_ptr<Dispatch> chain;
 
-public:
-  Dispatch(Session *);
+ public:
+  Dispatch(Director &);
   virtual ~Dispatch();
 
   void setNotify(notifyFunc nf);
@@ -42,20 +43,26 @@ public:
   const std::string &get_prompt(void);
   void to_server(const std::string &send);
   void to_client(const std::string &send);
+
+  // default to chain calls
+  void chain_client_input(const std::string &input);
+  void chain_server_line(const std::string &line);
+  void chain_server_prompt(const std::string &prompt);
+  virtual void client_input(const std::string &input);
+  virtual void server_line(const std::string &line);
+  virtual void server_prompt(const std::string &prompt);
 };
 
 /*
  * Some options for input:
  *
- * numeric only 
- * 
+ * numeric only
+ *
  */
 class InputDispatch : public Dispatch {
-private:
-  DispatchSettings ds;
-
-public:
-  InputDispatch(Session *);
+ private:
+ public:
+  InputDispatch(Director &);
   ~InputDispatch();
 
   std::string prompt;
@@ -66,14 +73,13 @@ public:
   void deactivate(void) override;
 
   // optional here
-  void server_line(const std::string &line);
+  void server_line(const std::string &line) override;
   // void server_prompt(const std::string &prompt);
-  void client_input(const std::string &cinput);
+  void client_input(const std::string &cinput) override;
 };
 
 class MenuDispatch : public Dispatch {
-private:
-  DispatchSettings ds;
+ private:
   void help(void);
   void menubox(void);
   size_t max_width;
@@ -82,8 +88,8 @@ private:
   void calculate_widths(void);
   std::string centered(int length, const std::string &);
 
-public:
-  MenuDispatch(Session *);
+ public:
+  MenuDispatch(Director &);
   ~MenuDispatch();
 
   std::string menu_box_color;
@@ -101,9 +107,9 @@ public:
   void deactivate(void) override;
 
   // optional here
-  void server_line(const std::string &line);
+  void server_line(const std::string &line) override;
   // void server_prompt(const std::string &prompt);
-  void client_input(const std::string &cinput);
+  void client_input(const std::string &cinput) override;
 };
 
 /**
@@ -116,12 +122,12 @@ public:
  */
 
 class MainDispatch : public Dispatch {
-private:
+ private:
   InputDispatch id;
   MenuDispatch md;
 
-public:
-  MainDispatch(Session *);
+ public:
+  MainDispatch(Director &);
   ~MainDispatch();
 
   void activate(void) override;
@@ -130,28 +136,26 @@ public:
   void have_input(void);
   void menu_choice(void);
 
-  void server_line(const std::string &line);
-  void server_prompt(const std::string &prompt);
+  void server_line(const std::string &line) override;
+  void server_prompt(const std::string &prompt) override;
   // void client_input(const std::string &input);
 
-private:
+ private:
   int count;
   std::string old_prompt;
 };
 
 class CoreDispatch : public Dispatch {
-public:
-  CoreDispatch(Session *);
+ public:
+  CoreDispatch(Director &);
 
   void activate(void) override;
   void deactivate(void) override;
 
   // optional here
-  void server_line(const std::string &line);
-  void server_prompt(const std::string &prompt);
-  void client_input(const std::string &input);
+  void server_line(const std::string &line) override;
+  void server_prompt(const std::string &prompt) override;
+  void client_input(const std::string &input) override;
 };
 
-#include "session.h"
-
 #endif