Updated: We now get ansi_type back.

The idea being that we'll be able to somehow know
the color codes around letters (that are part of
words) and somehow magically make that word
"ACT" like a word.

mystic.cpp

@@ -713,9 +713,14 @@ int mangle(int fd, const char *buffer, int len) {
 
   const char replace_with = ' ';
   for (x = 0; x < len; x++) {
-    int ansi = console_char(&console, play[x]);
+    termchar tc = console_char(&console, play[x]);
+    int ansi = tc.in_ansi;
+
     if (ansi) {
       work[x] = replace_with;
+      if (tc.ansi != START) {
+        ZF_LOGD("ANSI type %d at %d", tc.ansi, x );
+      }
     }
     // fixup "work" so it's a valid C string
     if (buffer[x] == 0) {

terminal.cpp

@@ -2,7 +2,7 @@
 Terminal tracking
 
 Actually, I believe I only really need to track the color information.
-Everything else, I'm not sure I really care about.
+Everything else, I'm not sure I really care about.   (NNY!)
 
  */
 
@@ -15,6 +15,7 @@ Everything else, I'm not sure I really care about.
 #include "utils.h"
 #include "zf_log.h"
 
+
 void console_init(struct console_details *cdp) {
   cdp->posx = 0;
   cdp->posy = 0;
@@ -75,7 +76,7 @@ const char *color_restore(struct console_details *cdp) {
   return buffer;
 }
 
-void console_ansi(struct console_details *cdp, const char *ansi) {
+ANSI_TYPE console_ansi(struct console_details *cdp, const char *ansi) {
   int understood = 0;
   const char *cp = ansi;
   const char *last = ansi + strlen(ansi) - 1;
@@ -110,7 +111,7 @@ void console_ansi(struct console_details *cdp, const char *ansi) {
               repr(ansi), number);
         }
         understood = 1;
-        return;
+        return CURSOR;
       case 'B':
         // cursor down
         if (cp == last) {
@@ -126,7 +127,7 @@ void console_ansi(struct console_details *cdp, const char *ansi) {
         cdp->posy += number;
         // check range/"scroll"
         understood = 1;
-        return;
+        return CURSOR;
 
       case 'C':
         // cursor forward
@@ -152,7 +153,7 @@ void console_ansi(struct console_details *cdp, const char *ansi) {
           cdp->posx -= 79;
         }
         understood = 1;
-        return;
+        return CURSOR;
 
       case 'D':
         // cursor backwards
@@ -180,7 +181,7 @@ void console_ansi(struct console_details *cdp, const char *ansi) {
           cdp->posx += 79;
         }
         understood = 1;
-        return;
+        return CURSOR;
 
       case 'H':
         // cursor position
@@ -219,7 +220,7 @@ void console_ansi(struct console_details *cdp, const char *ansi) {
         cdp->posy = number2 - 1;
 
         understood = 1;
-        break;
+        return CURSOR;
 
       case 'J':
         // clear
@@ -235,7 +236,7 @@ void console_ansi(struct console_details *cdp, const char *ansi) {
           cdp->posy = 0;
         };
         understood = 1;
-        break;
+        return CLEAR;
 
       case 'm':
         // color
@@ -261,7 +262,7 @@ void console_ansi(struct console_details *cdp, const char *ansi) {
           }
         }
         understood = 1;
-        break;
+        return COLOR;
 
       case 't':
       case 'r':
@@ -270,18 +271,15 @@ void console_ansi(struct console_details *cdp, const char *ansi) {
         // These are ones that I don't care about.
       case 'n': // This is terminal detect -- give me cursor position
         understood = 1;
-        break;
+        return OTHER;
 
       default:
         // unsure -- possibly not important
         ZF_LOGD("console_ansi( %s ): ???", repr(ansi));
         understood = 0;
+        return OTHER;
       }
     }
-  };
-
-  if (!understood) {
-    ZF_LOGD("console_ansi( %s ): was not understood.", repr(ansi));
   }
 }
 
@@ -289,8 +287,9 @@ void console_ansi(struct console_details *cdp, const char *ansi) {
  * console_char()
  *  return whether or not we are still in_ansi
  */
-int console_char(struct console_details *cdp, char ch) {
+termchar console_char(struct console_details *cdp, char ch) {
   char *cp;
+  termchar tc;
 
   if (cdp->in_ansi) {
     // Ok, append this char
@@ -300,44 +299,54 @@ int console_char(struct console_details *cdp, char ch) {
     *cp = 0;
     if (isalpha(ch)) {
       // Ok!
-      console_ansi(cdp, cdp->ansi);
+      tc.ansi = console_ansi(cdp, cdp->ansi);
       cdp->in_ansi = 0;
       cdp->ansi[0] = 0;
-      return 1;
+      tc.in_ansi = 1;
+      return tc;
     }
-    return 1;
+    tc.ansi = START;
+    tc.in_ansi = 1;
+    return tc;
   } else {
+
+    tc.ansi = START;
+    tc.in_ansi = 0;
+
     if (ch == '\x1b') {
       cp = cdp->ansi;
       *cp = ch;
       cp++;
       *cp = 0;
       cdp->in_ansi = 1;
-      return 1;
+      tc.in_ansi = 1;
+      return tc;
     }
+
+    // should I try reporting MOTION non-ANSI ?
     if (ch == '\r') {
       // Carriage return
       cdp->posx = 0;
-      return 0;
+      return tc;
     }
     if (ch == '\n') {
       cdp->posy++;
       // check range/"scroll"
-      return 0;
+      return tc;
     }
     if (ch == '\b') {
       // Backspace.
       if (cdp->posx > 0) {
         cdp->posx--;
       }
-      return 0;
+      return tc;
     }
     if (ch == '\f') {
       // form feed
       // treat as clear screen
       cdp->posx = 0;
       cdp->posy = 0;
-      return 0;
+      return tc;
     }
 
     /*
@@ -352,7 +361,7 @@ int console_char(struct console_details *cdp, char ch) {
       cdp->posy++;
       // check range/"scroll"
     }
-    return 0;
+    return tc;
   }
 }
 

terminal.h

@@ -13,12 +13,25 @@ struct console_details {
   int status;  // 0, 1 or 5 (Blink)
 };
 
+enum ANSI_TYPE {
+  START,
+  CURSOR,
+  COLOR, 
+  CLEAR,
+  OTHER
+};
+
+struct termchar {
+  int in_ansi;
+  ANSI_TYPE ansi;  // undefined if in_ansi is false
+};
+
 void console_init(struct console_details *cdp);
 void ansi_color(struct console_details *cdp, int color);
 const char *color_restore(struct console_details *cdp);
-void console_ansi(struct console_details *cdp, const char *ansi);
+ANSI_TYPE console_ansi(struct console_details *cdp, const char *ansi);
 
-int console_char(struct console_details *cdp, char ch);
+termchar console_char(struct console_details *cdp, char ch);
 void console_string(struct console_details *cdp, const char *chars);
 void console_receive(struct console_details *cdp, const char *chars, int len);
 #endif