Updated: Working panel.update().

ansicolor.cpp

@@ -188,6 +188,20 @@ std::string ANSIColor::output(void) const {
   return clr;
 }
 
+std::string ANSIColor::debug(void) {
+  std::string output;
+  output = "ANSIColor FG";
+  output += std::to_string((int)fg);
+  output += ", BG";
+  output += std::to_string((int)bg);
+  output += ", B";
+  output += std::to_string(bold);
+  output += ", R";
+  output += std::to_string(reset);
+
+  return output;
+}
+
 /**
  * Output only what ANSI attributes and colors have changed.
  * This uses the previous ANSIColor value to determine what

door.cpp

@@ -1009,6 +1009,9 @@ std::ostream &operator<<(std::ostream &os, const Goto &g) {
   return os;
 }
 
+const char SaveCursor[] = "\x1b[s";
+const char RestoreCursor[] = "\x1b[u";
+
 // EXAMPLES
 
 /// BlueYellow Render example function

door.h

@@ -161,6 +161,8 @@ public:
    */
   std::string output(void) const;
 
+  std::string debug(void);
+
   /**
    * @param previous the previous attributes and colors
    * @return std::string
@@ -384,6 +386,9 @@ public:
   friend std::ostream &operator<<(std::ostream &os, const Goto &g);
 };
 
+extern const char SaveCursor[];
+extern const char RestoreCursor[];
+
 /* should we try to derive a base class, so you can have multilines of
  * multilines? */
 
@@ -491,6 +496,8 @@ public:
   void setUpdater(updateFunction uf);
   bool update(void);
 
+  std::string debug(void);
+
   /**
    * @todo This might be a problem, because const Line wouldn't
    * allow me to track "updates".  I.E.  I send the line, I'd
@@ -567,6 +574,19 @@ public:
   void display(void);
   void update(void);
   */
+
+  /**
+   * @brief Updates a panel.
+   *
+   * returns True if something was changed (and cursor has moved)
+   * False, nothing to do, cursor is ok.
+   *
+   * @param d
+   * @return true
+   * @return false
+   */
+  bool update(Door &d);
+
   friend std::ostream &operator<<(std::ostream &os, const Panel &p);
 };
 
@@ -625,6 +645,8 @@ public:
   // makeColorizer(ANSIColor c1, ANSIColor c2, ANSIColor c3, ANSIColor c4);
 };
 
+renderFunction renderStatusValue(ANSIColor state, ANSIColor value);
+
 class Screen {
 private:
   bool hidden;

lines.cpp

@@ -165,6 +165,9 @@ Line::Line(const Line &rhs)
   if (rhs.render) {
     render = rhs.render;
   }
+  if (rhs.updater) {
+    updater = rhs.updater;
+  }
 }
 
 /**
@@ -266,6 +269,20 @@ void Line::setRender(renderFunction rf) { render = rf; }
  */
 void Line::setUpdater(updateFunction newUpdater) { updater = newUpdater; }
 
+std::string Line::debug(void) {
+  std::string desc;
+
+  desc = "Line(";
+  desc += text;
+  desc += "): ";
+  if (updater) {
+    desc += "[U]";
+  }
+  if (render) {
+    desc += "[R]";
+  }
+  return desc;
+}
 /**
  * Call updater, report if the text was actually changed.
  *
@@ -274,6 +291,11 @@ void Line::setUpdater(updateFunction newUpdater) { updater = newUpdater; }
 bool Line::update(void) {
   if (updater) {
     std::string newText = updater();
+    int width = text.length();
+    int need = width - newText.length();
+    if (need > 0) {
+      newText.append(std::string(need, ' '));
+    }
     if (newText != text) {
       text = newText;
       return true;

panel.cpp

@@ -195,6 +195,36 @@ void Panel::update(void) {
 }
 */
 
+bool Panel::update(Door &d) {
+  int row = y;
+  int style = (int)border_style;
+  if (style > 0)
+    ++row;
+
+  bool updated = false;
+
+  for (auto &line : lines) {
+    if (line->update()) {
+      /*
+      std::string output = d.previous.debug();
+      d.log(output);
+
+      output = "update():";
+      output.append(line->debug());
+      d.log(output);
+      */
+      updated = true;
+      int col = x;
+      if (style > 0)
+        ++col;
+      d << door::Goto(col, row);
+      d << *line;
+    }
+    ++row;
+  }
+  return updated;
+}
+
 // operator<< Panel is called to output the Menu.
 // Menu has been massively changed to use Render instead of Colorizer.
 
@@ -382,11 +412,9 @@ void Menu::defaultSelection(int d) { chosen = d; }
 
 /*
 void Menu::setColorizer(bool selected,
-                        std::function<void(Door &d, std::string &)> colorizer) {
-  if (selected)
-    selectedColorizer = colorizer;
-  else
-    unselectedColorizer = colorizer;
+                        std::function<void(Door &d, std::string &)> colorizer)
+{ if (selected) selectedColorizer = colorizer; else unselectedColorizer =
+colorizer;
 }
 */
 
@@ -503,8 +531,9 @@ Menu::makeColorizer(ANSIColor c1, ANSIColor c2, ANSIColor c3, ANSIColor c4) {
  */
 
 /**
- * @todo Fix this, so it only updates the lines that have been changed when the
- * user selects something.  Also, add the "Up/Down Move" maybe to the bottom?
+ * @todo Fix this, so it only updates the lines that have been changed when
+ * the user selects something.  Also, add the "Up/Down Move" maybe to the
+ * bottom?
  *
  * Needs timeout.
  *

test-door.cpp

@@ -86,6 +86,25 @@ TEST_F(DoorTest, ColorOptimizeOut1) {
   d->debug_buffer.clear();
 }
 
+TEST_F(DoorTest, ColorReset1) {
+  door::ANSIColor YonB(door::COLOR::YELLOW, door::COLOR::BLUE,
+                       door::ATTR::BOLD);
+  char Y_ON_B[] = "\x1b[1;33;44m";
+  *d << YonB;
+  EXPECT_STREQ(d->debug_buffer.c_str(), Y_ON_B);
+  d->debug_buffer.clear();
+  *d << door::reset;
+
+  EXPECT_STREQ(d->debug_buffer.c_str(), "\x1b[0m");
+  d->debug_buffer.clear();
+
+  door::ANSIColor WonB(door::COLOR::WHITE, door::COLOR::BLUE, door::ATTR::BOLD);
+  char W_ON_B[] = "\x1b[1;44m";
+  *d << WonB;
+  EXPECT_STREQ(d->debug_buffer.c_str(), W_ON_B);
+  d->debug_buffer.clear();
+}
+
 TEST_F(DoorTest, GotoOutput) {
   door::Goto pos(1, 1);
   *d << pos;