Work around lcc's annoying (but, even more annoyingly, legitimate)

[u/mdw/putty] / terminal.c

diff --git a/terminal.c b/terminal.c
index ea5f503..eaaa04d 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -1017,6 +1017,21 @@ static termline *lineptr(Terminal *term, int y, int lineno, int screen)
     }
 
     /* We assume that we don't screw up and retrieve something out of range. */
+    if (line == NULL) {
+       fatalbox("line==NULL in terminal.c\n"
+                "lineno=%d y=%d w=%d h=%d\n"
+                "count(scrollback=%p)=%d\n"
+                "count(screen=%p)=%d\n"
+                "count(alt=%p)=%d alt_sblines=%d\n"
+                "whichtree=%p treeindex=%d\n\n"
+                "Please contact <putty@projects.tartarus.org> "
+                "and pass on the above information.",
+                lineno, y, term->cols, term->rows,
+                term->scrollback, count234(term->scrollback),
+                term->screen, count234(term->screen),
+                term->alt_screen, count234(term->alt_screen), term->alt_sblines,
+                whichtree, treeindex);
+    }
     assert(line != NULL);
 
     resizeline(term, line, term->cols);
@@ -1955,27 +1970,27 @@ static void scroll_display(Terminal *term, int topline, int botline, int lines)
     if (lines > 0) {
        for (i = 0; i < nlines; i++)
            for (j = 0; j < term->cols; j++)
-               copy_termchar(term->disptext[start+i], j,
-                             term->disptext[start+i+distance]->chars+j);
+               copy_termchar(term->disptext[i], j,
+                             term->disptext[i+distance]->chars+j);
        if (term->dispcursy >= 0 &&
            term->dispcursy >= topline + distance &&
            term->dispcursy < topline + distance + nlines)
            term->dispcursy -= distance;
        for (i = 0; i < distance; i++)
            for (j = 0; j < term->cols; j++)
-               term->disptext[start+nlines+i]->chars[j].attr |= ATTR_INVALID;
+               term->disptext[nlines+i]->chars[j].attr |= ATTR_INVALID;
     } else {
        for (i = nlines; i-- ;)
            for (j = 0; j < term->cols; j++)
-               copy_termchar(term->disptext[start+i+distance], j,
-                             term->disptext[start+i]->chars+j);
+               copy_termchar(term->disptext[i+distance], j,
+                             term->disptext[i]->chars+j);
        if (term->dispcursy >= 0 &&
            term->dispcursy >= topline &&
            term->dispcursy < topline + nlines)
            term->dispcursy += distance;
        for (i = 0; i < distance; i++)
            for (j = 0; j < term->cols; j++)
-               term->disptext[start+i]->chars[j].attr |= ATTR_INVALID;
+               term->disptext[i]->chars[j].attr |= ATTR_INVALID;
     }
     save_scroll(term, topline, botline, lines);
 }
@@ -2608,12 +2623,19 @@ static void term_out(Terminal *term)
            }
        }
 
-       /* How about C1 controls ? */
+       /*
+        * How about C1 controls? 
+        * Explicitly ignore SCI (0x9a), which we don't translate to DECID.
+        */
        if ((c & -32) == 0x80 && term->termstate < DO_CTRLS &&
            !term->vt52_mode && has_compat(VT220)) {
-           term->termstate = SEEN_ESC;
-           term->esc_query = FALSE;
-           c = '@' + (c & 0x1F);
+           if (c == 0x9a)
+               c = 0;
+           else {
+               term->termstate = SEEN_ESC;
+               term->esc_query = FALSE;
+               c = '@' + (c & 0x1F);
+           }
        }
 
        /* Or the GL control. */
@@ -2633,13 +2655,12 @@ static void term_out(Terminal *term)
        if ((c & ~0x1F) == 0 && term->termstate < DO_CTRLS) {
            switch (c) {
              case '\005':             /* ENQ: terminal type query */
-               /* Strictly speaking this is VT100 but a VT100 defaults to
+               /* 
+                * Strictly speaking this is VT100 but a VT100 defaults to
                 * no response. Other terminals respond at their option.
                 *
                 * Don't put a CR in the default string as this tends to
                 * upset some weird software.
-                *
-                * An xterm returns "xterm" (5 characters)
                 */
                compatibility(ANSIMIN);
                if (term->ldisc) {
@@ -3510,7 +3531,7 @@ static void term_out(Terminal *term)
                                  case 95:
                                  case 96:
                                  case 97:
-                                   /* xterm-style bright foreground */
+                                   /* aixterm-style bright foreground */
                                    term->curr_attr &= ~ATTR_FGMASK;
                                    term->curr_attr |=
                                        ((term->esc_args[i] - 90 + 8)
@@ -3541,7 +3562,7 @@ static void term_out(Terminal *term)
                                  case 105:
                                  case 106:
                                  case 107:
-                                   /* xterm-style bright background */
+                                   /* aixterm-style bright background */
                                    term->curr_attr &= ~ATTR_BGMASK;
                                    term->curr_attr |=
                                        ((term->esc_args[i] - 100 + 8)
@@ -3798,7 +3819,7 @@ static void term_out(Terminal *term)
                            }
                        }
                        break;
-                     case 'Z':         /* CBT: BackTab for xterm */
+                     case 'Z':         /* CBT */
                        compatibility(OTHER);
                        {
                            int i = def(term->esc_args[0], 1);
@@ -4830,12 +4851,11 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 
            if (break_run) {
                if ((dirty_run || last_run_dirty) && ccount > 0) {
+                   do_text(ctx, start, i, ch, ccount, attr,
+                           ldata->lattr);
                    if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
-                       do_cursor(ctx, our_curs_x, i, ch, ccount, attr,
+                       do_cursor(ctx, start, i, ch, ccount, attr,
                                  ldata->lattr);
-                   else
-                       do_text(ctx, start, i, ch, ccount, attr,
-                               ldata->lattr);
 
                    updated_line = 1;
                }
@@ -4917,12 +4937,11 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
            }
        }
        if (dirty_run && ccount > 0) {
+           do_text(ctx, start, i, ch, ccount, attr,
+                   ldata->lattr);
            if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
-               do_cursor(ctx, our_curs_x, i, ch, ccount, attr,
+               do_cursor(ctx, start, i, ch, ccount, attr,
                          ldata->lattr);
-           else
-               do_text(ctx, start, i, ch, ccount, attr,
-                       ldata->lattr);
 
            updated_line = 1;
        }
@@ -6212,13 +6231,13 @@ int term_data(Terminal *term, int is_stderr, const char *data, int len)
      * the remote side needing to wait until term_out() has cleared
      * a backlog.
      *
-     * This is a slightly suboptimal way to deal with SSH2 - in
+     * This is a slightly suboptimal way to deal with SSH-2 - in
      * principle, the window mechanism would allow us to continue
      * to accept data on forwarded ports and X connections even
      * while the terminal processing was going slowly - but we
      * can't do the 100% right thing without moving the terminal
      * processing into a separate thread, and that might hurt
-     * portability. So we manage stdout buffering the old SSH1 way:
+     * portability. So we manage stdout buffering the old SSH-1 way:
      * if the terminal processing goes slowly, the whole SSH
      * connection stops accepting data until it's ready.
      *