Fixed Line.setPadding().

It wasn't working before. (Line length would be wrong.)
This has been fixed.  However, before outputting a line,
you need to call Line.fit() to size it to the width.

This is automatically done if you add a line to a panel.

door.cpp

@@ -947,7 +947,7 @@ int Door::get_one_of(const char *keys) {
 
     if (c > 0x1000)
       continue;
-    char *key = strchr(keys, (char)toupper(c));
+    const char *key = strchr(keys, (char)toupper(c));
     if (key != nullptr) {
       return key - keys;
     }
@@ -959,8 +959,8 @@ int Door::get_one_of(const char *keys) {
 /**
  * Take given buffer and output it.
  *
- * This originally stored output in the buffer.  We now directly output
- * via the OpenDoor od_disp_emu.
+ * If debug_capture is enabled, we save everything to debug_buffer.
+ * This is used by the tests.
  *
  * @param s const char *
  * @param n std::streamsize
@@ -977,7 +977,6 @@ std::streamsize Door::xsputn(const char *s, std::streamsize n) {
       std::cout << buffer;
       std::cout.flush();
     }
-    // od_disp_emu(buffer.c_str(), TRUE);
     // Tracking character position could be a problem / local terminal unicode.
     if (track)
       cx += n;
@@ -995,14 +994,6 @@ std::streamsize Door::xsputn(const char *s, std::streamsize n) {
  * @return int
  */
 int Door::overflow(int c) {
-  /*
-  char temp[2];
-  temp[0] = c;
-  temp[1] = 0;
-  */
-
-  // buffer.push_back(c);
-  // od_disp_emu(temp, TRUE);
   if (debug_capture) {
     debug_buffer.append(1, (char)c);
   } else {

door.h

@@ -398,6 +398,8 @@ public:
 extern const char SaveCursor[];
 extern const char RestoreCursor[];
 
+#ifdef EXPERIMENTAL
+
 /* should we try to derive a base class, so you can have multilines of
  * multilines? */
 
@@ -446,6 +448,8 @@ public:
   friend std::ostream &operator<<(std::ostream &os, const MultiLine &l);
 };
 
+#endif
+
 /**
  * @class Line
  * This holds text and ANSIColor information, and knows how to
@@ -471,6 +475,13 @@ private:
   /// updateFunction to use when updating.
   updateFunction updater;
 
+  int width;
+
+  /**
+   * @param width int
+   */
+  // void makeWidth(int width);
+
 public:
   Line(const std::string &txt, int width = 0);
   Line(const char *txt, int width = 0);
@@ -483,10 +494,7 @@ public:
 
   bool hasRender(void);
   int length(void); //  const;
-  /**
-   * @param width int
-   */
-  void makeWidth(int width);
+  void fit(void);
   /**
    * @param padstring std::string &
    * @param padColor ANSIColor
@@ -664,6 +672,8 @@ public:
 
 renderFunction renderStatusValue(ANSIColor state, ANSIColor value);
 
+#ifdef EXPERIMENTAL
+
 class Screen {
 private:
   bool hidden;
@@ -680,6 +690,8 @@ public:
   friend std::ostream &operator<<(std::ostream &os, const Screen &s);
 };
 
+#endif
+
 /*
 screen - contains panels.
   - default to 1,1 X 80,24

lines.cpp

@@ -3,6 +3,8 @@
 
 namespace door {
 
+#ifdef EXPERIMENTAL
+
 BasicLine::BasicLine(std::string txt) : text{txt}, hasColor{false} {}
 
 BasicLine::BasicLine(std::string txt, ANSIColor c)
@@ -102,6 +104,8 @@ std::ostream &operator<<(std::ostream &os, const MultiLine &ml) {
   return os;
 }
 
+#endif
+
 /**
  * Construct a new Line:: Line object with
  * string and total width.
@@ -109,36 +113,28 @@ std::ostream &operator<<(std::ostream &os, const MultiLine &ml) {
  * @param txt std::string
  * @param width int
  */
-Line::Line(const std::string &txt, int width) : text{txt} {
-  if (width)
-    makeWidth(width);
+Line::Line(const std::string &txt, int w) : text{txt}, width{w} {
   hasColor = false;
 }
 
-Line::Line(const std::string &txt, int width, ANSIColor c)
-    : text{txt}, color{c} {
-  if (width)
-    makeWidth(width);
+Line::Line(const std::string &txt, int w, ANSIColor c)
+    : text{txt}, color{c}, width{w} {
+
   hasColor = true;
 }
 
-Line::Line(const char *txt, int width, ANSIColor c) : text{txt}, color{c} {
-  if (width)
-    makeWidth(width);
+Line::Line(const char *txt, int w, ANSIColor c)
+    : text{txt}, color{c}, width{w} {
   hasColor = true;
 }
 
-Line::Line(const std::string &txt, int width, renderFunction rf)
-    : text{txt}, render{rf} {
-  if (width)
-    makeWidth(width);
+Line::Line(const std::string &txt, int w, renderFunction rf)
+    : text{txt}, render{rf}, width{w} {
   hasColor = false;
 }
 
-Line::Line(const char *txt, int width, renderFunction rf)
-    : text{txt}, render{rf} {
-  if (width)
-    makeWidth(width);
+Line::Line(const char *txt, int w, renderFunction rf)
+    : text{txt}, render{rf}, width{w} {
   hasColor = false;
 }
 
@@ -149,11 +145,7 @@ Line::Line(const char *txt, int width, renderFunction rf)
  * @param txt const char *
  * @param width int
  */
-Line::Line(const char *txt, int width) : text{txt} {
-  if (width)
-    makeWidth(width);
-  hasColor = false;
-}
+Line::Line(const char *txt, int w) : text{txt}, width{w} { hasColor = false; }
 
 /**
  * Construct a new Line:: Line object from an
@@ -170,6 +162,7 @@ Line::Line(const Line &rhs)
   if (rhs.updater) {
     updater = rhs.updater;
   }
+  width = rhs.width;
 }
 
 /**
@@ -214,13 +207,15 @@ int Line::length(void) {
  *
  * @param width int
  */
-void Line::makeWidth(int width) {
+void Line::fit(void) {
   int need;
   if (door::unicode)
     need = width - utf8::distance(text.begin(), text.end());
   else
     need = width - text.length();
 
+  need -= padding.length() * 2;
+
   if (need > 0) {
     text.append(std::string(need, ' '));
   }
@@ -309,15 +304,17 @@ std::string Line::debug(void) {
 bool Line::update(void) {
   if (updater) {
     std::string newText = updater();
-    int width;
+    // int line_len;
     int need;
     if (unicode) {
-      width = utf8::distance(text.begin(), text.end());
+      // line_len = utf8::distance(text.begin(), text.end());
       need = width - utf8::distance(newText.begin(), newText.end());
     } else {
-      width = text.length();
+      // line_len = text.length();
       need = width - newText.length();
     }
+
+    need -= padding.length() * 2;
     if (need > 0) {
       newText.append(std::string(need, ' '));
     }

panel.cpp

@@ -72,7 +72,10 @@ void Panel::setColor(ANSIColor c) { border_color = c; }
 
 void Panel::hide(void) { hidden = true; }
 void Panel::show(void) { hidden = false; }
-void Panel::addLine(std::unique_ptr<Line> l) { lines.push_back(std::move(l)); }
+void Panel::addLine(std::unique_ptr<Line> l) {
+  l->fit();
+  lines.push_back(std::move(l));
+}
 // or possibly std::move(l)); }
 
 /*
@@ -718,6 +721,8 @@ int Menu::choose(Door &door) {
   return 0;
 }
 
+#ifdef EXPERIMENTAL
+
 Screen::Screen() { hidden = false; }
 
 /*
@@ -742,4 +747,6 @@ std::ostream &operator<<(std::ostream &os, const Screen &s) {
   return os;
 }
 
+#endif
+
 } // namespace door