Fix documentation of NO_MANIFESTS (oops).

[u/mdw/putty] / terminal.c

diff --git a/terminal.c b/terminal.c
index cd175ba..432ed93 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -2677,22 +2677,16 @@ static void term_out(Terminal *term)
                 */
                compatibility(ANSIMIN);
                if (term->ldisc) {
-                   char abuf[256], *s, *d;
-                   int state = 0;
-                   for (s = term->cfg.answerback, d = abuf; *s; s++) {
-                       if (state) {
-                           if (*s >= 'a' && *s <= 'z')
-                               *d++ = (*s - ('a' - 1));
-                           else if ((*s >= '@' && *s <= '_') ||
-                                    *s == '?' || (*s & 0x80))
-                               *d++ = ('@' ^ *s);
-                           else if (*s == '~')
-                               *d++ = '^';
-                           state = 0;
-                       } else if (*s == '^') {
-                           state = 1;
-                       } else
-                           *d++ = *s;
+                   char abuf[lenof(term->cfg.answerback)], *s, *d;
+                   for (s = term->cfg.answerback, d = abuf; *s;) {
+                       char *n;
+                       char c = ctrlparse(s, &n);
+                       if (n) {
+                           *d++ = c;
+                           s = n;
+                       } else {
+                           *d++ = *s++;
+                       }
                    }
                    lpage_send(term->ldisc, DEFAULT_CODEPAGE,
                               abuf, d - abuf, 0);
@@ -6271,3 +6265,17 @@ void term_set_focus(Terminal *term, int has_focus)
     term->has_focus = has_focus;
     term_schedule_cblink(term);
 }
+
+/*
+ * Provide "auto" settings for remote tty modes, suitable for an
+ * application with a terminal window.
+ */
+char *term_get_ttymode(Terminal *term, const char *mode)
+{
+    char *val = NULL;
+    if (strcmp(mode, "ERASE") == 0) {
+       val = term->cfg.bksp_is_delete ? "^?" : "^H";
+    }
+    /* FIXME: perhaps we should set ONLCR based on cfg.lfhascr as well? */
+    return dupstr(val);
+}