Sebastian Kuschel reports that pfd_closing can be called for a socket
[u/mdw/putty] / terminal.c
index de6a2e9..113edc4 100644 (file)
@@ -1,3 +1,7 @@
+/*
+ * Terminal emulator.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -5,7 +9,19 @@
 #include <time.h>
 #include <assert.h>
 #include "putty.h"
-#include "tree234.h"
+#include "terminal.h"
+
+#define poslt(p1,p2) ( (p1).y < (p2).y || ( (p1).y == (p2).y && (p1).x < (p2).x ) )
+#define posle(p1,p2) ( (p1).y < (p2).y || ( (p1).y == (p2).y && (p1).x <= (p2).x ) )
+#define poseq(p1,p2) ( (p1).y == (p2).y && (p1).x == (p2).x )
+#define posdiff(p1,p2) ( ((p1).y - (p2).y) * (term->cols+1) + (p1).x - (p2).x )
+
+/* Product-order comparisons for rectangular block selection. */
+#define posPlt(p1,p2) ( (p1).y <= (p2).y && (p1).x < (p2).x )
+#define posPle(p1,p2) ( (p1).y <= (p2).y && (p1).x <= (p2).x )
+
+#define incpos(p) ( (p).x == term->cols ? ((p).x = 0, (p).y++, 1) : ((p).x++, 0) )
+#define decpos(p) ( (p).x == 0 ? ((p).x = term->cols, (p).y--, 1) : ((p).x--, 0) )
 
 #define VT52_PLUS
 
 
 #define TM_PUTTY       (0xFFFF)
 
+#define UPDATE_DELAY    ((TICKSPERSEC+49)/50)/* ticks to defer window update */
+#define TBLINK_DELAY    ((TICKSPERSEC*9+19)/20)/* ticks between text blinks*/
+#define CBLINK_DELAY    (CURSORBLINK) /* ticks between cursor blinks */
+#define VBELL_DELAY     (VBELL_TIMEOUT) /* visual bell timeout in ticks */
+
 #define compatibility(x) \
-    if ( ((CL_##x)&compatibility_level) == 0 ) {       \
-       termstate=TOPLEVEL;                             \
+    if ( ((CL_##x)&term->compatibility_level) == 0 ) {         \
+       term->termstate=TOPLEVEL;                       \
        break;                                          \
     }
 #define compatibility2(x,y) \
-    if ( ((CL_##x|CL_##y)&compatibility_level) == 0 ) { \
-       termstate=TOPLEVEL;                             \
+    if ( ((CL_##x|CL_##y)&term->compatibility_level) == 0 ) { \
+       term->termstate=TOPLEVEL;                       \
        break;                                          \
     }
 
-#define has_compat(x) ( ((CL_##x)&compatibility_level) != 0 )
+#define has_compat(x) ( ((CL_##x)&term->compatibility_level) != 0 )
 
-static int compatibility_level = TM_PUTTY;
+char *EMPTY_WINDOW_TITLE = "";
 
-static tree234 *scrollback;           /* lines scrolled off top of screen */
-static tree234 *screen;                       /* lines on primary screen */
-static tree234 *alt_screen;           /* lines on alternate screen */
-static int disptop;                   /* distance scrolled back (0 or -ve) */
+const char sco2ansicolour[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
 
-static unsigned long *cpos;           /* cursor position (convenience) */
+#define sel_nl_sz  (sizeof(sel_nl)/sizeof(wchar_t))
+const wchar_t sel_nl[] = SEL_NL;
 
-static unsigned long *disptext;               /* buffer of text on real screen */
-static unsigned long *dispcurs;               /* location of cursor on real screen */
-static unsigned long curstype;        /* type of cursor on real screen */
+/*
+ * Fetch the character at a particular position in a line array,
+ * for purposes of `wordtype'. The reason this isn't just a simple
+ * array reference is that if the character we find is UCSWIDE,
+ * then we must look one space further to the left.
+ */
+#define UCSGET(a, x) \
+    ( (x)>0 && (a)[(x)].chr == UCSWIDE ? (a)[(x)-1].chr : (a)[(x)].chr )
 
-#define VBELL_TIMEOUT (TICKSPERSEC/10) /* visual bell lasts 1/10 sec */
+/*
+ * Detect the various aliases of U+0020 SPACE.
+ */
+#define IS_SPACE_CHR(chr) \
+       ((chr) == 0x20 || (DIRECT_CHAR(chr) && ((chr) & 0xFF) == 0x20))
 
-struct beeptime {
-    struct beeptime *next;
-    unsigned long ticks;
-};
-static struct beeptime *beephead, *beeptail;
-int nbeeps;
-int beep_overloaded;
-long lastbeep;
+/*
+ * Spot magic CSETs.
+ */
+#define CSET_OF(chr) (DIRECT_CHAR(chr)||DIRECT_FONT(chr) ? (chr)&CSET_MASK : 0)
 
-#define TSIZE (sizeof(unsigned long))
-#define fix_cpos do { cpos = lineptr(curs.y) + curs.x; } while(0)
+/*
+ * Internal prototypes.
+ */
+static void resizeline(Terminal *, termline *, int);
+static termline *lineptr(Terminal *, int, int, int);
+static void unlineptr(termline *);
+static void do_paint(Terminal *, Context, int);
+static void erase_lots(Terminal *, int, int, int);
+static int find_last_nonempty_line(Terminal *, tree234 *);
+static void swap_screen(Terminal *, int, int, int);
+static void update_sbar(Terminal *);
+static void deselect(Terminal *);
+static void term_print_finish(Terminal *);
+static void scroll(Terminal *, int, int, int, int);
+#ifdef OPTIMISE_SCROLL
+static void scroll_display(Terminal *, int, int, int);
+#endif /* OPTIMISE_SCROLL */
+
+static termline *newline(Terminal *term, int cols, int bce)
+{
+    termline *line;
+    int j;
+
+    line = snew(termline);
+    line->chars = snewn(cols, termchar);
+    for (j = 0; j < cols; j++)
+       line->chars[j] = (bce ? term->erase_char : term->basic_erase_char);
+    line->cols = line->size = cols;
+    line->lattr = LATTR_NORM;
+    line->temporary = FALSE;
+    line->cc_free = 0;
 
-static unsigned long curr_attr, save_attr;
-static unsigned long erase_char = ERASE_CHAR;
+    return line;
+}
 
-typedef struct {
-    int y, x;
-} pos;
-#define poslt(p1,p2) ( (p1).y < (p2).y || ( (p1).y == (p2).y && (p1).x < (p2).x ) )
-#define posle(p1,p2) ( (p1).y < (p2).y || ( (p1).y == (p2).y && (p1).x <= (p2).x ) )
-#define poseq(p1,p2) ( (p1).y == (p2).y && (p1).x == (p2).x )
-#define posdiff(p1,p2) ( ((p1).y - (p2).y) * (cols+1) + (p1).x - (p2).x )
-#define incpos(p) ( (p).x == cols ? ((p).x = 0, (p).y++, 1) : ((p).x++, 0) )
-#define decpos(p) ( (p).x == 0 ? ((p).x = cols, (p).y--, 1) : ((p).x--, 0) )
+static void freeline(termline *line)
+{
+    if (line) {
+       sfree(line->chars);
+       sfree(line);
+    }
+}
 
-/* Product-order comparisons for rectangular block selection. */
-#define posPlt(p1,p2) ( (p1).y <= (p2).y && (p1).x < (p2).x )
-#define posPle(p1,p2) ( (p1).y <= (p2).y && (p1).x <= (p2).x )
+static void unlineptr(termline *line)
+{
+    if (line->temporary)
+       freeline(line);
+}
+
+#ifdef TERM_CC_DIAGS
+/*
+ * Diagnostic function: verify that a termline has a correct
+ * combining character structure.
+ * 
+ * This is a performance-intensive check, so it's no longer enabled
+ * by default.
+ */
+static void cc_check(termline *line)
+{
+    unsigned char *flags;
+    int i, j;
+
+    assert(line->size >= line->cols);
+
+    flags = snewn(line->size, unsigned char);
+
+    for (i = 0; i < line->size; i++)
+       flags[i] = (i < line->cols);
+
+    for (i = 0; i < line->cols; i++) {
+       j = i;
+       while (line->chars[j].cc_next) {
+           j += line->chars[j].cc_next;
+           assert(j >= line->cols && j < line->size);
+           assert(!flags[j]);
+           flags[j] = TRUE;
+       }
+    }
+
+    j = line->cc_free;
+    if (j) {
+       while (1) {
+           assert(j >= line->cols && j < line->size);
+           assert(!flags[j]);
+           flags[j] = TRUE;
+           if (line->chars[j].cc_next)
+               j += line->chars[j].cc_next;
+           else
+               break;
+       }
+    }
+
+    j = 0;
+    for (i = 0; i < line->size; i++)
+       j += (flags[i] != 0);
 
-static bufchain inbuf;                /* terminal input buffer */
-static pos curs;                      /* cursor */
-static pos savecurs;                  /* saved cursor position */
-static int marg_t, marg_b;            /* scroll margins */
-static int dec_om;                    /* DEC origin mode flag */
-static int wrap, wrapnext;            /* wrap flags */
-static int insert;                    /* insert-mode flag */
-static int cset;                      /* 0 or 1: which char set */
-static int save_cset, save_csattr;     /* saved with cursor position */
-static int save_utf, save_wnext;       /* saved with cursor position */
-static int rvideo;                    /* global reverse video flag */
-static unsigned long rvbell_startpoint;/* for ESC[?5hESC[?5l vbell */
-static int cursor_on;                 /* cursor enabled flag */
-static int reset_132;                 /* Flag ESC c resets to 80 cols */
-static int use_bce;                   /* Use Background coloured erase */
-static int blinker;                   /* When blinking is the cursor on ? */
-static int tblinker;                  /* When the blinking text is on */
-static int blink_is_real;             /* Actually blink blinking text */
-static int term_echoing;              /* Does terminal want local echo? */
-static int term_editing;              /* Does terminal want local edit? */
-static int sco_acs, save_sco_acs;      /* CSI 10,11,12m -> OEM charset */
-static int vt52_bold;                 /* Force bold on non-bold colours */
-static int utf_state;                 /* Is there a pending UTF-8 character */
-static int utf_char;                  /* and what is it so far. */
-static int utf_size;                  /* The size of the UTF character. */
-static int printing, only_printing;    /* Are we doing ANSI printing? */
-static int print_state;                       /* state of print-end-sequence scan */
-static bufchain printer_buf;          /* buffered data for printer */
-static printer_job *print_job;
-
-static int xterm_mouse;                       /* send mouse messages to app */
-
-static unsigned long cset_attr[2];
+    assert(j == line->size);
+
+    sfree(flags);
+}
+#endif
 
 /*
- * Saved settings on the alternate screen.
+ * Add a combining character to a character cell.
  */
-static int alt_x, alt_y, alt_om, alt_wrap, alt_wnext, alt_ins, alt_cset, alt_sco_acs, alt_utf;
-static int alt_t, alt_b;
-static int alt_which;
-
-#define ARGS_MAX 32                   /* max # of esc sequence arguments */
-#define ARG_DEFAULT 0                 /* if an arg isn't specified */
-#define def(a,d) ( (a) == ARG_DEFAULT ? (d) : (a) )
-static int esc_args[ARGS_MAX];
-static int esc_nargs;
-static int esc_query;
-#define ANSI(x,y)      ((x)+((y)<<8))
-#define ANSI_QUE(x)    ANSI(x,TRUE)
-
-#define OSC_STR_MAX 2048
-static int osc_strlen;
-static char osc_string[OSC_STR_MAX + 1];
-static int osc_w;
-
-static char id_string[1024] = "\033[?6c";
-
-static unsigned char *tabs;
-
-static enum {
-    TOPLEVEL,
-    SEEN_ESC,
-    SEEN_CSI,
-    SEEN_OSC,
-    SEEN_OSC_W,
-
-    DO_CTRLS,
-
-    SEEN_OSC_P,
-    OSC_STRING, OSC_MAYBE_ST,
-    VT52_ESC,
-    VT52_Y1,
-    VT52_Y2,
-    VT52_FG,
-    VT52_BG
-} termstate;
-
-static enum {
-    NO_SELECTION, ABOUT_TO, DRAGGING, SELECTED
-} selstate;
-static enum {
-    LEXICOGRAPHIC, RECTANGULAR
-} seltype;
-static enum {
-    SM_CHAR, SM_WORD, SM_LINE
-} selmode;
-static pos selstart, selend, selanchor;
-
-static short wordness[256] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,           /* 01 */
-    0, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 1, 1, 1, 1, 1, 1,           /* 23 */
-    1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 1, 1, 1, 1, 2,           /* 45 */
-    1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 1, 1, 1, 1, 1,           /* 67 */
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1,           /* 89 */
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1,           /* AB */
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
-    2, 2, 2, 2, 2, 2, 2, 2,           /* CD */
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
-    2, 2, 2, 2, 2, 2, 2, 2,           /* EF */
-};
+static void add_cc(termline *line, int col, unsigned long chr)
+{
+    int newcc;
 
-#define sel_nl_sz  (sizeof(sel_nl)/sizeof(wchar_t))
-static wchar_t sel_nl[] = SEL_NL;
-static wchar_t *paste_buffer = 0;
-static int paste_len, paste_pos, paste_hold;
+    assert(col >= 0 && col < line->cols);
+
+    /*
+     * Start by extending the cols array if the free list is empty.
+     */
+    if (!line->cc_free) {
+       int n = line->size;
+       line->size += 16 + (line->size - line->cols) / 2;
+       line->chars = sresize(line->chars, line->size, termchar);
+       line->cc_free = n;
+       while (n < line->size) {
+           if (n+1 < line->size)
+               line->chars[n].cc_next = 1;
+           else
+               line->chars[n].cc_next = 0;
+           n++;
+       }
+    }
+
+    /*
+     * Now walk the cc list of the cell in question.
+     */
+    while (line->chars[col].cc_next)
+       col += line->chars[col].cc_next;
+
+    /*
+     * `col' now points at the last cc currently in this cell; so
+     * we simply add another one.
+     */
+    newcc = line->cc_free;
+    if (line->chars[newcc].cc_next)
+       line->cc_free = newcc + line->chars[newcc].cc_next;
+    else
+       line->cc_free = 0;
+    line->chars[newcc].cc_next = 0;
+    line->chars[newcc].chr = chr;
+    line->chars[col].cc_next = newcc - col;
+
+#ifdef TERM_CC_DIAGS
+    cc_check(line);
+#endif
+}
 
 /*
- * Internal prototypes.
+ * Clear the combining character list in a character cell.
+ */
+static void clear_cc(termline *line, int col)
+{
+    int oldfree, origcol = col;
+
+    assert(col >= 0 && col < line->cols);
+
+    if (!line->chars[col].cc_next)
+       return;                        /* nothing needs doing */
+
+    oldfree = line->cc_free;
+    line->cc_free = col + line->chars[col].cc_next;
+    while (line->chars[col].cc_next)
+       col += line->chars[col].cc_next;
+    if (oldfree)
+       line->chars[col].cc_next = oldfree - col;
+    else
+       line->chars[col].cc_next = 0;
+
+    line->chars[origcol].cc_next = 0;
+
+#ifdef TERM_CC_DIAGS
+    cc_check(line);
+#endif
+}
+
+/*
+ * Compare two character cells for equality. Special case required
+ * in do_paint() where we override what we expect the chr and attr
+ * fields to be.
+ */
+static int termchars_equal_override(termchar *a, termchar *b,
+                                   unsigned long bchr, unsigned long battr)
+{
+    /* FULL-TERMCHAR */
+    if (a->chr != bchr)
+       return FALSE;
+    if ((a->attr &~ DATTR_MASK) != (battr &~ DATTR_MASK))
+       return FALSE;
+    while (a->cc_next || b->cc_next) {
+       if (!a->cc_next || !b->cc_next)
+           return FALSE;              /* one cc-list ends, other does not */
+       a += a->cc_next;
+       b += b->cc_next;
+       if (a->chr != b->chr)
+           return FALSE;
+    }
+    return TRUE;
+}
+
+static int termchars_equal(termchar *a, termchar *b)
+{
+    return termchars_equal_override(a, b, b->chr, b->attr);
+}
+
+/*
+ * Copy a character cell. (Requires a pointer to the destination
+ * termline, so as to access its free list.)
+ */
+static void copy_termchar(termline *destline, int x, termchar *src)
+{
+    clear_cc(destline, x);
+
+    destline->chars[x] = *src;        /* copy everything except cc-list */
+    destline->chars[x].cc_next = 0;    /* and make sure this is zero */
+
+    while (src->cc_next) {
+       src += src->cc_next;
+       add_cc(destline, x, src->chr);
+    }
+
+#ifdef TERM_CC_DIAGS
+    cc_check(destline);
+#endif
+}
+
+/*
+ * Move a character cell within its termline.
  */
-static void do_paint(Context, int);
-static void erase_lots(int, int, int);
-static void swap_screen(int);
-static void update_sbar(void);
-static void deselect(void);
-static void term_print_finish(void);
+static void move_termchar(termline *line, termchar *dest, termchar *src)
+{
+    /* First clear the cc list from the original char, just in case. */
+    clear_cc(line, dest - line->chars);
+
+    /* Move the character cell and adjust its cc_next. */
+    *dest = *src;                     /* copy everything except cc-list */
+    if (src->cc_next)
+       dest->cc_next = src->cc_next - (dest-src);
+
+    /* Ensure the original cell doesn't have a cc list. */
+    src->cc_next = 0;
+
+#ifdef TERM_CC_DIAGS
+    cc_check(line);
+#endif
+}
+
+/*
+ * Compress and decompress a termline into an RLE-based format for
+ * storing in scrollback. (Since scrollback almost never needs to
+ * be modified and exists in huge quantities, this is a sensible
+ * tradeoff, particularly since it allows us to continue adding
+ * features to the main termchar structure without proportionally
+ * bloating the terminal emulator's memory footprint unless those
+ * features are in constant use.)
+ */
+struct buf {
+    unsigned char *data;
+    int len, size;
+};
+static void add(struct buf *b, unsigned char c)
+{
+    if (b->len >= b->size) {
+       b->size = (b->len * 3 / 2) + 512;
+       b->data = sresize(b->data, b->size, unsigned char);
+    }
+    b->data[b->len++] = c;
+}
+static int get(struct buf *b)
+{
+    return b->data[b->len++];
+}
+static void makerle(struct buf *b, termline *ldata,
+                   void (*makeliteral)(struct buf *b, termchar *c,
+                                       unsigned long *state))
+{
+    int hdrpos, hdrsize, n, prevlen, prevpos, thislen, thispos, prev2;
+    termchar *c = ldata->chars;
+    unsigned long state = 0, oldstate;
+
+    n = ldata->cols;
+
+    hdrpos = b->len;
+    hdrsize = 0;
+    add(b, 0);
+    prevlen = prevpos = 0;
+    prev2 = FALSE;
+
+    while (n-- > 0) {
+       thispos = b->len;
+       makeliteral(b, c++, &state);
+       thislen = b->len - thispos;
+       if (thislen == prevlen &&
+           !memcmp(b->data + prevpos, b->data + thispos, thislen)) {
+           /*
+            * This literal precisely matches the previous one.
+            * Turn it into a run if it's worthwhile.
+            * 
+            * With one-byte literals, it costs us two bytes to
+            * encode a run, plus another byte to write the header
+            * to resume normal output; so a three-element run is
+            * neutral, and anything beyond that is unconditionally
+            * worthwhile. With two-byte literals or more, even a
+            * 2-run is a win.
+            */
+           if (thislen > 1 || prev2) {
+               int runpos, runlen;
+
+               /*
+                * It's worth encoding a run. Start at prevpos,
+                * unless hdrsize==0 in which case we can back up
+                * another one and start by overwriting hdrpos.
+                */
+
+               hdrsize--;             /* remove the literal at prevpos */
+               if (prev2) {
+                   assert(hdrsize > 0);
+                   hdrsize--;
+                   prevpos -= prevlen;/* and possibly another one */
+               }
+
+               if (hdrsize == 0) {
+                   assert(prevpos == hdrpos + 1);
+                   runpos = hdrpos;
+                   b->len = prevpos+prevlen;
+               } else {
+                   memmove(b->data + prevpos+1, b->data + prevpos, prevlen);
+                   runpos = prevpos;
+                   b->len = prevpos+prevlen+1;
+                   /*
+                    * Terminate the previous run of ordinary
+                    * literals.
+                    */
+                   assert(hdrsize >= 1 && hdrsize <= 128);
+                   b->data[hdrpos] = hdrsize - 1;
+               }
+
+               runlen = prev2 ? 3 : 2;
+
+               while (n > 0 && runlen < 129) {
+                   int tmppos, tmplen;
+                   tmppos = b->len;
+                   oldstate = state;
+                   makeliteral(b, c, &state);
+                   tmplen = b->len - tmppos;
+                   b->len = tmppos;
+                   if (tmplen != thislen ||
+                       memcmp(b->data + runpos+1, b->data + tmppos, tmplen)) {
+                       state = oldstate;
+                       break;         /* run over */
+                   }
+                   n--, c++, runlen++;
+               }
+
+               assert(runlen >= 2 && runlen <= 129);
+               b->data[runpos] = runlen + 0x80 - 2;
+
+               hdrpos = b->len;
+               hdrsize = 0;
+               add(b, 0);
+               /* And ensure this run doesn't interfere with the next. */
+               prevlen = prevpos = 0;
+               prev2 = FALSE;
+
+               continue;
+           } else {
+               /*
+                * Just flag that the previous two literals were
+                * identical, in case we find a third identical one
+                * we want to turn into a run.
+                */
+               prev2 = TRUE;
+               prevlen = thislen;
+               prevpos = thispos;
+           }
+       } else {
+           prev2 = FALSE;
+           prevlen = thislen;
+           prevpos = thispos;
+       }
+
+       /*
+        * This character isn't (yet) part of a run. Add it to
+        * hdrsize.
+        */
+       hdrsize++;
+       if (hdrsize == 128) {
+           b->data[hdrpos] = hdrsize - 1;
+           hdrpos = b->len;
+           hdrsize = 0;
+           add(b, 0);
+           prevlen = prevpos = 0;
+           prev2 = FALSE;
+       }
+    }
+
+    /*
+     * Clean up.
+     */
+    if (hdrsize > 0) {
+       assert(hdrsize <= 128);
+       b->data[hdrpos] = hdrsize - 1;
+    } else {
+       b->len = hdrpos;
+    }
+}
+static void makeliteral_chr(struct buf *b, termchar *c, unsigned long *state)
+{
+    /*
+     * My encoding for characters is UTF-8-like, in that it stores
+     * 7-bit ASCII in one byte and uses high-bit-set bytes as
+     * introducers to indicate a longer sequence. However, it's
+     * unlike UTF-8 in that it doesn't need to be able to
+     * resynchronise, and therefore I don't want to waste two bits
+     * per byte on having recognisable continuation characters.
+     * Also I don't want to rule out the possibility that I may one
+     * day use values 0x80000000-0xFFFFFFFF for interesting
+     * purposes, so unlike UTF-8 I need a full 32-bit range.
+     * Accordingly, here is my encoding:
+     * 
+     * 00000000-0000007F: 0xxxxxxx (but see below)
+     * 00000080-00003FFF: 10xxxxxx xxxxxxxx
+     * 00004000-001FFFFF: 110xxxxx xxxxxxxx xxxxxxxx
+     * 00200000-0FFFFFFF: 1110xxxx xxxxxxxx xxxxxxxx xxxxxxxx
+     * 10000000-FFFFFFFF: 11110ZZZ xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx
+     * 
+     * (`Z' is like `x' but is always going to be zero since the
+     * values I'm encoding don't go above 2^32. In principle the
+     * five-byte form of the encoding could extend to 2^35, and
+     * there could be six-, seven-, eight- and nine-byte forms as
+     * well to allow up to 64-bit values to be encoded. But that's
+     * completely unnecessary for these purposes!)
+     * 
+     * The encoding as written above would be very simple, except
+     * that 7-bit ASCII can occur in several different ways in the
+     * terminal data; sometimes it crops up in the D800 page
+     * (CSET_ASCII) but at other times it's in the 0000 page (real
+     * Unicode). Therefore, this encoding is actually _stateful_:
+     * the one-byte encoding of 00-7F actually indicates `reuse the
+     * upper three bytes of the last character', and to encode an
+     * absolute value of 00-7F you need to use the two-byte form
+     * instead.
+     */
+    if ((c->chr & ~0x7F) == *state) {
+       add(b, (unsigned char)(c->chr & 0x7F));
+    } else if (c->chr < 0x4000) {
+       add(b, (unsigned char)(((c->chr >> 8) & 0x3F) | 0x80));
+       add(b, (unsigned char)(c->chr & 0xFF));
+    } else if (c->chr < 0x200000) {
+       add(b, (unsigned char)(((c->chr >> 16) & 0x1F) | 0xC0));
+       add(b, (unsigned char)((c->chr >> 8) & 0xFF));
+       add(b, (unsigned char)(c->chr & 0xFF));
+    } else if (c->chr < 0x10000000) {
+       add(b, (unsigned char)(((c->chr >> 24) & 0x0F) | 0xE0));
+       add(b, (unsigned char)((c->chr >> 16) & 0xFF));
+       add(b, (unsigned char)((c->chr >> 8) & 0xFF));
+       add(b, (unsigned char)(c->chr & 0xFF));
+    } else {
+       add(b, 0xF0);
+       add(b, (unsigned char)((c->chr >> 24) & 0xFF));
+       add(b, (unsigned char)((c->chr >> 16) & 0xFF));
+       add(b, (unsigned char)((c->chr >> 8) & 0xFF));
+       add(b, (unsigned char)(c->chr & 0xFF));
+    }
+    *state = c->chr & ~0xFF;
+}
+static void makeliteral_attr(struct buf *b, termchar *c, unsigned long *state)
+{
+    /*
+     * My encoding for attributes is 16-bit-granular and assumes
+     * that the top bit of the word is never required. I either
+     * store a two-byte value with the top bit clear (indicating
+     * just that value), or a four-byte value with the top bit set
+     * (indicating the same value with its top bit clear).
+     * 
+     * However, first I permute the bits of the attribute value, so
+     * that the eight bits of colour (four in each of fg and bg)
+     * which are never non-zero unless xterm 256-colour mode is in
+     * use are placed higher up the word than everything else. This
+     * ensures that attribute values remain 16-bit _unless_ the
+     * user uses extended colour.
+     */
+    unsigned attr, colourbits;
+
+    attr = c->attr;
+
+    assert(ATTR_BGSHIFT > ATTR_FGSHIFT);
+
+    colourbits = (attr >> (ATTR_BGSHIFT + 4)) & 0xF;
+    colourbits <<= 4;
+    colourbits |= (attr >> (ATTR_FGSHIFT + 4)) & 0xF;
+
+    attr = (((attr >> (ATTR_BGSHIFT + 8)) << (ATTR_BGSHIFT + 4)) |
+           (attr & ((1 << (ATTR_BGSHIFT + 4))-1)));
+    attr = (((attr >> (ATTR_FGSHIFT + 8)) << (ATTR_FGSHIFT + 4)) |
+           (attr & ((1 << (ATTR_FGSHIFT + 4))-1)));
+
+    attr |= (colourbits << (32-9));
+
+    if (attr < 0x8000) {
+       add(b, (unsigned char)((attr >> 8) & 0xFF));
+       add(b, (unsigned char)(attr & 0xFF));
+    } else {
+       add(b, (unsigned char)(((attr >> 24) & 0x7F) | 0x80));
+       add(b, (unsigned char)((attr >> 16) & 0xFF));
+       add(b, (unsigned char)((attr >> 8) & 0xFF));
+       add(b, (unsigned char)(attr & 0xFF));
+    }
+}
+static void makeliteral_cc(struct buf *b, termchar *c, unsigned long *state)
+{
+    /*
+     * For combining characters, I just encode a bunch of ordinary
+     * chars using makeliteral_chr, and terminate with a \0
+     * character (which I know won't come up as a combining char
+     * itself).
+     * 
+     * I don't use the stateful encoding in makeliteral_chr.
+     */
+    unsigned long zstate;
+    termchar z;
+
+    while (c->cc_next) {
+       c += c->cc_next;
+
+       assert(c->chr != 0);
+
+       zstate = 0;
+       makeliteral_chr(b, c, &zstate);
+    }
+
+    z.chr = 0;
+    zstate = 0;
+    makeliteral_chr(b, &z, &zstate);
+}
+
+static termline *decompressline(unsigned char *data, int *bytes_used);
+
+static unsigned char *compressline(termline *ldata)
+{
+    struct buf buffer = { NULL, 0, 0 }, *b = &buffer;
+
+    /*
+     * First, store the column count, 7 bits at a time, least
+     * significant `digit' first, with the high bit set on all but
+     * the last.
+     */
+    {
+       int n = ldata->cols;
+       while (n >= 128) {
+           add(b, (unsigned char)((n & 0x7F) | 0x80));
+           n >>= 7;
+       }
+       add(b, (unsigned char)(n));
+    }
+
+    /*
+     * Next store the lattrs; same principle.
+     */
+    {
+       int n = ldata->lattr;
+       while (n >= 128) {
+           add(b, (unsigned char)((n & 0x7F) | 0x80));
+           n >>= 7;
+       }
+       add(b, (unsigned char)(n));
+    }
+
+    /*
+     * Now we store a sequence of separate run-length encoded
+     * fragments, each containing exactly as many symbols as there
+     * are columns in the ldata.
+     * 
+     * All of these have a common basic format:
+     * 
+     *  - a byte 00-7F indicates that X+1 literals follow it
+     *         - a byte 80-FF indicates that a single literal follows it
+     *           and expects to be repeated (X-0x80)+2 times.
+     * 
+     * The format of the `literals' varies between the fragments.
+     */
+    makerle(b, ldata, makeliteral_chr);
+    makerle(b, ldata, makeliteral_attr);
+    makerle(b, ldata, makeliteral_cc);
+
+    /*
+     * Diagnostics: ensure that the compressed data really does
+     * decompress to the right thing.
+     * 
+     * This is a bit performance-heavy for production code.
+     */
+#ifdef TERM_CC_DIAGS
+#ifndef CHECK_SB_COMPRESSION
+    {
+       int dused;
+       termline *dcl;
+       int i;
+
+#ifdef DIAGNOSTIC_SB_COMPRESSION
+       for (i = 0; i < b->len; i++) {
+           printf(" %02x ", b->data[i]);
+       }
+       printf("\n");
+#endif
+
+       dcl = decompressline(b->data, &dused);
+       assert(b->len == dused);
+       assert(ldata->cols == dcl->cols);
+       assert(ldata->lattr == dcl->lattr);
+       for (i = 0; i < ldata->cols; i++)
+           assert(termchars_equal(&ldata->chars[i], &dcl->chars[i]));
+
+#ifdef DIAGNOSTIC_SB_COMPRESSION
+       printf("%d cols (%d bytes) -> %d bytes (factor of %g)\n",
+              ldata->cols, 4 * ldata->cols, dused,
+              (double)dused / (4 * ldata->cols));
+#endif
+
+       freeline(dcl);
+    }
+#endif
+#endif /* TERM_CC_DIAGS */
+
+    /*
+     * Trim the allocated memory so we don't waste any, and return.
+     */
+    return sresize(b->data, b->len, unsigned char);
+}
+
+static void readrle(struct buf *b, termline *ldata,
+                   void (*readliteral)(struct buf *b, termchar *c,
+                                       termline *ldata, unsigned long *state))
+{
+    int n = 0;
+    unsigned long state = 0;
+
+    while (n < ldata->cols) {
+       int hdr = get(b);
+
+       if (hdr >= 0x80) {
+           /* A run. */
+
+           int pos = b->len, count = hdr + 2 - 0x80;
+           while (count--) {
+               assert(n < ldata->cols);
+               b->len = pos;
+               readliteral(b, ldata->chars + n, ldata, &state);
+               n++;
+           }
+       } else {
+           /* Just a sequence of consecutive literals. */
+
+           int count = hdr + 1;
+           while (count--) {
+               assert(n < ldata->cols);
+               readliteral(b, ldata->chars + n, ldata, &state);
+               n++;
+           }
+       }
+    }
+
+    assert(n == ldata->cols);
+}
+static void readliteral_chr(struct buf *b, termchar *c, termline *ldata,
+                           unsigned long *state)
+{
+    int byte;
+
+    /*
+     * 00000000-0000007F: 0xxxxxxx
+     * 00000080-00003FFF: 10xxxxxx xxxxxxxx
+     * 00004000-001FFFFF: 110xxxxx xxxxxxxx xxxxxxxx
+     * 00200000-0FFFFFFF: 1110xxxx xxxxxxxx xxxxxxxx xxxxxxxx
+     * 10000000-FFFFFFFF: 11110ZZZ xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx
+     */
+
+    byte = get(b);
+    if (byte < 0x80) {
+       c->chr = byte | *state;
+    } else if (byte < 0xC0) {
+       c->chr = (byte &~ 0xC0) << 8;
+       c->chr |= get(b);
+    } else if (byte < 0xE0) {
+       c->chr = (byte &~ 0xE0) << 16;
+       c->chr |= get(b) << 8;
+       c->chr |= get(b);
+    } else if (byte < 0xF0) {
+       c->chr = (byte &~ 0xF0) << 24;
+       c->chr |= get(b) << 16;
+       c->chr |= get(b) << 8;
+       c->chr |= get(b);
+    } else {
+       assert(byte == 0xF0);
+       c->chr = get(b) << 24;
+       c->chr |= get(b) << 16;
+       c->chr |= get(b) << 8;
+       c->chr |= get(b);
+    }
+    *state = c->chr & ~0xFF;
+}
+static void readliteral_attr(struct buf *b, termchar *c, termline *ldata,
+                            unsigned long *state)
+{
+    unsigned val, attr, colourbits;
+
+    val = get(b) << 8;
+    val |= get(b);
+
+    if (val >= 0x8000) {
+       val &= ~0x8000;
+       val <<= 16;
+       val |= get(b) << 8;
+       val |= get(b);
+    }
+
+    colourbits = (val >> (32-9)) & 0xFF;
+    attr = (val & ((1<<(32-9))-1));
+
+    attr = (((attr >> (ATTR_FGSHIFT + 4)) << (ATTR_FGSHIFT + 8)) |
+           (attr & ((1 << (ATTR_FGSHIFT + 4))-1)));
+    attr = (((attr >> (ATTR_BGSHIFT + 4)) << (ATTR_BGSHIFT + 8)) |
+           (attr & ((1 << (ATTR_BGSHIFT + 4))-1)));
+
+    attr |= (colourbits >> 4) << (ATTR_BGSHIFT + 4);
+    attr |= (colourbits & 0xF) << (ATTR_FGSHIFT + 4);
+
+    c->attr = attr;
+}
+static void readliteral_cc(struct buf *b, termchar *c, termline *ldata,
+                          unsigned long *state)
+{
+    termchar n;
+    unsigned long zstate;
+    int x = c - ldata->chars;
+
+    c->cc_next = 0;
+
+    while (1) {
+       zstate = 0;
+       readliteral_chr(b, &n, ldata, &zstate);
+       if (!n.chr)
+           break;
+       add_cc(ldata, x, n.chr);
+    }
+}
+
+static termline *decompressline(unsigned char *data, int *bytes_used)
+{
+    int ncols, byte, shift;
+    struct buf buffer, *b = &buffer;
+    termline *ldata;
+
+    b->data = data;
+    b->len = 0;
+
+    /*
+     * First read in the column count.
+     */
+    ncols = shift = 0;
+    do {
+       byte = get(b);
+       ncols |= (byte & 0x7F) << shift;
+       shift += 7;
+    } while (byte & 0x80);
+
+    /*
+     * Now create the output termline.
+     */
+    ldata = snew(termline);
+    ldata->chars = snewn(ncols, termchar);
+    ldata->cols = ldata->size = ncols;
+    ldata->temporary = TRUE;
+    ldata->cc_free = 0;
+
+    /*
+     * We must set all the cc pointers in ldata->chars to 0 right
+     * now, so that cc diagnostics that verify the integrity of the
+     * whole line will make sense while we're in the middle of
+     * building it up.
+     */
+    {
+       int i;
+       for (i = 0; i < ldata->cols; i++)
+           ldata->chars[i].cc_next = 0;
+    }
+
+    /*
+     * Now read in the lattr.
+     */
+    ldata->lattr = shift = 0;
+    do {
+       byte = get(b);
+       ldata->lattr |= (byte & 0x7F) << shift;
+       shift += 7;
+    } while (byte & 0x80);
+
+    /*
+     * Now we read in each of the RLE streams in turn.
+     */
+    readrle(b, ldata, readliteral_chr);
+    readrle(b, ldata, readliteral_attr);
+    readrle(b, ldata, readliteral_cc);
+
+    /* Return the number of bytes read, for diagnostic purposes. */
+    if (bytes_used)
+       *bytes_used = b->len;
+
+    return ldata;
+}
 
 /*
  * Resize a line to make it `cols' columns wide.
  */
-unsigned long *resizeline(unsigned long *line, int cols)
+static void resizeline(Terminal *term, termline *line, int cols)
 {
-    int i, oldlen;
-    unsigned long lineattrs;
+    int i, oldcols;
+
+    if (line->cols != cols) {
+
+       oldcols = line->cols;
 
-    if (line[0] != (unsigned long)cols) {
        /*
         * This line is the wrong length, which probably means it
         * hasn't been accessed since a resize. Resize it now.
+        * 
+        * First, go through all the characters that will be thrown
+        * out in the resize (if we're shrinking the line) and
+        * return their cc lists to the cc free list.
+        */
+       for (i = cols; i < oldcols; i++)
+           clear_cc(line, i);
+
+       /*
+        * If we're shrinking the line, we now bodily move the
+        * entire cc section from where it started to where it now
+        * needs to be. (We have to do this before the resize, so
+        * that the data we're copying is still there. However, if
+        * we're expanding, we have to wait until _after_ the
+        * resize so that the space we're copying into is there.)
+        */
+       if (cols < oldcols)
+           memmove(line->chars + cols, line->chars + oldcols,
+                   (line->size - line->cols) * TSIZE);
+
+       /*
+        * Now do the actual resize, leaving the _same_ amount of
+        * cc space as there was to begin with.
+        */
+       line->size += cols - oldcols;
+       line->chars = sresize(line->chars, line->size, TTYPE);
+       line->cols = cols;
+
+       /*
+        * If we're expanding the line, _now_ we move the cc
+        * section.
         */
-       oldlen = line[0];
-       lineattrs = line[oldlen + 1];
-       line = srealloc(line, TSIZE * (2 + cols));
-       line[0] = cols;
-       for (i = oldlen; i < cols; i++)
-           line[i + 1] = ERASE_CHAR;
-       line[cols + 1] = lineattrs & LATTR_MODE;
+       if (cols > oldcols)
+           memmove(line->chars + cols, line->chars + oldcols,
+                   (line->size - line->cols) * TSIZE);
+
+       /*
+        * Go through what's left of the original line, and adjust
+        * the first cc_next pointer in each list. (All the
+        * subsequent ones are still valid because they are
+        * relative offsets within the cc block.) Also do the same
+        * to the head of the cc_free list.
+        */
+       for (i = 0; i < oldcols && i < cols; i++)
+           if (line->chars[i].cc_next)
+               line->chars[i].cc_next += cols - oldcols;
+       if (line->cc_free)
+           line->cc_free += cols - oldcols;
+
+       /*
+        * And finally fill in the new space with erase chars. (We
+        * don't have to worry about cc lists here, because we
+        * _know_ the erase char doesn't have one.)
+        */
+       for (i = oldcols; i < cols; i++)
+           line->chars[i] = term->basic_erase_char;
+
+#ifdef TERM_CC_DIAGS
+       cc_check(line);
+#endif
     }
+}
 
-    return line;
+/*
+ * Get the number of lines in the scrollback.
+ */
+static int sblines(Terminal *term)
+{
+    int sblines = count234(term->scrollback);
+    if (term->erase_to_scrollback &&
+       term->alt_which && term->alt_screen) {
+           sblines += term->alt_sblines;
+    }
+    return sblines;
 }
 
 /*
@@ -240,118 +1001,403 @@ unsigned long *resizeline(unsigned long *line, int cols)
  * whether the y coordinate is non-negative or negative
  * (respectively).
  */
-unsigned long *lineptr(int y, int lineno)
+static termline *lineptr(Terminal *term, int y, int lineno, int screen)
 {
-    unsigned long *line, *newline;
+    termline *line;
     tree234 *whichtree;
     int treeindex;
 
     if (y >= 0) {
-       whichtree = screen;
+       whichtree = term->screen;
        treeindex = y;
     } else {
-       whichtree = scrollback;
-       treeindex = y + count234(scrollback);
+       int altlines = 0;
+
+       assert(!screen);
+
+       if (term->erase_to_scrollback &&
+           term->alt_which && term->alt_screen) {
+           altlines = term->alt_sblines;
+       }
+       if (y < -altlines) {
+           whichtree = term->scrollback;
+           treeindex = y + altlines + count234(term->scrollback);
+       } else {
+           whichtree = term->alt_screen;
+           treeindex = y + term->alt_sblines;
+           /* treeindex = y + count234(term->alt_screen); */
+       }
+    }
+    if (whichtree == term->scrollback) {
+       unsigned char *cline = index234(whichtree, treeindex);
+       line = decompressline(cline, NULL);
+    } else {
+       line = index234(whichtree, treeindex);
     }
-    line = index234(whichtree, treeindex);
 
     /* 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);
 
-    newline = resizeline(line, cols);
-    if (newline != line) {
-       delpos234(whichtree, treeindex);
-       addpos234(whichtree, newline, treeindex);
-        line = newline;
+    resizeline(term, line, term->cols);
+    /* FIXME: should we sort the compressed scrollback out here? */
+
+    return line;
+}
+
+#define lineptr(x) (lineptr)(term,x,__LINE__,FALSE)
+#define scrlineptr(x) (lineptr)(term,x,__LINE__,TRUE)
+
+static void term_schedule_tblink(Terminal *term);
+static void term_schedule_cblink(Terminal *term);
+
+static void term_timer(void *ctx, unsigned long now)
+{
+    Terminal *term = (Terminal *)ctx;
+    int update = FALSE;
+
+    if (term->tblink_pending && now == term->next_tblink) {
+       term->tblinker = !term->tblinker;
+       term->tblink_pending = FALSE;
+       term_schedule_tblink(term);
+       update = TRUE;
+    }
+
+    if (term->cblink_pending && now == term->next_cblink) {
+       term->cblinker = !term->cblinker;
+       term->cblink_pending = FALSE;
+       term_schedule_cblink(term);
+       update = TRUE;
+    }
+
+    if (term->in_vbell && now == term->vbell_end) {
+       term->in_vbell = FALSE;
+       update = TRUE;
+    }
+
+    if (update ||
+       (term->window_update_pending && now == term->next_update))
+       term_update(term);
+}
+
+static void term_schedule_update(Terminal *term)
+{
+    if (!term->window_update_pending) {
+       term->window_update_pending = TRUE;
+       term->next_update = schedule_timer(UPDATE_DELAY, term_timer, term);
+    }
+}
+
+/*
+ * Call this whenever the terminal window state changes, to queue
+ * an update.
+ */
+static void seen_disp_event(Terminal *term)
+{
+    term->seen_disp_event = TRUE;      /* for scrollback-reset-on-activity */
+    term_schedule_update(term);
+}
+
+/*
+ * Call when the terminal's blinking-text settings change, or when
+ * a text blink has just occurred.
+ */
+static void term_schedule_tblink(Terminal *term)
+{
+    if (term->blink_is_real) {
+       if (!term->tblink_pending)
+           term->next_tblink = schedule_timer(TBLINK_DELAY, term_timer, term);
+       term->tblink_pending = TRUE;
+    } else {
+       term->tblinker = 1;            /* reset when not in use */
+       term->tblink_pending = FALSE;
+    }
+}
+
+/*
+ * Likewise with cursor blinks.
+ */
+static void term_schedule_cblink(Terminal *term)
+{
+    if (term->blink_cur && term->has_focus) {
+       if (!term->cblink_pending)
+           term->next_cblink = schedule_timer(CBLINK_DELAY, term_timer, term);
+       term->cblink_pending = TRUE;
+    } else {
+       term->cblinker = 1;            /* reset when not in use */
+       term->cblink_pending = FALSE;
     }
+}
+
+/*
+ * Call to reset cursor blinking on new output.
+ */
+static void term_reset_cblink(Terminal *term)
+{
+    seen_disp_event(term);
+    term->cblinker = 1;
+    term->cblink_pending = FALSE;
+    term_schedule_cblink(term);
+}
 
-    return line + 1;
+/*
+ * Call to begin a visual bell.
+ */
+static void term_schedule_vbell(Terminal *term, int already_started,
+                               long startpoint)
+{
+    long ticks_already_gone;
+
+    if (already_started)
+       ticks_already_gone = GETTICKCOUNT() - startpoint;
+    else
+       ticks_already_gone = 0;
+
+    if (ticks_already_gone < VBELL_DELAY) {
+       term->in_vbell = TRUE;
+       term->vbell_end = schedule_timer(VBELL_DELAY - ticks_already_gone,
+                                        term_timer, term);
+    } else {
+       term->in_vbell = FALSE;
+    }
 }
 
-#define lineptr(x) lineptr(x,__LINE__)
 /*
  * Set up power-on settings for the terminal.
+ * If 'clear' is false, don't actually clear the primary screen, and
+ * position the cursor below the last non-blank line (scrolling if
+ * necessary).
  */
-static void power_on(void)
+static void power_on(Terminal *term, int clear)
 {
-    curs.x = curs.y = alt_x = alt_y = savecurs.x = savecurs.y = 0;
-    alt_t = marg_t = 0;
-    if (rows != -1)
-       alt_b = marg_b = rows - 1;
+    term->alt_x = term->alt_y = 0;
+    term->savecurs.x = term->savecurs.y = 0;
+    term->alt_savecurs.x = term->alt_savecurs.y = 0;
+    term->alt_t = term->marg_t = 0;
+    if (term->rows != -1)
+       term->alt_b = term->marg_b = term->rows - 1;
     else
-       alt_b = marg_b = 0;
-    if (cols != -1) {
+       term->alt_b = term->marg_b = 0;
+    if (term->cols != -1) {
        int i;
-       for (i = 0; i < cols; i++)
-           tabs[i] = (i % 8 == 0 ? TRUE : FALSE);
-    }
-    alt_om = dec_om = cfg.dec_om;
-    alt_wnext = wrapnext = alt_ins = insert = FALSE;
-    alt_wrap = wrap = cfg.wrap_mode;
-    alt_cset = cset = 0;
-    alt_utf = utf = 0;
-    alt_sco_acs = sco_acs = 0;
-    cset_attr[0] = cset_attr[1] = ATTR_ASCII;
-    rvideo = 0;
-    in_vbell = FALSE;
-    cursor_on = 1;
-    big_cursor = 0;
-    save_attr = curr_attr = ATTR_DEFAULT;
-    term_editing = term_echoing = FALSE;
-    ldisc_send(NULL, 0, 0);           /* cause ldisc to notice changes */
-    app_cursor_keys = cfg.app_cursor;
-    app_keypad_keys = cfg.app_keypad;
-    use_bce = cfg.bce;
-    blink_is_real = cfg.blinktext;
-    erase_char = ERASE_CHAR;
-    alt_which = 0;
-    term_print_finish();
+       for (i = 0; i < term->cols; i++)
+           term->tabs[i] = (i % 8 == 0 ? TRUE : FALSE);
+    }
+    term->alt_om = term->dec_om = conf_get_int(term->conf, CONF_dec_om);
+    term->alt_ins = term->insert = FALSE;
+    term->alt_wnext = term->wrapnext =
+        term->save_wnext = term->alt_save_wnext = FALSE;
+    term->alt_wrap = term->wrap = conf_get_int(term->conf, CONF_wrap_mode);
+    term->alt_cset = term->cset = term->save_cset = term->alt_save_cset = 0;
+    term->alt_utf = term->utf = term->save_utf = term->alt_save_utf = 0;
+    term->utf_state = 0;
+    term->alt_sco_acs = term->sco_acs =
+        term->save_sco_acs = term->alt_save_sco_acs = 0;
+    term->cset_attr[0] = term->cset_attr[1] =
+        term->save_csattr = term->alt_save_csattr = CSET_ASCII;
+    term->rvideo = 0;
+    term->in_vbell = FALSE;
+    term->cursor_on = 1;
+    term->big_cursor = 0;
+    term->default_attr = term->save_attr =
+       term->alt_save_attr = term->curr_attr = ATTR_DEFAULT;
+    term->term_editing = term->term_echoing = FALSE;
+    term->app_cursor_keys = conf_get_int(term->conf, CONF_app_cursor);
+    term->app_keypad_keys = conf_get_int(term->conf, CONF_app_keypad);
+    term->use_bce = conf_get_int(term->conf, CONF_bce);
+    term->blink_is_real = conf_get_int(term->conf, CONF_blinktext);
+    term->erase_char = term->basic_erase_char;
+    term->alt_which = 0;
+    term_print_finish(term);
+    term->xterm_mouse = 0;
+    term->xterm_extended_mouse = 0;
+    term->urxvt_extended_mouse = 0;
+    set_raw_mouse_mode(term->frontend, FALSE);
+    term->bracketed_paste = FALSE;
     {
        int i;
        for (i = 0; i < 256; i++)
-           wordness[i] = cfg.wordness[i];
+           term->wordness[i] = conf_get_int_int(term->conf, CONF_wordness, i);
     }
-    if (screen) {
-       swap_screen(1);
-       erase_lots(FALSE, TRUE, TRUE);
-       swap_screen(0);
-       erase_lots(FALSE, TRUE, TRUE);
+    if (term->screen) {
+       swap_screen(term, 1, FALSE, FALSE);
+       erase_lots(term, FALSE, TRUE, TRUE);
+       swap_screen(term, 0, FALSE, FALSE);
+       if (clear)
+           erase_lots(term, FALSE, TRUE, TRUE);
+       term->curs.y = find_last_nonempty_line(term, term->screen) + 1;
+       if (term->curs.y == term->rows) {
+           term->curs.y--;
+           scroll(term, 0, term->rows - 1, 1, TRUE);
+       }
+    } else {
+       term->curs.y = 0;
     }
+    term->curs.x = 0;
+    term_schedule_tblink(term);
+    term_schedule_cblink(term);
 }
 
 /*
  * Force a screen update.
  */
-void term_update(void)
+void term_update(Terminal *term)
 {
     Context ctx;
-    ctx = get_ctx();
+
+    term->window_update_pending = FALSE;
+
+    ctx = get_ctx(term->frontend);
     if (ctx) {
-       int need_sbar_update = seen_disp_event;
-       if ((seen_key_event && (cfg.scroll_on_key)) ||
-           (seen_disp_event && (cfg.scroll_on_disp))) {
-           disptop = 0;               /* return to main screen */
-           seen_disp_event = seen_key_event = 0;
+       int need_sbar_update = term->seen_disp_event;
+       if (term->seen_disp_event && term->scroll_on_disp) {
+           term->disptop = 0;         /* return to main screen */
+           term->seen_disp_event = 0;
            need_sbar_update = TRUE;
        }
+
        if (need_sbar_update)
-           update_sbar();
-       do_paint(ctx, TRUE);
-       sys_cursor(curs.x, curs.y - disptop);
+           update_sbar(term);
+       do_paint(term, ctx, TRUE);
+       sys_cursor(term->frontend, term->curs.x, term->curs.y - term->disptop);
        free_ctx(ctx);
     }
 }
 
 /*
+ * Called from front end when a keypress occurs, to trigger
+ * anything magical that needs to happen in that situation.
+ */
+void term_seen_key_event(Terminal *term)
+{
+    /*
+     * On any keypress, clear the bell overload mechanism
+     * completely, on the grounds that large numbers of
+     * beeps coming from deliberate key action are likely
+     * to be intended (e.g. beeps from filename completion
+     * blocking repeatedly).
+     */
+    term->beep_overloaded = FALSE;
+    while (term->beephead) {
+       struct beeptime *tmp = term->beephead;
+       term->beephead = tmp->next;
+       sfree(tmp);
+    }
+    term->beeptail = NULL;
+    term->nbeeps = 0;
+
+    /*
+     * Reset the scrollback on keypress, if we're doing that.
+     */
+    if (term->scroll_on_key) {
+       term->disptop = 0;             /* return to main screen */
+       seen_disp_event(term);
+    }
+}
+
+/*
  * Same as power_on(), but an external function.
  */
-void term_pwron(void)
+void term_pwron(Terminal *term, int clear)
+{
+    power_on(term, clear);
+    if (term->ldisc)                  /* cause ldisc to notice changes */
+       ldisc_send(term->ldisc, NULL, 0, 0);
+    term->disptop = 0;
+    deselect(term);
+    term_update(term);
+}
+
+static void set_erase_char(Terminal *term)
+{
+    term->erase_char = term->basic_erase_char;
+    if (term->use_bce)
+       term->erase_char.attr = (term->curr_attr &
+                                (ATTR_FGMASK | ATTR_BGMASK));
+}
+
+/*
+ * We copy a bunch of stuff out of the Conf structure into local
+ * fields in the Terminal structure, to avoid the repeated tree234
+ * lookups which would be involved in fetching them from the former
+ * every time.
+ */
+void term_copy_stuff_from_conf(Terminal *term)
 {
-    power_on();
-    fix_cpos;
-    disptop = 0;
-    deselect();
-    term_update();
+    term->ansi_colour = conf_get_int(term->conf, CONF_ansi_colour);
+    term->arabicshaping = conf_get_int(term->conf, CONF_arabicshaping);
+    term->beep = conf_get_int(term->conf, CONF_beep);
+    term->bellovl = conf_get_int(term->conf, CONF_bellovl);
+    term->bellovl_n = conf_get_int(term->conf, CONF_bellovl_n);
+    term->bellovl_s = conf_get_int(term->conf, CONF_bellovl_s);
+    term->bellovl_t = conf_get_int(term->conf, CONF_bellovl_t);
+    term->bidi = conf_get_int(term->conf, CONF_bidi);
+    term->bksp_is_delete = conf_get_int(term->conf, CONF_bksp_is_delete);
+    term->blink_cur = conf_get_int(term->conf, CONF_blink_cur);
+    term->blinktext = conf_get_int(term->conf, CONF_blinktext);
+    term->cjk_ambig_wide = conf_get_int(term->conf, CONF_cjk_ambig_wide);
+    term->conf_height = conf_get_int(term->conf, CONF_height);
+    term->conf_width = conf_get_int(term->conf, CONF_width);
+    term->crhaslf = conf_get_int(term->conf, CONF_crhaslf);
+    term->erase_to_scrollback = conf_get_int(term->conf, CONF_erase_to_scrollback);
+    term->funky_type = conf_get_int(term->conf, CONF_funky_type);
+    term->lfhascr = conf_get_int(term->conf, CONF_lfhascr);
+    term->logflush = conf_get_int(term->conf, CONF_logflush);
+    term->logtype = conf_get_int(term->conf, CONF_logtype);
+    term->mouse_override = conf_get_int(term->conf, CONF_mouse_override);
+    term->nethack_keypad = conf_get_int(term->conf, CONF_nethack_keypad);
+    term->no_alt_screen = conf_get_int(term->conf, CONF_no_alt_screen);
+    term->no_applic_c = conf_get_int(term->conf, CONF_no_applic_c);
+    term->no_applic_k = conf_get_int(term->conf, CONF_no_applic_k);
+    term->no_dbackspace = conf_get_int(term->conf, CONF_no_dbackspace);
+    term->no_mouse_rep = conf_get_int(term->conf, CONF_no_mouse_rep);
+    term->no_remote_charset = conf_get_int(term->conf, CONF_no_remote_charset);
+    term->no_remote_resize = conf_get_int(term->conf, CONF_no_remote_resize);
+    term->no_remote_wintitle = conf_get_int(term->conf, CONF_no_remote_wintitle);
+    term->rawcnp = conf_get_int(term->conf, CONF_rawcnp);
+    term->rect_select = conf_get_int(term->conf, CONF_rect_select);
+    term->remote_qtitle_action = conf_get_int(term->conf, CONF_remote_qtitle_action);
+    term->rxvt_homeend = conf_get_int(term->conf, CONF_rxvt_homeend);
+    term->scroll_on_disp = conf_get_int(term->conf, CONF_scroll_on_disp);
+    term->scroll_on_key = conf_get_int(term->conf, CONF_scroll_on_key);
+    term->xterm_256_colour = conf_get_int(term->conf, CONF_xterm_256_colour);
+
+    /*
+     * Parse the control-character escapes in the configured
+     * answerback string.
+     */
+    {
+       char *answerback = conf_get_str(term->conf, CONF_answerback);
+       int maxlen = strlen(answerback);
+
+       term->answerback = snewn(maxlen, char);
+       term->answerbacklen = 0;
+
+       while (*answerback) {
+           char *n;
+           char c = ctrlparse(answerback, &n);
+           if (n) {
+               term->answerback[term->answerbacklen++] = c;
+               answerback = n;
+           } else {
+               term->answerback[term->answerbacklen++] = *answerback++;
+           }
+       }
+    }
 }
 
 /*
@@ -360,79 +1406,267 @@ void term_pwron(void)
  * user has disabled mouse reporting, and abandon a print job if
  * the user has disabled printing.
  */
-void term_reconfig(void)
+void term_reconfig(Terminal *term, Conf *conf)
 {
-    if (cfg.no_alt_screen)
-       swap_screen(0);
-    if (cfg.no_mouse_rep) {
-       xterm_mouse = 0;
-       set_raw_mouse_mode(0);
+    /*
+     * Before adopting the new config, check all those terminal
+     * settings which control power-on defaults; and if they've
+     * changed, we will modify the current state as well as the
+     * default one. The full list is: Auto wrap mode, DEC Origin
+     * Mode, BCE, blinking text, character classes.
+     */
+    int reset_wrap, reset_decom, reset_bce, reset_tblink, reset_charclass;
+    int i;
+
+    reset_wrap = (conf_get_int(term->conf, CONF_wrap_mode) !=
+                 conf_get_int(conf, CONF_wrap_mode));
+    reset_decom = (conf_get_int(term->conf, CONF_dec_om) !=
+                  conf_get_int(conf, CONF_dec_om));
+    reset_bce = (conf_get_int(term->conf, CONF_bce) !=
+                conf_get_int(conf, CONF_bce));
+    reset_tblink = (conf_get_int(term->conf, CONF_blinktext) !=
+                   conf_get_int(conf, CONF_blinktext));
+    reset_charclass = 0;
+    for (i = 0; i < 256; i++)
+       if (conf_get_int_int(term->conf, CONF_wordness, i) !=
+           conf_get_int_int(conf, CONF_wordness, i))
+           reset_charclass = 1;
+
+    /*
+     * If the bidi or shaping settings have changed, flush the bidi
+     * cache completely.
+     */
+    if (conf_get_int(term->conf, CONF_arabicshaping) !=
+       conf_get_int(conf, CONF_arabicshaping) ||
+       conf_get_int(term->conf, CONF_bidi) !=
+       conf_get_int(conf, CONF_bidi)) {
+       for (i = 0; i < term->bidi_cache_size; i++) {
+           sfree(term->pre_bidi_cache[i].chars);
+           sfree(term->post_bidi_cache[i].chars);
+           term->pre_bidi_cache[i].width = -1;
+           term->pre_bidi_cache[i].chars = NULL;
+           term->post_bidi_cache[i].width = -1;
+           term->post_bidi_cache[i].chars = NULL;
+       }
+    }
+
+    conf_free(term->conf);
+    term->conf = conf_copy(conf);
+
+    if (reset_wrap)
+       term->alt_wrap = term->wrap = conf_get_int(term->conf, CONF_wrap_mode);
+    if (reset_decom)
+       term->alt_om = term->dec_om = conf_get_int(term->conf, CONF_dec_om);
+    if (reset_bce) {
+       term->use_bce = conf_get_int(term->conf, CONF_bce);
+       set_erase_char(term);
+    }
+    if (reset_tblink) {
+       term->blink_is_real = conf_get_int(term->conf, CONF_blinktext);
+    }
+    if (reset_charclass)
+       for (i = 0; i < 256; i++)
+           term->wordness[i] = conf_get_int_int(term->conf, CONF_wordness, i);
+
+    if (conf_get_int(term->conf, CONF_no_alt_screen))
+       swap_screen(term, 0, FALSE, FALSE);
+    if (conf_get_int(term->conf, CONF_no_mouse_rep)) {
+       term->xterm_mouse = 0;
+       set_raw_mouse_mode(term->frontend, 0);
     }
-    if (cfg.no_remote_charset) {
-       cset_attr[0] = cset_attr[1] = ATTR_ASCII;
-       sco_acs = alt_sco_acs = 0;
-       utf = 0;
+    if (conf_get_int(term->conf, CONF_no_remote_charset)) {
+       term->cset_attr[0] = term->cset_attr[1] = CSET_ASCII;
+       term->sco_acs = term->alt_sco_acs = 0;
+       term->utf = 0;
     }
-    if (!*cfg.printer) {
-       term_print_finish();
+    if (!conf_get_str(term->conf, CONF_printer)) {
+       term_print_finish(term);
     }
+    term_schedule_tblink(term);
+    term_schedule_cblink(term);
+    term_copy_stuff_from_conf(term);
 }
 
 /*
  * Clear the scrollback.
  */
-void term_clrsb(void)
+void term_clrsb(Terminal *term)
 {
-    unsigned long *line;
-    disptop = 0;
-    while ((line = delpos234(scrollback, 0)) != NULL) {
-       sfree(line);
+    unsigned char *line;
+    term->disptop = 0;
+    while ((line = delpos234(term->scrollback, 0)) != NULL) {
+       sfree(line);            /* this is compressed data, not a termline */
     }
-    update_sbar();
+    term->tempsblines = 0;
+    term->alt_sblines = 0;
+    update_sbar(term);
 }
 
 /*
  * Initialise the terminal.
  */
-void term_init(void)
+Terminal *term_init(Conf *myconf, struct unicode_data *ucsdata,
+                   void *frontend)
+{
+    Terminal *term;
+
+    /*
+     * Allocate a new Terminal structure and initialise the fields
+     * that need it.
+     */
+    term = snew(Terminal);
+    term->frontend = frontend;
+    term->ucsdata = ucsdata;
+    term->conf = conf_copy(myconf);
+    term->logctx = NULL;
+    term->compatibility_level = TM_PUTTY;
+    strcpy(term->id_string, "\033[?6c");
+    term->cblink_pending = term->tblink_pending = FALSE;
+    term->paste_buffer = NULL;
+    term->paste_len = 0;
+    term->last_paste = 0;
+    bufchain_init(&term->inbuf);
+    bufchain_init(&term->printer_buf);
+    term->printing = term->only_printing = FALSE;
+    term->print_job = NULL;
+    term->vt52_mode = FALSE;
+    term->cr_lf_return = FALSE;
+    term->seen_disp_event = FALSE;
+    term->mouse_is_down = FALSE;
+    term->reset_132 = FALSE;
+    term->cblinker = term->tblinker = 0;
+    term->has_focus = 1;
+    term->repeat_off = FALSE;
+    term->termstate = TOPLEVEL;
+    term->selstate = NO_SELECTION;
+    term->curstype = 0;
+
+    term_copy_stuff_from_conf(term);
+
+    term->screen = term->alt_screen = term->scrollback = NULL;
+    term->tempsblines = 0;
+    term->alt_sblines = 0;
+    term->disptop = 0;
+    term->disptext = NULL;
+    term->dispcursx = term->dispcursy = -1;
+    term->tabs = NULL;
+    deselect(term);
+    term->rows = term->cols = -1;
+    power_on(term, TRUE);
+    term->beephead = term->beeptail = NULL;
+#ifdef OPTIMISE_SCROLL
+    term->scrollhead = term->scrolltail = NULL;
+#endif /* OPTIMISE_SCROLL */
+    term->nbeeps = 0;
+    term->lastbeep = FALSE;
+    term->beep_overloaded = FALSE;
+    term->attr_mask = 0xffffffff;
+    term->resize_fn = NULL;
+    term->resize_ctx = NULL;
+    term->in_term_out = FALSE;
+    term->ltemp = NULL;
+    term->ltemp_size = 0;
+    term->wcFrom = NULL;
+    term->wcTo = NULL;
+    term->wcFromTo_size = 0;
+
+    term->window_update_pending = FALSE;
+
+    term->bidi_cache_size = 0;
+    term->pre_bidi_cache = term->post_bidi_cache = NULL;
+
+    /* FULL-TERMCHAR */
+    term->basic_erase_char.chr = CSET_ASCII | ' ';
+    term->basic_erase_char.attr = ATTR_DEFAULT;
+    term->basic_erase_char.cc_next = 0;
+    term->erase_char = term->basic_erase_char;
+
+    return term;
+}
+
+void term_free(Terminal *term)
 {
-    screen = alt_screen = scrollback = NULL;
-    disptop = 0;
-    disptext = dispcurs = NULL;
-    tabs = NULL;
-    deselect();
-    rows = cols = -1;
-    power_on();
-    beephead = beeptail = NULL;
-    nbeeps = 0;
-    lastbeep = FALSE;
-    beep_overloaded = FALSE;
+    termline *line;
+    struct beeptime *beep;
+    int i;
+
+    while ((line = delpos234(term->scrollback, 0)) != NULL)
+       sfree(line);                   /* compressed data, not a termline */
+    freetree234(term->scrollback);
+    while ((line = delpos234(term->screen, 0)) != NULL)
+       freeline(line);
+    freetree234(term->screen);
+    while ((line = delpos234(term->alt_screen, 0)) != NULL)
+       freeline(line);
+    freetree234(term->alt_screen);
+    if (term->disptext) {
+       for (i = 0; i < term->rows; i++)
+           freeline(term->disptext[i]);
+    }
+    sfree(term->disptext);
+    while (term->beephead) {
+       beep = term->beephead;
+       term->beephead = beep->next;
+       sfree(beep);
+    }
+    bufchain_clear(&term->inbuf);
+    if(term->print_job)
+       printer_finish_job(term->print_job);
+    bufchain_clear(&term->printer_buf);
+    sfree(term->paste_buffer);
+    sfree(term->ltemp);
+    sfree(term->wcFrom);
+    sfree(term->wcTo);
+
+    for (i = 0; i < term->bidi_cache_size; i++) {
+       sfree(term->pre_bidi_cache[i].chars);
+       sfree(term->post_bidi_cache[i].chars);
+        sfree(term->post_bidi_cache[i].forward);
+        sfree(term->post_bidi_cache[i].backward);
+    }
+    sfree(term->pre_bidi_cache);
+    sfree(term->post_bidi_cache);
+
+    sfree(term->tabs);
+
+    expire_timer_context(term);
+
+    conf_free(term->conf);
+
+    sfree(term);
 }
 
 /*
  * Set up the terminal for a given size.
  */
-void term_size(int newrows, int newcols, int newsavelines)
+void term_size(Terminal *term, int newrows, int newcols, int newsavelines)
 {
     tree234 *newalt;
-    unsigned long *newdisp, *line;
-    int i, j;
+    termline **newdisp, *line;
+    int i, j, oldrows = term->rows;
     int sblen;
-    int save_alt_which = alt_which;
+    int save_alt_which = term->alt_which;
 
-    if (newrows == rows && newcols == cols && newsavelines == savelines)
+    if (newrows == term->rows && newcols == term->cols &&
+       newsavelines == term->savelines)
        return;                        /* nothing to do */
 
-    deselect();
-    swap_screen(0);
+    /* Behave sensibly if we're given zero (or negative) rows/cols */
 
-    alt_t = marg_t = 0;
-    alt_b = marg_b = newrows - 1;
+    if (newrows < 1) newrows = 1;
+    if (newcols < 1) newcols = 1;
 
-    if (rows == -1) {
-       scrollback = newtree234(NULL);
-       screen = newtree234(NULL);
-       rows = 0;
+    deselect(term);
+    swap_screen(term, 0, FALSE, FALSE);
+
+    term->alt_t = term->marg_t = 0;
+    term->alt_b = term->marg_b = newrows - 1;
+
+    if (term->rows == -1) {
+       term->scrollback = newtree234(NULL);
+       term->screen = newtree234(NULL);
+       term->tempsblines = 0;
+       term->rows = 0;
     }
 
     /*
@@ -441,237 +1675,380 @@ void term_size(int newrows, int newcols, int newsavelines)
      * will take care of resizing each individual line if
      * necessary. So:
      * 
-     *  - If the new screen and the old screen differ in length, we
-     *    must shunt some lines in from the scrollback or out to
-     *    the scrollback.
-     * 
-     *  - If doing that fails to provide us with enough material to
-     *    fill the new screen (i.e. the number of rows needed in
-     *    the new screen exceeds the total number in the previous
-     *    screen+scrollback), we must invent some blank lines to
-     *    cover the gap.
+     *  - If the new screen is longer, we shunt lines in from temporary
+     *    scrollback if possible, otherwise we add new blank lines at
+     *    the bottom.
+     *
+     *  - If the new screen is shorter, we remove any blank lines at
+     *    the bottom if possible, otherwise shunt lines above the cursor
+     *    to scrollback if possible, otherwise delete lines below the
+     *    cursor.
      * 
      *  - Then, if the new scrollback length is less than the
      *    amount of scrollback we actually have, we must throw some
      *    away.
      */
-    sblen = count234(scrollback);
+    sblen = count234(term->scrollback);
     /* Do this loop to expand the screen if newrows > rows */
-    for (i = rows; i < newrows; i++) {
-       if (sblen > 0) {
-           line = delpos234(scrollback, --sblen);
+    assert(term->rows == count234(term->screen));
+    while (term->rows < newrows) {
+       if (term->tempsblines > 0) {
+           unsigned char *cline;
+           /* Insert a line from the scrollback at the top of the screen. */
+           assert(sblen >= term->tempsblines);
+           cline = delpos234(term->scrollback, --sblen);
+           line = decompressline(cline, NULL);
+           sfree(cline);
+           line->temporary = FALSE;   /* reconstituted line is now real */
+           term->tempsblines -= 1;
+           addpos234(term->screen, line, 0);
+           term->curs.y += 1;
+           term->savecurs.y += 1;
+           term->alt_y += 1;
+           term->alt_savecurs.y += 1;
        } else {
-           line = smalloc(TSIZE * (newcols + 2));
-           line[0] = newcols;
-           for (j = 0; j <= newcols; j++)
-               line[j + 1] = ERASE_CHAR;
+           /* Add a new blank line at the bottom of the screen. */
+           line = newline(term, newcols, FALSE);
+           addpos234(term->screen, line, count234(term->screen));
        }
-       addpos234(screen, line, 0);
+       term->rows += 1;
     }
     /* Do this loop to shrink the screen if newrows < rows */
-    for (i = newrows; i < rows; i++) {
-       line = delpos234(screen, 0);
-       addpos234(scrollback, line, sblen++);
+    while (term->rows > newrows) {
+       if (term->curs.y < term->rows - 1) {
+           /* delete bottom row, unless it contains the cursor */
+            line = delpos234(term->screen, term->rows - 1);
+            freeline(line);
+       } else {
+           /* push top row to scrollback */
+           line = delpos234(term->screen, 0);
+           addpos234(term->scrollback, compressline(line), sblen++);
+           freeline(line);
+           term->tempsblines += 1;
+           term->curs.y -= 1;
+           term->savecurs.y -= 1;
+           term->alt_y -= 1;
+           term->alt_savecurs.y -= 1;
+       }
+       term->rows -= 1;
     }
-    assert(count234(screen) == newrows);
+    assert(term->rows == newrows);
+    assert(count234(term->screen) == newrows);
+
+    /* Delete any excess lines from the scrollback. */
     while (sblen > newsavelines) {
-       line = delpos234(scrollback, 0);
+       line = delpos234(term->scrollback, 0);
        sfree(line);
        sblen--;
     }
-    assert(count234(scrollback) <= newsavelines);
-    disptop = 0;
-
-    newdisp = smalloc(newrows * (newcols + 1) * TSIZE);
-    for (i = 0; i < newrows * (newcols + 1); i++)
-       newdisp[i] = ATTR_INVALID;
-    sfree(disptext);
-    disptext = newdisp;
-    dispcurs = NULL;
+    if (sblen < term->tempsblines)
+       term->tempsblines = sblen;
+    assert(count234(term->scrollback) <= newsavelines);
+    assert(count234(term->scrollback) >= term->tempsblines);
+    term->disptop = 0;
+
+    /* Make a new displayed text buffer. */
+    newdisp = snewn(newrows, termline *);
+    for (i = 0; i < newrows; i++) {
+       newdisp[i] = newline(term, newcols, FALSE);
+       for (j = 0; j < newcols; j++)
+           newdisp[i]->chars[j].attr = ATTR_INVALID;
+    }
+    if (term->disptext) {
+       for (i = 0; i < oldrows; i++)
+           freeline(term->disptext[i]);
+    }
+    sfree(term->disptext);
+    term->disptext = newdisp;
+    term->dispcursx = term->dispcursy = -1;
 
+    /* Make a new alternate screen. */
     newalt = newtree234(NULL);
     for (i = 0; i < newrows; i++) {
-       line = smalloc(TSIZE * (newcols + 2));
-       line[0] = newcols;
-       for (j = 0; j <= newcols; j++)
-           line[j + 1] = erase_char;
+       line = newline(term, newcols, TRUE);
        addpos234(newalt, line, i);
     }
-    if (alt_screen) {
-       while (NULL != (line = delpos234(alt_screen, 0)))
-           sfree(line);
-       freetree234(alt_screen);
+    if (term->alt_screen) {
+       while (NULL != (line = delpos234(term->alt_screen, 0)))
+           freeline(line);
+       freetree234(term->alt_screen);
     }
-    alt_screen = newalt;
+    term->alt_screen = newalt;
+    term->alt_sblines = 0;
 
-    tabs = srealloc(tabs, newcols * sizeof(*tabs));
+    term->tabs = sresize(term->tabs, newcols, unsigned char);
     {
        int i;
-       for (i = (cols > 0 ? cols : 0); i < newcols; i++)
-           tabs[i] = (i % 8 == 0 ? TRUE : FALSE);
+       for (i = (term->cols > 0 ? term->cols : 0); i < newcols; i++)
+           term->tabs[i] = (i % 8 == 0 ? TRUE : FALSE);
     }
 
-    if (rows > 0)
-       curs.y += newrows - rows;
-    if (curs.y < 0)
-       curs.y = 0;
-    if (curs.y >= newrows)
-       curs.y = newrows - 1;
-    if (curs.x >= newcols)
-       curs.x = newcols - 1;
-    alt_x = alt_y = 0;
-    wrapnext = alt_wnext = FALSE;
-
-    rows = newrows;
-    cols = newcols;
-    savelines = newsavelines;
-    fix_cpos;
+    /* Check that the cursor positions are still valid. */
+    if (term->savecurs.y < 0)
+       term->savecurs.y = 0;
+    if (term->savecurs.y >= newrows)
+       term->savecurs.y = newrows - 1;
+    if (term->savecurs.x >= newcols)
+       term->savecurs.x = newcols - 1;
+    if (term->alt_savecurs.y < 0)
+       term->alt_savecurs.y = 0;
+    if (term->alt_savecurs.y >= newrows)
+       term->alt_savecurs.y = newrows - 1;
+    if (term->alt_savecurs.x >= newcols)
+       term->alt_savecurs.x = newcols - 1;
+    if (term->curs.y < 0)
+       term->curs.y = 0;
+    if (term->curs.y >= newrows)
+       term->curs.y = newrows - 1;
+    if (term->curs.x >= newcols)
+       term->curs.x = newcols - 1;
+    if (term->alt_y < 0)
+       term->alt_y = 0;
+    if (term->alt_y >= newrows)
+       term->alt_y = newrows - 1;
+    if (term->alt_x >= newcols)
+       term->alt_x = newcols - 1;
+    term->alt_x = term->alt_y = 0;
+    term->wrapnext = term->alt_wnext = FALSE;
+
+    term->rows = newrows;
+    term->cols = newcols;
+    term->savelines = newsavelines;
+
+    swap_screen(term, save_alt_which, FALSE, FALSE);
+
+    update_sbar(term);
+    term_update(term);
+    if (term->resize_fn)
+       term->resize_fn(term->resize_ctx, term->cols, term->rows);
+}
 
-    swap_screen(save_alt_which);
+/*
+ * Hand a function and context pointer to the terminal which it can
+ * use to notify a back end of resizes.
+ */
+void term_provide_resize_fn(Terminal *term,
+                           void (*resize_fn)(void *, int, int),
+                           void *resize_ctx)
+{
+    term->resize_fn = resize_fn;
+    term->resize_ctx = resize_ctx;
+    if (resize_fn && term->cols > 0 && term->rows > 0)
+       resize_fn(resize_ctx, term->cols, term->rows);
+}
 
-    update_sbar();
-    term_update();
-    back->size();
+/* Find the bottom line on the screen that has any content.
+ * If only the top line has content, returns 0.
+ * If no lines have content, return -1.
+ */ 
+static int find_last_nonempty_line(Terminal * term, tree234 * screen)
+{
+    int i;
+    for (i = count234(screen) - 1; i >= 0; i--) {
+       termline *line = index234(screen, i);
+       int j;
+       for (j = 0; j < line->cols; j++)
+           if (!termchars_equal(&line->chars[j], &term->erase_char))
+               break;
+       if (j != line->cols) break;
+    }
+    return i;
 }
 
 /*
- * Swap screens.
+ * Swap screens. If `reset' is TRUE and we have been asked to
+ * switch to the alternate screen, we must bring most of its
+ * configuration from the main screen and erase the contents of the
+ * alternate screen completely. (This is even true if we're already
+ * on it! Blame xterm.)
  */
-static void swap_screen(int which)
+static void swap_screen(Terminal *term, int which, int reset, int keep_cur_pos)
 {
     int t;
+    pos tp;
     tree234 *ttr;
 
-    if (which == alt_which)
-       return;
+    if (!which)
+       reset = FALSE;                 /* do no weird resetting if which==0 */
+
+    if (which != term->alt_which) {
+       term->alt_which = which;
+
+       ttr = term->alt_screen;
+       term->alt_screen = term->screen;
+       term->screen = ttr;
+       term->alt_sblines = find_last_nonempty_line(term, term->alt_screen) + 1;
+       t = term->curs.x;
+       if (!reset && !keep_cur_pos)
+           term->curs.x = term->alt_x;
+       term->alt_x = t;
+       t = term->curs.y;
+       if (!reset && !keep_cur_pos)
+           term->curs.y = term->alt_y;
+       term->alt_y = t;
+       t = term->marg_t;
+       if (!reset) term->marg_t = term->alt_t;
+       term->alt_t = t;
+       t = term->marg_b;
+       if (!reset) term->marg_b = term->alt_b;
+       term->alt_b = t;
+       t = term->dec_om;
+       if (!reset) term->dec_om = term->alt_om;
+       term->alt_om = t;
+       t = term->wrap;
+       if (!reset) term->wrap = term->alt_wrap;
+       term->alt_wrap = t;
+       t = term->wrapnext;
+       if (!reset) term->wrapnext = term->alt_wnext;
+       term->alt_wnext = t;
+       t = term->insert;
+       if (!reset) term->insert = term->alt_ins;
+       term->alt_ins = t;
+       t = term->cset;
+       if (!reset) term->cset = term->alt_cset;
+       term->alt_cset = t;
+       t = term->utf;
+       if (!reset) term->utf = term->alt_utf;
+       term->alt_utf = t;
+       t = term->sco_acs;
+       if (!reset) term->sco_acs = term->alt_sco_acs;
+       term->alt_sco_acs = t;
+
+       tp = term->savecurs;
+       if (!reset && !keep_cur_pos)
+           term->savecurs = term->alt_savecurs;
+       term->alt_savecurs = tp;
+        t = term->save_cset;
+        if (!reset && !keep_cur_pos)
+            term->save_cset = term->alt_save_cset;
+        term->alt_save_cset = t;
+        t = term->save_csattr;
+        if (!reset && !keep_cur_pos)
+            term->save_csattr = term->alt_save_csattr;
+        term->alt_save_csattr = t;
+        t = term->save_attr;
+        if (!reset && !keep_cur_pos)
+            term->save_attr = term->alt_save_attr;
+        term->alt_save_attr = t;
+        t = term->save_utf;
+        if (!reset && !keep_cur_pos)
+            term->save_utf = term->alt_save_utf;
+        term->alt_save_utf = t;
+        t = term->save_wnext;
+        if (!reset && !keep_cur_pos)
+            term->save_wnext = term->alt_save_wnext;
+        term->alt_save_wnext = t;
+        t = term->save_sco_acs;
+        if (!reset && !keep_cur_pos)
+            term->save_sco_acs = term->alt_save_sco_acs;
+        term->alt_save_sco_acs = t;
+    }
 
-    alt_which = which;
-
-    ttr = alt_screen;
-    alt_screen = screen;
-    screen = ttr;
-    t = curs.x;
-    curs.x = alt_x;
-    alt_x = t;
-    t = curs.y;
-    curs.y = alt_y;
-    alt_y = t;
-    t = marg_t;
-    marg_t = alt_t;
-    alt_t = t;
-    t = marg_b;
-    marg_b = alt_b;
-    alt_b = t;
-    t = dec_om;
-    dec_om = alt_om;
-    alt_om = t;
-    t = wrap;
-    wrap = alt_wrap;
-    alt_wrap = t;
-    t = wrapnext;
-    wrapnext = alt_wnext;
-    alt_wnext = t;
-    t = insert;
-    insert = alt_ins;
-    alt_ins = t;
-    t = cset;
-    cset = alt_cset;
-    alt_cset = t;
-    t = utf;
-    utf = alt_utf;
-    alt_utf = t;
-    t = sco_acs;
-    sco_acs = alt_sco_acs;
-    alt_sco_acs = t;
-
-    fix_cpos;
+    if (reset && term->screen) {
+       /*
+        * Yes, this _is_ supposed to honour background-colour-erase.
+        */
+       erase_lots(term, FALSE, TRUE, TRUE);
+    }
 }
 
 /*
  * Update the scroll bar.
  */
-static void update_sbar(void)
+static void update_sbar(Terminal *term)
 {
-    int nscroll;
-
-    nscroll = count234(scrollback);
-
-    set_sbar(nscroll + rows, nscroll + disptop, rows);
+    int nscroll = sblines(term);
+    set_sbar(term->frontend, nscroll + term->rows,
+            nscroll + term->disptop, term->rows);
 }
 
 /*
  * Check whether the region bounded by the two pointers intersects
  * the scroll region, and de-select the on-screen selection if so.
  */
-static void check_selection(pos from, pos to)
+static void check_selection(Terminal *term, pos from, pos to)
 {
-    if (poslt(from, selend) && poslt(selstart, to))
-       deselect();
+    if (poslt(from, term->selend) && poslt(term->selstart, to))
+       deselect(term);
 }
 
 /*
  * Scroll the screen. (`lines' is +ve for scrolling forward, -ve
  * for backward.) `sb' is TRUE if the scrolling is permitted to
  * affect the scrollback buffer.
- * 
- * NB this function invalidates all pointers into lines of the
- * screen data structures. In particular, you MUST call fix_cpos
- * after calling scroll() and before doing anything else that
- * uses the cpos shortcut pointer.
  */
-static void scroll(int topline, int botline, int lines, int sb)
+static void scroll(Terminal *term, int topline, int botline, int lines, int sb)
 {
-    unsigned long *line, *line2;
-    int i, seltop;
+    termline *line;
+    int i, seltop, scrollwinsize;
+#ifdef OPTIMISE_SCROLL
+    int olddisptop, shift;
+#endif /* OPTIMISE_SCROLL */
 
-    if (topline != 0 || alt_which != 0)
+    if (topline != 0 || term->alt_which != 0)
        sb = FALSE;
 
+#ifdef OPTIMISE_SCROLL
+    olddisptop = term->disptop;
+    shift = lines;
+#endif /* OPTIMISE_SCROLL */
+
+    scrollwinsize = botline - topline + 1;
+
     if (lines < 0) {
-       while (lines < 0) {
-           line = delpos234(screen, botline);
-            line = resizeline(line, cols);
-           for (i = 0; i < cols; i++)
-               line[i + 1] = erase_char;
-           line[cols + 1] = 0;
-           addpos234(screen, line, topline);
-
-           if (selstart.y >= topline && selstart.y <= botline) {
-               selstart.y++;
-               if (selstart.y > botline) {
-                   selstart.y = botline;
-                   selstart.x = 0;
+        lines = -lines;
+        if (lines > scrollwinsize)
+            lines = scrollwinsize;
+       while (lines-- > 0) {
+           line = delpos234(term->screen, botline);
+            resizeline(term, line, term->cols);
+           for (i = 0; i < term->cols; i++)
+               copy_termchar(line, i, &term->erase_char);
+           line->lattr = LATTR_NORM;
+           addpos234(term->screen, line, topline);
+
+           if (term->selstart.y >= topline && term->selstart.y <= botline) {
+               term->selstart.y++;
+               if (term->selstart.y > botline) {
+                   term->selstart.y = botline + 1;
+                   term->selstart.x = 0;
                }
            }
-           if (selend.y >= topline && selend.y <= botline) {
-               selend.y++;
-               if (selend.y > botline) {
-                   selend.y = botline;
-                   selend.x = 0;
+           if (term->selend.y >= topline && term->selend.y <= botline) {
+               term->selend.y++;
+               if (term->selend.y > botline) {
+                   term->selend.y = botline + 1;
+                   term->selend.x = 0;
                }
            }
-
-           lines++;
        }
     } else {
-       while (lines > 0) {
-           line = delpos234(screen, topline);
-           if (sb && savelines > 0) {
-               int sblen = count234(scrollback);
+        if (lines > scrollwinsize)
+            lines = scrollwinsize;
+       while (lines-- > 0) {
+           line = delpos234(term->screen, topline);
+#ifdef TERM_CC_DIAGS
+           cc_check(line);
+#endif
+           if (sb && term->savelines > 0) {
+               int sblen = count234(term->scrollback);
                /*
                 * We must add this line to the scrollback. We'll
-                * remove a line from the top of the scrollback to
-                * replace it, or allocate a new one if the
-                * scrollback isn't full.
+                * remove a line from the top of the scrollback if
+                * the scrollback is full.
                 */
-               if (sblen == savelines) {
-                   sblen--, line2 = delpos234(scrollback, 0);
-               } else {
-                   line2 = smalloc(TSIZE * (cols + 2));
-                   line2[0] = cols;
-               }
-               addpos234(scrollback, line, sblen);
-               line = line2;
+               if (sblen == term->savelines) {
+                   unsigned char *cline;
+
+                   sblen--;
+                   cline = delpos234(term->scrollback, 0);
+                   sfree(cline);
+               } else
+                   term->tempsblines += 1;
+
+               addpos234(term->scrollback, compressline(line), sblen);
+
+               /* now `line' itself can be reused as the bottom line */
 
                /*
                 * If the user is currently looking at part of the
@@ -687,14 +2064,14 @@ static void scroll(int topline, int botline, int lines, int sb)
                 * Thanks to Jan Holmen Holsten for the idea and
                 * initial implementation.
                 */
-               if (disptop > -savelines && disptop < 0)
-                   disptop--;
+               if (term->disptop > -term->savelines && term->disptop < 0)
+                   term->disptop--;
            }
-            line = resizeline(line, cols);
-           for (i = 0; i < cols; i++)
-               line[i + 1] = erase_char;
-           line[cols + 1] = 0;
-           addpos234(screen, line, botline);
+            resizeline(term, line, term->cols);
+           for (i = 0; i < term->cols; i++)
+               copy_termchar(line, i, &term->erase_char);
+           line->lattr = LATTR_NORM;
+           addpos234(term->screen, line, botline);
 
            /*
             * If the selection endpoints move into the scrollback,
@@ -707,34 +2084,109 @@ static void scroll(int topline, int botline, int lines, int sb)
             * selection), and also selanchor (for one being
             * selected as we speak).
             */
-           seltop = sb ? -savelines : topline;
-
-           if (selstart.y >= seltop && selstart.y <= botline) {
-               selstart.y--;
-               if (selstart.y < seltop) {
-                   selstart.y = seltop;
-                   selstart.x = 0;
+           seltop = sb ? -term->savelines : topline;
+
+           if (term->selstate != NO_SELECTION) {
+               if (term->selstart.y >= seltop &&
+                   term->selstart.y <= botline) {
+                   term->selstart.y--;
+                   if (term->selstart.y < seltop) {
+                       term->selstart.y = seltop;
+                       term->selstart.x = 0;
+                   }
                }
-           }
-           if (selend.y >= seltop && selend.y <= botline) {
-               selend.y--;
-               if (selend.y < seltop) {
-                   selend.y = seltop;
-                   selend.x = 0;
+               if (term->selend.y >= seltop && term->selend.y <= botline) {
+                   term->selend.y--;
+                   if (term->selend.y < seltop) {
+                       term->selend.y = seltop;
+                       term->selend.x = 0;
+                   }
                }
-           }
-           if (selanchor.y >= seltop && selanchor.y <= botline) {
-               selanchor.y--;
-               if (selanchor.y < seltop) {
-                   selanchor.y = seltop;
-                   selanchor.x = 0;
+               if (term->selanchor.y >= seltop &&
+                   term->selanchor.y <= botline) {
+                   term->selanchor.y--;
+                   if (term->selanchor.y < seltop) {
+                       term->selanchor.y = seltop;
+                       term->selanchor.x = 0;
+                   }
                }
            }
-
-           lines--;
        }
     }
+#ifdef OPTIMISE_SCROLL
+    shift += term->disptop - olddisptop;
+    if (shift < term->rows && shift > -term->rows && shift != 0)
+       scroll_display(term, topline, botline, shift);
+#endif /* OPTIMISE_SCROLL */
+}
+
+#ifdef OPTIMISE_SCROLL
+/*
+ * Add a scroll of a region on the screen into the pending scroll list.
+ * `lines' is +ve for scrolling forward, -ve for backward.
+ *
+ * If the scroll is on the same area as the last scroll in the list,
+ * merge them.
+ */
+static void save_scroll(Terminal *term, int topline, int botline, int lines)
+{
+    struct scrollregion *newscroll;
+    if (term->scrolltail &&
+       term->scrolltail->topline == topline && 
+       term->scrolltail->botline == botline) {
+       term->scrolltail->lines += lines;
+    } else {
+       newscroll = snew(struct scrollregion);
+       newscroll->topline = topline;
+       newscroll->botline = botline;
+       newscroll->lines = lines;
+       newscroll->next = NULL;
+
+       if (!term->scrollhead)
+           term->scrollhead = newscroll;
+       else
+           term->scrolltail->next = newscroll;
+       term->scrolltail = newscroll;
+    }
+}
+
+/*
+ * Scroll the physical display, and our conception of it in disptext.
+ */
+static void scroll_display(Terminal *term, int topline, int botline, int lines)
+{
+    int distance, nlines, i, j;
+
+    distance = lines > 0 ? lines : -lines;
+    nlines = botline - topline + 1 - distance;
+    if (lines > 0) {
+       for (i = 0; i < nlines; i++)
+           for (j = 0; j < term->cols; 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[nlines+i]->chars[j].attr |= ATTR_INVALID;
+    } else {
+       for (i = nlines; i-- ;)
+           for (j = 0; j < term->cols; 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[i]->chars[j].attr |= ATTR_INVALID;
+    }
+    save_scroll(term, topline, botline, lines);
 }
+#endif /* OPTIMISE_SCROLL */
 
 /*
  * Move the cursor to a given position, clipping at boundaries. We
@@ -742,65 +2194,103 @@ static void scroll(int topline, int botline, int lines, int sb)
  * not to, 1 to disallow _passing_ the margins, and 2 to disallow
  * even _being_ outside the margins.
  */
-static void move(int x, int y, int marg_clip)
+static void move(Terminal *term, int x, int y, int marg_clip)
 {
     if (x < 0)
        x = 0;
-    if (x >= cols)
-       x = cols - 1;
+    if (x >= term->cols)
+       x = term->cols - 1;
     if (marg_clip) {
-       if ((curs.y >= marg_t || marg_clip == 2) && y < marg_t)
-           y = marg_t;
-       if ((curs.y <= marg_b || marg_clip == 2) && y > marg_b)
-           y = marg_b;
+       if ((term->curs.y >= term->marg_t || marg_clip == 2) &&
+           y < term->marg_t)
+           y = term->marg_t;
+       if ((term->curs.y <= term->marg_b || marg_clip == 2) &&
+           y > term->marg_b)
+           y = term->marg_b;
     }
     if (y < 0)
        y = 0;
-    if (y >= rows)
-       y = rows - 1;
-    curs.x = x;
-    curs.y = y;
-    fix_cpos;
-    wrapnext = FALSE;
+    if (y >= term->rows)
+       y = term->rows - 1;
+    term->curs.x = x;
+    term->curs.y = y;
+    term->wrapnext = FALSE;
 }
 
 /*
  * Save or restore the cursor and SGR mode.
  */
-static void save_cursor(int save)
+static void save_cursor(Terminal *term, int save)
 {
     if (save) {
-       savecurs = curs;
-       save_attr = curr_attr;
-       save_cset = cset;
-       save_utf = utf;
-       save_wnext = wrapnext;
-       save_csattr = cset_attr[cset];
-       save_sco_acs = sco_acs;
+       term->savecurs = term->curs;
+       term->save_attr = term->curr_attr;
+       term->save_cset = term->cset;
+       term->save_utf = term->utf;
+       term->save_wnext = term->wrapnext;
+       term->save_csattr = term->cset_attr[term->cset];
+       term->save_sco_acs = term->sco_acs;
     } else {
-       curs = savecurs;
+       term->curs = term->savecurs;
        /* Make sure the window hasn't shrunk since the save */
-       if (curs.x >= cols)
-           curs.x = cols - 1;
-       if (curs.y >= rows)
-           curs.y = rows - 1;
-
-       curr_attr = save_attr;
-       cset = save_cset;
-       utf = save_utf;
-       wrapnext = save_wnext;
+       if (term->curs.x >= term->cols)
+           term->curs.x = term->cols - 1;
+       if (term->curs.y >= term->rows)
+           term->curs.y = term->rows - 1;
+
+       term->curr_attr = term->save_attr;
+       term->cset = term->save_cset;
+       term->utf = term->save_utf;
+       term->wrapnext = term->save_wnext;
        /*
         * wrapnext might reset to False if the x position is no
         * longer at the rightmost edge.
         */
-       if (wrapnext && curs.x < cols-1)
-           wrapnext = FALSE;
-       cset_attr[cset] = save_csattr;
-       sco_acs = save_sco_acs;
-       fix_cpos;
-       if (use_bce)
-           erase_char = (' ' | ATTR_ASCII |
-                        (curr_attr & (ATTR_FGMASK | ATTR_BGMASK)));
+       if (term->wrapnext && term->curs.x < term->cols-1)
+           term->wrapnext = FALSE;
+       term->cset_attr[term->cset] = term->save_csattr;
+       term->sco_acs = term->save_sco_acs;
+       set_erase_char(term);
+    }
+}
+
+/*
+ * This function is called before doing _anything_ which affects
+ * only part of a line of text. It is used to mark the boundary
+ * between two character positions, and it indicates that some sort
+ * of effect is going to happen on only one side of that boundary.
+ * 
+ * The effect of this function is to check whether a CJK
+ * double-width character is straddling the boundary, and to remove
+ * it and replace it with two spaces if so. (Of course, one or
+ * other of those spaces is then likely to be replaced with
+ * something else again, as a result of whatever happens next.)
+ * 
+ * Also, if the boundary is at the right-hand _edge_ of the screen,
+ * it implies something deliberate is being done to the rightmost
+ * column position; hence we must clear LATTR_WRAPPED2.
+ * 
+ * The input to the function is the coordinates of the _second_
+ * character of the pair.
+ */
+static void check_boundary(Terminal *term, int x, int y)
+{
+    termline *ldata;
+
+    /* Validate input coordinates, just in case. */
+    if (x == 0 || x > term->cols)
+       return;
+
+    ldata = scrlineptr(y);
+    if (x == term->cols) {
+       ldata->lattr &= ~LATTR_WRAPPED2;
+    } else {
+       if (ldata->chars[x].chr == UCSWIDE) {
+           clear_cc(ldata, x-1);
+           clear_cc(ldata, x);
+           ldata->chars[x-1].chr = ' ' | CSET_ASCII;
+           ldata->chars[x] = ldata->chars[x-1];
+       }
     }
 }
 
@@ -808,76 +2298,117 @@ static void save_cursor(int save)
  * Erase a large portion of the screen: the whole screen, or the
  * whole line, or parts thereof.
  */
-static void erase_lots(int line_only, int from_begin, int to_end)
+static void erase_lots(Terminal *term,
+                      int line_only, int from_begin, int to_end)
 {
     pos start, end;
     int erase_lattr;
-    unsigned long *ldata;
+    int erasing_lines_from_top = 0;
 
     if (line_only) {
-       start.y = curs.y;
+       start.y = term->curs.y;
        start.x = 0;
-       end.y = curs.y + 1;
+       end.y = term->curs.y + 1;
        end.x = 0;
        erase_lattr = FALSE;
     } else {
        start.y = 0;
        start.x = 0;
-       end.y = rows;
+       end.y = term->rows;
        end.x = 0;
        erase_lattr = TRUE;
     }
     if (!from_begin) {
-       start = curs;
+       start = term->curs;
     }
     if (!to_end) {
-       end = curs;
+       end = term->curs;
        incpos(end);
     }
-    check_selection(start, end);
+    if (!from_begin || !to_end)
+       check_boundary(term, term->curs.x, term->curs.y);
+    check_selection(term, start, end);
 
     /* Clear screen also forces a full window redraw, just in case. */
-    if (start.y == 0 && start.x == 0 && end.y == rows)
-       term_invalidate();
-
-    ldata = lineptr(start.y);
-    while (poslt(start, end)) {
-       if (start.x == cols && !erase_lattr)
-           ldata[start.x] &= ~LATTR_WRAPPED;
-       else
-           ldata[start.x] = erase_char;
-       if (incpos(start) && start.y < rows)
-           ldata = lineptr(start.y);
+    if (start.y == 0 && start.x == 0 && end.y == term->rows)
+       term_invalidate(term);
+
+    /* Lines scrolled away shouldn't be brought back on if the terminal
+     * resizes. */
+    if (start.y == 0 && start.x == 0 && end.x == 0 && erase_lattr)
+       erasing_lines_from_top = 1;
+
+    if (term->erase_to_scrollback && erasing_lines_from_top) {
+       /* If it's a whole number of lines, starting at the top, and
+        * we're fully erasing them, erase by scrolling and keep the
+        * lines in the scrollback. */
+       int scrolllines = end.y;
+       if (end.y == term->rows) {
+           /* Shrink until we find a non-empty row.*/
+           scrolllines = find_last_nonempty_line(term, term->screen) + 1;
+       }
+       if (scrolllines > 0)
+           scroll(term, 0, scrolllines - 1, scrolllines, TRUE);
+    } else {
+       termline *ldata = scrlineptr(start.y);
+       while (poslt(start, end)) {
+           if (start.x == term->cols) {
+               if (!erase_lattr)
+                   ldata->lattr &= ~(LATTR_WRAPPED | LATTR_WRAPPED2);
+               else
+                   ldata->lattr = LATTR_NORM;
+           } else {
+               copy_termchar(ldata, start.x, &term->erase_char);
+           }
+           if (incpos(start) && start.y < term->rows) {
+               ldata = scrlineptr(start.y);
+           }
+       }
     }
+
+    /* After an erase of lines from the top of the screen, we shouldn't
+     * bring the lines back again if the terminal enlarges (since the user or
+     * application has explictly thrown them away). */
+    if (erasing_lines_from_top && !(term->alt_which))
+       term->tempsblines = 0;
 }
 
 /*
  * Insert or delete characters within the current line. n is +ve if
  * insertion is desired, and -ve for deletion.
  */
-static void insch(int n)
+static void insch(Terminal *term, int n)
 {
     int dir = (n < 0 ? -1 : +1);
-    int m;
+    int m, j;
     pos cursplus;
-    unsigned long *ldata;
+    termline *ldata;
 
     n = (n < 0 ? -n : n);
-    if (n > cols - curs.x)
-       n = cols - curs.x;
-    m = cols - curs.x - n;
-    cursplus.y = curs.y;
-    cursplus.x = curs.x + n;
-    check_selection(curs, cursplus);
-    ldata = lineptr(curs.y);
+    if (n > term->cols - term->curs.x)
+       n = term->cols - term->curs.x;
+    m = term->cols - term->curs.x - n;
+    cursplus.y = term->curs.y;
+    cursplus.x = term->curs.x + n;
+    check_selection(term, term->curs, cursplus);
+    check_boundary(term, term->curs.x, term->curs.y);
+    if (dir < 0)
+       check_boundary(term, term->curs.x + n, term->curs.y);
+    ldata = scrlineptr(term->curs.y);
     if (dir < 0) {
-       memmove(ldata + curs.x, ldata + curs.x + n, m * TSIZE);
+       for (j = 0; j < m; j++)
+           move_termchar(ldata,
+                         ldata->chars + term->curs.x + j,
+                         ldata->chars + term->curs.x + j + n);
        while (n--)
-           ldata[curs.x + m++] = erase_char;
+           copy_termchar(ldata, term->curs.x + m++, &term->erase_char);
     } else {
-       memmove(ldata + curs.x + n, ldata + curs.x, m * TSIZE);
+       for (j = m; j-- ;)
+           move_termchar(ldata,
+                         ldata->chars + term->curs.x + j + n,
+                         ldata->chars + term->curs.x + j);
        while (n--)
-           ldata[curs.x + n] = erase_char;
+           copy_termchar(ldata, term->curs.x + n, &term->erase_char);
     }
 }
 
@@ -885,131 +2416,157 @@ static void insch(int n)
  * Toggle terminal mode `mode' to state `state'. (`query' indicates
  * whether the mode is a DEC private one or a normal one.)
  */
-static void toggle_mode(int mode, int query, int state)
+static void toggle_mode(Terminal *term, int mode, int query, int state)
 {
-    unsigned long ticks;
-
     if (query)
        switch (mode) {
-         case 1:                      /* application cursor keys */
-           app_cursor_keys = state;
+         case 1:                      /* DECCKM: application cursor keys */
+           term->app_cursor_keys = state;
            break;
-         case 2:                      /* VT52 mode */
-           vt52_mode = !state;
-           if (vt52_mode) {
-               blink_is_real = FALSE;
-               vt52_bold = FALSE;
+         case 2:                      /* DECANM: VT52 mode */
+           term->vt52_mode = !state;
+           if (term->vt52_mode) {
+               term->blink_is_real = FALSE;
+               term->vt52_bold = FALSE;
            } else {
-               blink_is_real = cfg.blinktext;
+               term->blink_is_real = term->blinktext;
            }
+           term_schedule_tblink(term);
            break;
-         case 3:                      /* 80/132 columns */
-           deselect();
-           if (!cfg.no_remote_resize)
-               request_resize(state ? 132 : 80, rows);
-           reset_132 = state;
+         case 3:                      /* DECCOLM: 80/132 columns */
+           deselect(term);
+           if (!term->no_remote_resize)
+               request_resize(term->frontend, state ? 132 : 80, term->rows);
+           term->reset_132 = state;
+           term->alt_t = term->marg_t = 0;
+           term->alt_b = term->marg_b = term->rows - 1;
+           move(term, 0, 0, 0);
+           erase_lots(term, FALSE, TRUE, TRUE);
            break;
-         case 5:                      /* reverse video */
+         case 5:                      /* DECSCNM: reverse video */
            /*
             * Toggle reverse video. If we receive an OFF within the
             * visual bell timeout period after an ON, we trigger an
             * effective visual bell, so that ESC[?5hESC[?5l will
             * always be an actually _visible_ visual bell.
             */
-           ticks = GETTICKCOUNT();
-           /* turn off a previous vbell to avoid inconsistencies */
-           if (ticks - vbell_startpoint >= VBELL_TIMEOUT)
-               in_vbell = FALSE;
-           if (rvideo && !state &&    /* we're turning it off... */
-               (ticks - rvbell_startpoint) < VBELL_TIMEOUT) {  /* ...soon */
-               /* If there's no vbell timeout already, or this one lasts
-                * longer, replace vbell_timeout with ours. */
-               if (!in_vbell ||
-                   (rvbell_startpoint - vbell_startpoint < VBELL_TIMEOUT))
-                   vbell_startpoint = rvbell_startpoint;
-               in_vbell = TRUE;       /* we may clear rvideo but we set in_vbell */
-           } else if (!rvideo && state) {
+           if (term->rvideo && !state) {
+               /* This is an OFF, so set up a vbell */
+               term_schedule_vbell(term, TRUE, term->rvbell_startpoint);
+           } else if (!term->rvideo && state) {
                /* This is an ON, so we notice the time and save it. */
-               rvbell_startpoint = ticks;
+               term->rvbell_startpoint = GETTICKCOUNT();
            }
-           rvideo = state;
-           seen_disp_event = TRUE;
-           if (state)
-               term_update();
+           term->rvideo = state;
+           seen_disp_event(term);
            break;
-         case 6:                      /* DEC origin mode */
-           dec_om = state;
+         case 6:                      /* DECOM: DEC origin mode */
+           term->dec_om = state;
            break;
-         case 7:                      /* auto wrap */
-           wrap = state;
+         case 7:                      /* DECAWM: auto wrap */
+           term->wrap = state;
            break;
-         case 8:                      /* auto key repeat */
-           repeat_off = !state;
+         case 8:                      /* DECARM: auto key repeat */
+           term->repeat_off = !state;
            break;
-         case 10:                     /* set local edit mode */
-           term_editing = state;
-           ldisc_send(NULL, 0, 0);    /* cause ldisc to notice changes */
+         case 10:                     /* DECEDM: set local edit mode */
+           term->term_editing = state;
+           if (term->ldisc)           /* cause ldisc to notice changes */
+               ldisc_send(term->ldisc, NULL, 0, 0);
            break;
-         case 25:                     /* enable/disable cursor */
+         case 25:                     /* DECTCEM: enable/disable cursor */
            compatibility2(OTHER, VT220);
-           cursor_on = state;
-           seen_disp_event = TRUE;
+           term->cursor_on = state;
+           seen_disp_event(term);
            break;
          case 47:                     /* alternate screen */
            compatibility(OTHER);
-           deselect();
-           swap_screen(cfg.no_alt_screen ? 0 : state);
-           disptop = 0;
+           deselect(term);
+           swap_screen(term, term->no_alt_screen ? 0 : state, FALSE, FALSE);
+           term->disptop = 0;
+           break;
+         case 1000:                   /* xterm mouse 1 (normal) */
+           term->xterm_mouse = state ? 1 : 0;
+           set_raw_mouse_mode(term->frontend, state);
+           break;
+         case 1002:                   /* xterm mouse 2 (inc. button drags) */
+           term->xterm_mouse = state ? 2 : 0;
+           set_raw_mouse_mode(term->frontend, state);
+           break;
+         case 1006:                   /* xterm extended mouse */
+           term->xterm_extended_mouse = state ? 1 : 0;
+           break;
+         case 1015:                   /* urxvt extended mouse */
+           term->urxvt_extended_mouse = state ? 1 : 0;
+           break;
+         case 1047:                   /* alternate screen */
+           compatibility(OTHER);
+           deselect(term);
+           swap_screen(term, term->no_alt_screen ? 0 : state, TRUE, TRUE);
+           term->disptop = 0;
+           break;
+         case 1048:                   /* save/restore cursor */
+           if (!term->no_alt_screen)
+                save_cursor(term, state);
+           if (!state) seen_disp_event(term);
            break;
-         case 1000:                   /* xterm mouse 1 */
-           xterm_mouse = state ? 1 : 0;
-           set_raw_mouse_mode(state);
+         case 1049:                   /* cursor & alternate screen */
+           if (state && !term->no_alt_screen)
+               save_cursor(term, state);
+           if (!state) seen_disp_event(term);
+           compatibility(OTHER);
+           deselect(term);
+           swap_screen(term, term->no_alt_screen ? 0 : state, TRUE, FALSE);
+           if (!state && !term->no_alt_screen)
+               save_cursor(term, state);
+           term->disptop = 0;
            break;
-         case 1002:                   /* xterm mouse 2 */
-           xterm_mouse = state ? 2 : 0;
-           set_raw_mouse_mode(state);
+         case 2004:                   /* xterm bracketed paste */
+           term->bracketed_paste = state ? TRUE : FALSE;
            break;
     } else
        switch (mode) {
-         case 4:                      /* set insert mode */
+         case 4:                      /* IRM: set insert mode */
            compatibility(VT102);
-           insert = state;
+           term->insert = state;
            break;
-         case 12:                     /* set echo mode */
-           term_echoing = !state;
-           ldisc_send(NULL, 0, 0);    /* cause ldisc to notice changes */
+         case 12:                     /* SRM: set echo mode */
+           term->term_echoing = !state;
+           if (term->ldisc)           /* cause ldisc to notice changes */
+               ldisc_send(term->ldisc, NULL, 0, 0);
            break;
-         case 20:                     /* Return sends ... */
-           cr_lf_return = state;
+         case 20:                     /* LNM: Return sends ... */
+           term->cr_lf_return = state;
            break;
-         case 34:                     /* Make cursor BIG */
+         case 34:                     /* WYULCURM: Make cursor BIG */
            compatibility2(OTHER, VT220);
-           big_cursor = !state;
+           term->big_cursor = !state;
        }
 }
 
 /*
  * Process an OSC sequence: set window title or icon name.
  */
-static void do_osc(void)
+static void do_osc(Terminal *term)
 {
-    if (osc_w) {
-       while (osc_strlen--)
-           wordness[(unsigned char) osc_string[osc_strlen]] = esc_args[0];
+    if (term->osc_w) {
+       while (term->osc_strlen--)
+           term->wordness[(unsigned char)
+               term->osc_string[term->osc_strlen]] = term->esc_args[0];
     } else {
-       osc_string[osc_strlen] = '\0';
-       switch (esc_args[0]) {
+       term->osc_string[term->osc_strlen] = '\0';
+       switch (term->esc_args[0]) {
          case 0:
          case 1:
-           if (!cfg.no_remote_wintitle)
-               set_icon(osc_string);
-           if (esc_args[0] == 1)
+           if (!term->no_remote_wintitle)
+               set_icon(term->frontend, term->osc_string);
+           if (term->esc_args[0] == 1)
                break;
            /* fall through: parameter 0 means set both */
          case 2:
          case 21:
-           if (!cfg.no_remote_wintitle)
-               set_title(osc_string);
+           if (!term->no_remote_wintitle)
+               set_title(term->frontend, term->osc_string);
            break;
        }
     }
@@ -1018,48 +2575,48 @@ static void do_osc(void)
 /*
  * ANSI printing routines.
  */
-static void term_print_setup(void)
+static void term_print_setup(Terminal *term, char *printer)
 {
-    bufchain_clear(&printer_buf);
-    print_job = printer_start_job(cfg.printer);
+    bufchain_clear(&term->printer_buf);
+    term->print_job = printer_start_job(printer);
 }
-static void term_print_flush(void)
+static void term_print_flush(Terminal *term)
 {
     void *data;
     int len;
     int size;
-    while ((size = bufchain_size(&printer_buf)) > 5) {
-       bufchain_prefix(&printer_buf, &data, &len);
+    while ((size = bufchain_size(&term->printer_buf)) > 5) {
+       bufchain_prefix(&term->printer_buf, &data, &len);
        if (len > size-5)
            len = size-5;
-       printer_job_data(print_job, data, len);
-       bufchain_consume(&printer_buf, len);
+       printer_job_data(term->print_job, data, len);
+       bufchain_consume(&term->printer_buf, len);
     }
 }
-static void term_print_finish(void)
+static void term_print_finish(Terminal *term)
 {
     void *data;
     int len, size;
     char c;
 
-    if (!printing && !only_printing)
+    if (!term->printing && !term->only_printing)
        return;                        /* we need do nothing */
 
-    term_print_flush();
-    while ((size = bufchain_size(&printer_buf)) > 0) {
-       bufchain_prefix(&printer_buf, &data, &len);
+    term_print_flush(term);
+    while ((size = bufchain_size(&term->printer_buf)) > 0) {
+       bufchain_prefix(&term->printer_buf, &data, &len);
        c = *(char *)data;
        if (c == '\033' || c == '\233') {
-           bufchain_consume(&printer_buf, size);
+           bufchain_consume(&term->printer_buf, size);
            break;
        } else {
-           printer_job_data(print_job, &c, 1);
-           bufchain_consume(&printer_buf, 1);
+           printer_job_data(term->print_job, &c, 1);
+           bufchain_consume(&term->printer_buf, 1);
        }
     }
-    printer_finish_job(print_job);
-    print_job = NULL;
-    printing = only_printing = FALSE;
+    printer_finish_job(term->print_job);
+    term->print_job = NULL;
+    term->printing = term->only_printing = FALSE;
 }
 
 /*
@@ -1067,24 +2624,25 @@ static void term_print_finish(void)
  * in-memory display. There's a big state machine in here to
  * process escape sequences...
  */
-void term_out(void)
+static void term_out(Terminal *term)
 {
-    int c, unget;
+    unsigned long c;
+    int unget;
     unsigned char localbuf[256], *chars;
     int nchars = 0;
 
     unget = -1;
 
     chars = NULL;                     /* placate compiler warnings */
-    while (nchars > 0 || bufchain_size(&inbuf) > 0) {
+    while (nchars > 0 || unget != -1 || bufchain_size(&term->inbuf) > 0) {
        if (unget == -1) {
            if (nchars == 0) {
                void *ret;
-               bufchain_prefix(&inbuf, &ret, &nchars);
+               bufchain_prefix(&term->inbuf, &ret, &nchars);
                if (nchars > sizeof(localbuf))
                    nchars = sizeof(localbuf);
                memcpy(localbuf, ret, nchars);
-               bufchain_consume(&inbuf, nchars);
+               bufchain_consume(&term->inbuf, nchars);
                chars = localbuf;
                assert(chars != NULL);
            }
@@ -1095,8 +2653,8 @@ void term_out(void)
             * Optionally log the session traffic to a file. Useful for
             * debugging and possibly also useful for actual logging.
             */
-           if (cfg.logtype == LGTYP_DEBUG)
-               logtraffic((unsigned char) c, LGTYP_DEBUG);
+           if (term->logtype == LGTYP_DEBUG && term->logctx)
+               logtraffic(term->logctx, (unsigned char) c, LGTYP_DEBUG);
        } else {
            c = unget;
            unget = -1;
@@ -1111,61 +2669,60 @@ void term_out(void)
         * If we're printing, add the character to the printer
         * buffer.
         */
-       if (printing) {
-           bufchain_add(&printer_buf, &c, 1);
+       if (term->printing) {
+           bufchain_add(&term->printer_buf, &c, 1);
 
            /*
             * If we're in print-only mode, we use a much simpler
             * state machine designed only to recognise the ESC[4i
             * termination sequence.
             */
-           if (only_printing) {
+           if (term->only_printing) {
                if (c == '\033')
-                   print_state = 1;
+                   term->print_state = 1;
                else if (c == (unsigned char)'\233')
-                   print_state = 2;
-               else if (c == '[' && print_state == 1)
-                   print_state = 2;
-               else if (c == '4' && print_state == 2)
-                   print_state = 3;
-               else if (c == 'i' && print_state == 3)
-                   print_state = 4;
+                   term->print_state = 2;
+               else if (c == '[' && term->print_state == 1)
+                   term->print_state = 2;
+               else if (c == '4' && term->print_state == 2)
+                   term->print_state = 3;
+               else if (c == 'i' && term->print_state == 3)
+                   term->print_state = 4;
                else
-                   print_state = 0;
-               if (print_state == 4) {
-                   printing = only_printing = FALSE;
-                   term_print_finish();
+                   term->print_state = 0;
+               if (term->print_state == 4) {
+                   term_print_finish(term);
                }
                continue;
            }
        }
 
        /* First see about all those translations. */
-       if (termstate == TOPLEVEL) {
-           if (in_utf)
-               switch (utf_state) {
+       if (term->termstate == TOPLEVEL) {
+           if (in_utf(term))
+               switch (term->utf_state) {
                  case 0:
                    if (c < 0x80) {
                        /* UTF-8 must be stateless so we ignore iso2022. */
-                       if (unitab_ctrl[c] != 0xFF) 
-                            c = unitab_ctrl[c];
-                       else c = ((unsigned char)c) | ATTR_ASCII;
+                       if (term->ucsdata->unitab_ctrl[c] != 0xFF) 
+                            c = term->ucsdata->unitab_ctrl[c];
+                       else c = ((unsigned char)c) | CSET_ASCII;
                        break;
                    } else if ((c & 0xe0) == 0xc0) {
-                       utf_size = utf_state = 1;
-                       utf_char = (c & 0x1f);
+                       term->utf_size = term->utf_state = 1;
+                       term->utf_char = (c & 0x1f);
                    } else if ((c & 0xf0) == 0xe0) {
-                       utf_size = utf_state = 2;
-                       utf_char = (c & 0x0f);
+                       term->utf_size = term->utf_state = 2;
+                       term->utf_char = (c & 0x0f);
                    } else if ((c & 0xf8) == 0xf0) {
-                       utf_size = utf_state = 3;
-                       utf_char = (c & 0x07);
+                       term->utf_size = term->utf_state = 3;
+                       term->utf_char = (c & 0x07);
                    } else if ((c & 0xfc) == 0xf8) {
-                       utf_size = utf_state = 4;
-                       utf_char = (c & 0x03);
+                       term->utf_size = term->utf_state = 4;
+                       term->utf_char = (c & 0x03);
                    } else if ((c & 0xfe) == 0xfc) {
-                       utf_size = utf_state = 5;
-                       utf_char = (c & 0x01);
+                       term->utf_size = term->utf_state = 5;
+                       term->utf_char = (c & 0x01);
                    } else {
                        c = UCSERR;
                        break;
@@ -1179,21 +2736,21 @@ void term_out(void)
                    if ((c & 0xC0) != 0x80) {
                        unget = c;
                        c = UCSERR;
-                       utf_state = 0;
+                       term->utf_state = 0;
                        break;
                    }
-                   utf_char = (utf_char << 6) | (c & 0x3f);
-                   if (--utf_state)
+                   term->utf_char = (term->utf_char << 6) | (c & 0x3f);
+                   if (--term->utf_state)
                        continue;
 
-                   c = utf_char;
+                   c = term->utf_char;
 
                    /* Is somebody trying to be evil! */
                    if (c < 0x80 ||
-                       (c < 0x800 && utf_size >= 2) ||
-                       (c < 0x10000 && utf_size >= 3) ||
-                       (c < 0x200000 && utf_size >= 4) ||
-                       (c < 0x4000000 && utf_size >= 5))
+                       (c < 0x800 && term->utf_size >= 2) ||
+                       (c < 0x10000 && term->utf_size >= 3) ||
+                       (c < 0x200000 && term->utf_size >= 4) ||
+                       (c < 0x4000000 && term->utf_size >= 5))
                        c = UCSERR;
 
                    /* Unicode line separator and paragraph separator are CR-LF */
@@ -1225,319 +2782,390 @@ void term_out(void)
                    if (c == 0xFFFE || c == 0xFFFF)
                        c = UCSERR;
 
-                   /* Oops this is a 16bit implementation */
-                   if (c >= 0x10000)
-                       c = 0xFFFD;
                    break;
            }
            /* Are we in the nasty ACS mode? Note: no sco in utf mode. */
-           else if(sco_acs && 
-                   (c!='\033' && c!='\n' && c!='\r' && c!='\b'))
+           else if(term->sco_acs && 
+                   (c!='\033' && c!='\012' && c!='\015' && c!='\b'))
            {
-              if (sco_acs == 2) c ^= 0x80;
-              c |= ATTR_SCOACS;
+              if (term->sco_acs == 2) c |= 0x80;
+              c |= CSET_SCOACS;
            } else {
-               switch (cset_attr[cset]) {
+               switch (term->cset_attr[term->cset]) {
                    /* 
                     * Linedraw characters are different from 'ESC ( B'
                     * only for a small range. For ones outside that
                     * range, make sure we use the same font as well as
                     * the same encoding.
                     */
-                 case ATTR_LINEDRW:
-                   if (unitab_ctrl[c] != 0xFF)
-                       c = unitab_ctrl[c];
+                 case CSET_LINEDRW:
+                   if (term->ucsdata->unitab_ctrl[c] != 0xFF)
+                       c = term->ucsdata->unitab_ctrl[c];
                    else
-                       c = ((unsigned char) c) | ATTR_LINEDRW;
+                       c = ((unsigned char) c) | CSET_LINEDRW;
                    break;
 
-                 case ATTR_GBCHR:
+                 case CSET_GBCHR:
                    /* If UK-ASCII, make the '#' a LineDraw Pound */
                    if (c == '#') {
-                       c = '}' | ATTR_LINEDRW;
+                       c = '}' | CSET_LINEDRW;
                        break;
                    }
-                 /*FALLTHROUGH*/ case ATTR_ASCII:
-                   if (unitab_ctrl[c] != 0xFF)
-                       c = unitab_ctrl[c];
+                 /*FALLTHROUGH*/ case CSET_ASCII:
+                   if (term->ucsdata->unitab_ctrl[c] != 0xFF)
+                       c = term->ucsdata->unitab_ctrl[c];
                    else
-                       c = ((unsigned char) c) | ATTR_ASCII;
+                       c = ((unsigned char) c) | CSET_ASCII;
                    break;
-               case ATTR_SCOACS:
-                   if (c>=' ') c = ((unsigned char)c) | ATTR_SCOACS;
+               case CSET_SCOACS:
+                   if (c>=' ') c = ((unsigned char)c) | CSET_SCOACS;
                    break;
                }
            }
        }
 
-       /* How about C1 controls ? */
-       if ((c & -32) == 0x80 && termstate < DO_CTRLS && !vt52_mode &&
-           has_compat(VT220)) {
-           termstate = SEEN_ESC;
-           esc_query = FALSE;
-           c = '@' + (c & 0x1F);
+       /*
+        * 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)) {
+           if (c == 0x9a)
+               c = 0;
+           else {
+               term->termstate = SEEN_ESC;
+               term->esc_query = FALSE;
+               c = '@' + (c & 0x1F);
+           }
        }
 
        /* Or the GL control. */
-       if (c == '\177' && termstate < DO_CTRLS && has_compat(OTHER)) {
-           if (curs.x && !wrapnext)
-               curs.x--;
-           wrapnext = FALSE;
-           fix_cpos;
-           if (!cfg.no_dbackspace)    /* destructive bksp might be disabled */
-               *cpos = (' ' | curr_attr | ATTR_ASCII);
+       if (c == '\177' && term->termstate < DO_CTRLS && has_compat(OTHER)) {
+           if (term->curs.x && !term->wrapnext)
+               term->curs.x--;
+           term->wrapnext = FALSE;
+           /* destructive backspace might be disabled */
+           if (!term->no_dbackspace) {
+               check_boundary(term, term->curs.x, term->curs.y);
+               check_boundary(term, term->curs.x+1, term->curs.y);
+               copy_termchar(scrlineptr(term->curs.y),
+                             term->curs.x, &term->erase_char);
+           }
        } else
            /* Or normal C0 controls. */
-       if ((c & -32) == 0 && termstate < DO_CTRLS) {
+       if ((c & ~0x1F) == 0 && term->termstate < DO_CTRLS) {
            switch (c) {
-             case '\005':             /* terminal type query */
-               /* Strictly speaking this is VT100 but a VT100 defaults to
+             case '\005':             /* ENQ: terminal type query */
+               /* 
+                * 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);
-               {
-                   char abuf[256], *s, *d;
-                   int state = 0;
-                   for (s = 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;
-                   }
-                   lpage_send(DEFAULT_CODEPAGE, abuf, d - abuf, 0);
+               if (term->ldisc) {
+                   lpage_send(term->ldisc, DEFAULT_CODEPAGE,
+                              term->answerback, term->answerbacklen, 0);
                }
                break;
-             case '\007':
+             case '\007':            /* BEL: Bell */
                {
                    struct beeptime *newbeep;
                    unsigned long ticks;
 
                    ticks = GETTICKCOUNT();
 
-                   if (!beep_overloaded) {
-                       newbeep = smalloc(sizeof(struct beeptime));
+                   if (!term->beep_overloaded) {
+                       newbeep = snew(struct beeptime);
                        newbeep->ticks = ticks;
                        newbeep->next = NULL;
-                       if (!beephead)
-                           beephead = newbeep;
+                       if (!term->beephead)
+                           term->beephead = newbeep;
                        else
-                           beeptail->next = newbeep;
-                       beeptail = newbeep;
-                       nbeeps++;
+                           term->beeptail->next = newbeep;
+                       term->beeptail = newbeep;
+                       term->nbeeps++;
                    }
 
                    /*
                     * Throw out any beeps that happened more than
                     * t seconds ago.
                     */
-                   while (beephead &&
-                          beephead->ticks < ticks - cfg.bellovl_t) {
-                       struct beeptime *tmp = beephead;
-                       beephead = tmp->next;
+                   while (term->beephead &&
+                          term->beephead->ticks < ticks - term->bellovl_t) {
+                       struct beeptime *tmp = term->beephead;
+                       term->beephead = tmp->next;
                        sfree(tmp);
-                       if (!beephead)
-                           beeptail = NULL;
-                       nbeeps--;
+                       if (!term->beephead)
+                           term->beeptail = NULL;
+                       term->nbeeps--;
                    }
 
-                   if (cfg.bellovl && beep_overloaded &&
-                       ticks - lastbeep >= (unsigned)cfg.bellovl_s) {
+                   if (term->bellovl && term->beep_overloaded &&
+                       ticks - term->lastbeep >= (unsigned)term->bellovl_s) {
                        /*
                         * If we're currently overloaded and the
                         * last beep was more than s seconds ago,
                         * leave overload mode.
                         */
-                       beep_overloaded = FALSE;
-                   } else if (cfg.bellovl && !beep_overloaded &&
-                              nbeeps >= cfg.bellovl_n) {
+                       term->beep_overloaded = FALSE;
+                   } else if (term->bellovl && !term->beep_overloaded &&
+                              term->nbeeps >= term->bellovl_n) {
                        /*
                         * Now, if we have n or more beeps
                         * remaining in the queue, go into overload
                         * mode.
                         */
-                       beep_overloaded = TRUE;
+                       term->beep_overloaded = TRUE;
                    }
-                   lastbeep = ticks;
+                   term->lastbeep = ticks;
 
                    /*
                     * Perform an actual beep if we're not overloaded.
                     */
-                   if (!cfg.bellovl || !beep_overloaded) {
-                       if (cfg.beep == BELL_VISUAL) {
-                           in_vbell = TRUE;
-                           vbell_startpoint = ticks;
-                           term_update();
-                       } else
-                           beep(cfg.beep);
+                   if (!term->bellovl || !term->beep_overloaded) {
+                       do_beep(term->frontend, term->beep);
+
+                       if (term->beep == BELL_VISUAL) {
+                           term_schedule_vbell(term, FALSE, 0);
+                       }
                    }
-                   disptop = 0;
+                   seen_disp_event(term);
                }
                break;
-             case '\b':
-               if (curs.x == 0 && (curs.y == 0 || wrap == 0));
-               else if (curs.x == 0 && curs.y > 0)
-                   curs.x = cols - 1, curs.y--;
-               else if (wrapnext)
-                   wrapnext = FALSE;
+             case '\b':              /* BS: Back space */
+               if (term->curs.x == 0 &&
+                   (term->curs.y == 0 || term->wrap == 0))
+                   /* do nothing */ ;
+               else if (term->curs.x == 0 && term->curs.y > 0)
+                   term->curs.x = term->cols - 1, term->curs.y--;
+               else if (term->wrapnext)
+                   term->wrapnext = FALSE;
                else
-                   curs.x--;
-               fix_cpos;
-               seen_disp_event = TRUE;
+                   term->curs.x--;
+               seen_disp_event(term);
                break;
-             case '\016':
+             case '\016':            /* LS1: Locking-shift one */
                compatibility(VT100);
-               cset = 1;
+               term->cset = 1;
                break;
-             case '\017':
+             case '\017':            /* LS0: Locking-shift zero */
                compatibility(VT100);
-               cset = 0;
+               term->cset = 0;
                break;
-             case '\033':
-               if (vt52_mode)
-                   termstate = VT52_ESC;
+             case '\033':            /* ESC: Escape */
+               if (term->vt52_mode)
+                   term->termstate = VT52_ESC;
                else {
                    compatibility(ANSIMIN);
-                   termstate = SEEN_ESC;
-                   esc_query = FALSE;
+                   term->termstate = SEEN_ESC;
+                   term->esc_query = FALSE;
                }
                break;
-             case '\r':
-               curs.x = 0;
-               wrapnext = FALSE;
-               fix_cpos;
-               seen_disp_event = TRUE;
-               paste_hold = 0;
-               logtraffic((unsigned char) c, LGTYP_ASCII);
+             case '\015':            /* CR: Carriage return */
+               term->curs.x = 0;
+               term->wrapnext = FALSE;
+               seen_disp_event(term);
+               term->paste_hold = 0;
+
+               if (term->crhaslf) {
+                   if (term->curs.y == term->marg_b)
+                       scroll(term, term->marg_t, term->marg_b, 1, TRUE);
+                   else if (term->curs.y < term->rows - 1)
+                       term->curs.y++;
+               }
+               if (term->logctx)
+                   logtraffic(term->logctx, (unsigned char) c, LGTYP_ASCII);
                break;
-             case '\014':
+             case '\014':            /* FF: Form feed */
                if (has_compat(SCOANSI)) {
-                   move(0, 0, 0);
-                   erase_lots(FALSE, FALSE, TRUE);
-                   disptop = 0;
-                   wrapnext = FALSE;
-                   seen_disp_event = 1;
+                   move(term, 0, 0, 0);
+                   erase_lots(term, FALSE, FALSE, TRUE);
+                   term->disptop = 0;
+                   term->wrapnext = FALSE;
+                   seen_disp_event(term);
                    break;
                }
-             case '\013':
+             case '\013':            /* VT: Line tabulation */
                compatibility(VT100);
-             case '\n':
-               if (curs.y == marg_b)
-                   scroll(marg_t, marg_b, 1, TRUE);
-               else if (curs.y < rows - 1)
-                   curs.y++;
-               if (cfg.lfhascr)
-                   curs.x = 0;
-               fix_cpos;
-               wrapnext = FALSE;
-               seen_disp_event = 1;
-               paste_hold = 0;
-               logtraffic((unsigned char) c, LGTYP_ASCII);
+             case '\012':            /* LF: Line feed */
+               if (term->curs.y == term->marg_b)
+                   scroll(term, term->marg_t, term->marg_b, 1, TRUE);
+               else if (term->curs.y < term->rows - 1)
+                   term->curs.y++;
+               if (term->lfhascr)
+                   term->curs.x = 0;
+               term->wrapnext = FALSE;
+               seen_disp_event(term);
+               term->paste_hold = 0;
+               if (term->logctx)
+                   logtraffic(term->logctx, (unsigned char) c, LGTYP_ASCII);
                break;
-             case '\t':
+             case '\t':              /* HT: Character tabulation */
                {
-                   pos old_curs = curs;
-                   unsigned long *ldata = lineptr(curs.y);
+                   pos old_curs = term->curs;
+                   termline *ldata = scrlineptr(term->curs.y);
 
                    do {
-                       curs.x++;
-                   } while (curs.x < cols - 1 && !tabs[curs.x]);
+                       term->curs.x++;
+                   } while (term->curs.x < term->cols - 1 &&
+                            !term->tabs[term->curs.x]);
 
-                   if ((ldata[cols] & LATTR_MODE) != LATTR_NORM) {
-                       if (curs.x >= cols / 2)
-                           curs.x = cols / 2 - 1;
+                   if ((ldata->lattr & LATTR_MODE) != LATTR_NORM) {
+                       if (term->curs.x >= term->cols / 2)
+                           term->curs.x = term->cols / 2 - 1;
                    } else {
-                       if (curs.x >= cols)
-                           curs.x = cols - 1;
+                       if (term->curs.x >= term->cols)
+                           term->curs.x = term->cols - 1;
                    }
 
-                   fix_cpos;
-                   check_selection(old_curs, curs);
+                   check_selection(term, old_curs, term->curs);
                }
-               seen_disp_event = TRUE;
+               seen_disp_event(term);
                break;
            }
        } else
-           switch (termstate) {
+           switch (term->termstate) {
              case TOPLEVEL:
-               /* Only graphic characters get this far, ctrls are stripped above */
-               if (wrapnext && wrap) {
-                   cpos[1] |= LATTR_WRAPPED;
-                   if (curs.y == marg_b)
-                       scroll(marg_t, marg_b, 1, TRUE);
-                   else if (curs.y < rows - 1)
-                       curs.y++;
-                   curs.x = 0;
-                   fix_cpos;
-                   wrapnext = FALSE;
-               }
-               if (insert)
-                   insch(1);
-               if (selstate != NO_SELECTION) {
-                   pos cursplus = curs;
-                   incpos(cursplus);
-                   check_selection(curs, cursplus);
-               }
-               if ((c & CSET_MASK) == ATTR_ASCII || (c & CSET_MASK) == 0)
-                   logtraffic((unsigned char) c, LGTYP_ASCII);
+               /* Only graphic characters get this far;
+                * ctrls are stripped above */
                {
-                   extern int wcwidth(wchar_t ucs);
+                   termline *cline = scrlineptr(term->curs.y);
                    int width = 0;
                    if (DIRECT_CHAR(c))
                        width = 1;
                    if (!width)
-                       width = wcwidth((wchar_t) c);
+                       width = (term->cjk_ambig_wide ?
+                                mk_wcwidth_cjk((unsigned int) c) :
+                                mk_wcwidth((unsigned int) c));
+
+                   if (term->wrapnext && term->wrap && width > 0) {
+                       cline->lattr |= LATTR_WRAPPED;
+                       if (term->curs.y == term->marg_b)
+                           scroll(term, term->marg_t, term->marg_b, 1, TRUE);
+                       else if (term->curs.y < term->rows - 1)
+                           term->curs.y++;
+                       term->curs.x = 0;
+                       term->wrapnext = FALSE;
+                       cline = scrlineptr(term->curs.y);
+                   }
+                   if (term->insert && width > 0)
+                       insch(term, width);
+                   if (term->selstate != NO_SELECTION) {
+                       pos cursplus = term->curs;
+                       incpos(cursplus);
+                       check_selection(term, term->curs, cursplus);
+                   }
+                   if (((c & CSET_MASK) == CSET_ASCII ||
+                        (c & CSET_MASK) == 0) &&
+                       term->logctx)
+                       logtraffic(term->logctx, (unsigned char) c,
+                                  LGTYP_ASCII);
+
                    switch (width) {
                      case 2:
-                       *cpos++ = c | curr_attr;
-                       if (++curs.x == cols) {
-                           *cpos |= LATTR_WRAPPED;
-                           if (curs.y == marg_b)
-                               scroll(marg_t, marg_b, 1, TRUE);
-                           else if (curs.y < rows - 1)
-                               curs.y++;
-                           curs.x = 0;
-                           fix_cpos;
+                       /*
+                        * If we're about to display a double-width
+                        * character starting in the rightmost
+                        * column, then we do something special
+                        * instead. We must print a space in the
+                        * last column of the screen, then wrap;
+                        * and we also set LATTR_WRAPPED2 which
+                        * instructs subsequent cut-and-pasting not
+                        * only to splice this line to the one
+                        * after it, but to ignore the space in the
+                        * last character position as well.
+                        * (Because what was actually output to the
+                        * terminal was presumably just a sequence
+                        * of CJK characters, and we don't want a
+                        * space to be pasted in the middle of
+                        * those just because they had the
+                        * misfortune to start in the wrong parity
+                        * column. xterm concurs.)
+                        */
+                       check_boundary(term, term->curs.x, term->curs.y);
+                       check_boundary(term, term->curs.x+2, term->curs.y);
+                       if (term->curs.x == term->cols-1) {
+                           copy_termchar(cline, term->curs.x,
+                                         &term->erase_char);
+                           cline->lattr |= LATTR_WRAPPED | LATTR_WRAPPED2;
+                           if (term->curs.y == term->marg_b)
+                               scroll(term, term->marg_t, term->marg_b,
+                                      1, TRUE);
+                           else if (term->curs.y < term->rows - 1)
+                               term->curs.y++;
+                           term->curs.x = 0;
+                           cline = scrlineptr(term->curs.y);
+                           /* Now we must check_boundary again, of course. */
+                           check_boundary(term, term->curs.x, term->curs.y);
+                           check_boundary(term, term->curs.x+2, term->curs.y);
                        }
-                       *cpos++ = UCSWIDE | curr_attr;
+
+                       /* FULL-TERMCHAR */
+                       clear_cc(cline, term->curs.x);
+                       cline->chars[term->curs.x].chr = c;
+                       cline->chars[term->curs.x].attr = term->curr_attr;
+
+                       term->curs.x++;
+
+                       /* FULL-TERMCHAR */
+                       clear_cc(cline, term->curs.x);
+                       cline->chars[term->curs.x].chr = UCSWIDE;
+                       cline->chars[term->curs.x].attr = term->curr_attr;
+
                        break;
                      case 1:
-                       *cpos++ = c | curr_attr;
+                       check_boundary(term, term->curs.x, term->curs.y);
+                       check_boundary(term, term->curs.x+1, term->curs.y);
+
+                       /* FULL-TERMCHAR */
+                       clear_cc(cline, term->curs.x);
+                       cline->chars[term->curs.x].chr = c;
+                       cline->chars[term->curs.x].attr = term->curr_attr;
+
                        break;
+                     case 0:
+                       if (term->curs.x > 0) {
+                           int x = term->curs.x - 1;
+
+                           /* If we're in wrapnext state, the character
+                            * to combine with is _here_, not to our left. */
+                           if (term->wrapnext)
+                               x++;
+
+                           /*
+                            * If the previous character is
+                            * UCSWIDE, back up another one.
+                            */
+                           if (cline->chars[x].chr == UCSWIDE) {
+                               assert(x > 0);
+                               x--;
+                           }
+
+                           add_cc(cline, x, c);
+                           seen_disp_event(term);
+                       }
+                       continue;
                      default:
                        continue;
                    }
-               }
-               curs.x++;
-               if (curs.x == cols) {
-                   cpos--;
-                   curs.x--;
-                   wrapnext = TRUE;
-                   if (wrap && vt52_mode) {
-                       cpos[1] |= LATTR_WRAPPED;
-                       if (curs.y == marg_b)
-                           scroll(marg_t, marg_b, 1, TRUE);
-                       else if (curs.y < rows - 1)
-                           curs.y++;
-                       curs.x = 0;
-                       fix_cpos;
-                       wrapnext = FALSE;
+                   term->curs.x++;
+                   if (term->curs.x == term->cols) {
+                       term->curs.x--;
+                       term->wrapnext = TRUE;
+                       if (term->wrap && term->vt52_mode) {
+                           cline->lattr |= LATTR_WRAPPED;
+                           if (term->curs.y == term->marg_b)
+                               scroll(term, term->marg_t, term->marg_b, 1, TRUE);
+                           else if (term->curs.y < term->rows - 1)
+                               term->curs.y++;
+                           term->curs.x = 0;
+                           term->wrapnext = FALSE;
+                       }
                    }
+                   seen_disp_event(term);
                }
-               seen_disp_event = 1;
                break;
 
              case OSC_MAYBE_ST:
@@ -1547,121 +3175,124 @@ void term_out(void)
                 * and _if_ we see a backslash, we process it.
                 */
                if (c == '\\') {
-                   do_osc();
-                   termstate = TOPLEVEL;
+                   do_osc(term);
+                   term->termstate = TOPLEVEL;
                    break;
                }
                /* else fall through */
              case SEEN_ESC:
                if (c >= ' ' && c <= '/') {
-                   if (esc_query)
-                       esc_query = -1;
+                   if (term->esc_query)
+                       term->esc_query = -1;
                    else
-                       esc_query = c;
+                       term->esc_query = c;
                    break;
                }
-               termstate = TOPLEVEL;
-               switch (ANSI(c, esc_query)) {
-                 case '[':            /* enter CSI mode */
-                   termstate = SEEN_CSI;
-                   esc_nargs = 1;
-                   esc_args[0] = ARG_DEFAULT;
-                   esc_query = FALSE;
-                   break;
-                 case ']':            /* xterm escape sequences */
+               term->termstate = TOPLEVEL;
+               switch (ANSI(c, term->esc_query)) {
+                 case '[':             /* enter CSI mode */
+                   term->termstate = SEEN_CSI;
+                   term->esc_nargs = 1;
+                   term->esc_args[0] = ARG_DEFAULT;
+                   term->esc_query = FALSE;
+                   break;
+                 case ']':             /* OSC: xterm escape sequences */
                    /* Compatibility is nasty here, xterm, linux, decterm yuk! */
                    compatibility(OTHER);
-                   termstate = SEEN_OSC;
-                   esc_args[0] = 0;
+                   term->termstate = SEEN_OSC;
+                   term->esc_args[0] = 0;
                    break;
-                 case '7':            /* save cursor */
+                 case '7':             /* DECSC: save cursor */
                    compatibility(VT100);
-                   save_cursor(TRUE);
+                   save_cursor(term, TRUE);
                    break;
-                 case '8':            /* restore cursor */
+                 case '8':             /* DECRC: restore cursor */
                    compatibility(VT100);
-                   save_cursor(FALSE);
-                   seen_disp_event = TRUE;
+                   save_cursor(term, FALSE);
+                   seen_disp_event(term);
                    break;
-                 case '=':
+                 case '=':             /* DECKPAM: Keypad application mode */
                    compatibility(VT100);
-                   app_keypad_keys = TRUE;
+                   term->app_keypad_keys = TRUE;
                    break;
-                 case '>':
+                 case '>':             /* DECKPNM: Keypad numeric mode */
                    compatibility(VT100);
-                   app_keypad_keys = FALSE;
+                   term->app_keypad_keys = FALSE;
                    break;
-                 case 'D':            /* exactly equivalent to LF */
+                 case 'D':            /* IND: exactly equivalent to LF */
                    compatibility(VT100);
-                   if (curs.y == marg_b)
-                       scroll(marg_t, marg_b, 1, TRUE);
-                   else if (curs.y < rows - 1)
-                       curs.y++;
-                   fix_cpos;
-                   wrapnext = FALSE;
-                   seen_disp_event = TRUE;
-                   break;
-                 case 'E':            /* exactly equivalent to CR-LF */
+                   if (term->curs.y == term->marg_b)
+                       scroll(term, term->marg_t, term->marg_b, 1, TRUE);
+                   else if (term->curs.y < term->rows - 1)
+                       term->curs.y++;
+                   term->wrapnext = FALSE;
+                   seen_disp_event(term);
+                   break;
+                 case 'E':            /* NEL: exactly equivalent to CR-LF */
                    compatibility(VT100);
-                   curs.x = 0;
-                   if (curs.y == marg_b)
-                       scroll(marg_t, marg_b, 1, TRUE);
-                   else if (curs.y < rows - 1)
-                       curs.y++;
-                   fix_cpos;
-                   wrapnext = FALSE;
-                   seen_disp_event = TRUE;
-                   break;
-                 case 'M':            /* reverse index - backwards LF */
+                   term->curs.x = 0;
+                   if (term->curs.y == term->marg_b)
+                       scroll(term, term->marg_t, term->marg_b, 1, TRUE);
+                   else if (term->curs.y < term->rows - 1)
+                       term->curs.y++;
+                   term->wrapnext = FALSE;
+                   seen_disp_event(term);
+                   break;
+                 case 'M':            /* RI: reverse index - backwards LF */
                    compatibility(VT100);
-                   if (curs.y == marg_t)
-                       scroll(marg_t, marg_b, -1, TRUE);
-                   else if (curs.y > 0)
-                       curs.y--;
-                   fix_cpos;
-                   wrapnext = FALSE;
-                   seen_disp_event = TRUE;
-                   break;
-                 case 'Z':            /* terminal type query */
+                   if (term->curs.y == term->marg_t)
+                       scroll(term, term->marg_t, term->marg_b, -1, TRUE);
+                   else if (term->curs.y > 0)
+                       term->curs.y--;
+                   term->wrapnext = FALSE;
+                   seen_disp_event(term);
+                   break;
+                 case 'Z':            /* DECID: terminal type query */
                    compatibility(VT100);
-                   ldisc_send(id_string, strlen(id_string), 0);
+                   if (term->ldisc)
+                       ldisc_send(term->ldisc, term->id_string,
+                                  strlen(term->id_string), 0);
                    break;
-                 case 'c':            /* restore power-on settings */
+                 case 'c':            /* RIS: restore power-on settings */
                    compatibility(VT100);
-                   power_on();
-                   if (reset_132) {
-                       if (!cfg.no_remote_resize)
-                           request_resize(80, rows);
-                       reset_132 = 0;
+                   power_on(term, TRUE);
+                   if (term->ldisc)   /* cause ldisc to notice changes */
+                       ldisc_send(term->ldisc, NULL, 0, 0);
+                   if (term->reset_132) {
+                       if (!term->no_remote_resize)
+                           request_resize(term->frontend, 80, term->rows);
+                       term->reset_132 = 0;
                    }
-                   fix_cpos;
-                   disptop = 0;
-                   seen_disp_event = TRUE;
+                   term->disptop = 0;
+                   seen_disp_event(term);
                    break;
-                 case 'H':            /* set a tab */
+                 case 'H':            /* HTS: set a tab */
                    compatibility(VT100);
-                   tabs[curs.x] = TRUE;
+                   term->tabs[term->curs.x] = TRUE;
                    break;
 
-                 case ANSI('8', '#'):  /* ESC # 8 fills screen with Es :-) */
+                 case ANSI('8', '#'):  /* DECALN: fills screen with Es :-) */
                    compatibility(VT100);
                    {
-                       unsigned long *ldata;
+                       termline *ldata;
                        int i, j;
                        pos scrtop, scrbot;
 
-                       for (i = 0; i < rows; i++) {
-                           ldata = lineptr(i);
-                           for (j = 0; j < cols; j++)
-                               ldata[j] = ATTR_DEFAULT | 'E';
-                           ldata[cols] = 0;
+                       for (i = 0; i < term->rows; i++) {
+                           ldata = scrlineptr(i);
+                           for (j = 0; j < term->cols; j++) {
+                               copy_termchar(ldata, j,
+                                             &term->basic_erase_char);
+                               ldata->chars[j].chr = 'E';
+                           }
+                           ldata->lattr = LATTR_NORM;
                        }
-                       disptop = 0;
-                       seen_disp_event = TRUE;
+                       term->disptop = 0;
+                       seen_disp_event(term);
                        scrtop.x = scrtop.y = 0;
                        scrbot.x = 0;
-                       scrbot.y = rows;
-                       check_selection(scrtop, scrbot);
+                       scrbot.y = term->rows;
+                       check_selection(term, scrtop, scrbot);
                    }
                    break;
 
@@ -1671,381 +3302,416 @@ void term_out(void)
                  case ANSI('6', '#'):
                    compatibility(VT100);
                    {
-                       unsigned long nlattr;
-                       unsigned long *ldata;
-                       switch (ANSI(c, esc_query)) {
-                         case ANSI('3', '#'):
+                       int nlattr;
+
+                       switch (ANSI(c, term->esc_query)) {
+                         case ANSI('3', '#'): /* DECDHL: 2*height, top */
                            nlattr = LATTR_TOP;
                            break;
-                         case ANSI('4', '#'):
+                         case ANSI('4', '#'): /* DECDHL: 2*height, bottom */
                            nlattr = LATTR_BOT;
                            break;
-                         case ANSI('5', '#'):
+                         case ANSI('5', '#'): /* DECSWL: normal */
                            nlattr = LATTR_NORM;
                            break;
-                         default: /* spiritually case ANSI('6', '#'): */
+                         default: /* case ANSI('6', '#'): DECDWL: 2*width */
                            nlattr = LATTR_WIDE;
                            break;
                        }
-                       ldata = lineptr(curs.y);
-                       ldata[cols] &= ~LATTR_MODE;
-                       ldata[cols] |= nlattr;
+                       scrlineptr(term->curs.y)->lattr = nlattr;
                    }
                    break;
-
+                 /* GZD4: G0 designate 94-set */
                  case ANSI('A', '('):
                    compatibility(VT100);
-                   if (!cfg.no_remote_charset)
-                       cset_attr[0] = ATTR_GBCHR;
+                   if (!term->no_remote_charset)
+                       term->cset_attr[0] = CSET_GBCHR;
                    break;
                  case ANSI('B', '('):
                    compatibility(VT100);
-                   if (!cfg.no_remote_charset)
-                       cset_attr[0] = ATTR_ASCII;
+                   if (!term->no_remote_charset)
+                       term->cset_attr[0] = CSET_ASCII;
                    break;
                  case ANSI('0', '('):
                    compatibility(VT100);
-                   if (!cfg.no_remote_charset)
-                       cset_attr[0] = ATTR_LINEDRW;
+                   if (!term->no_remote_charset)
+                       term->cset_attr[0] = CSET_LINEDRW;
                    break;
                  case ANSI('U', '('): 
                    compatibility(OTHER);
-                   if (!cfg.no_remote_charset)
-                       cset_attr[0] = ATTR_SCOACS; 
+                   if (!term->no_remote_charset)
+                       term->cset_attr[0] = CSET_SCOACS; 
                    break;
-
+                 /* G1D4: G1-designate 94-set */
                  case ANSI('A', ')'):
                    compatibility(VT100);
-                   if (!cfg.no_remote_charset)
-                       cset_attr[1] = ATTR_GBCHR;
+                   if (!term->no_remote_charset)
+                       term->cset_attr[1] = CSET_GBCHR;
                    break;
                  case ANSI('B', ')'):
                    compatibility(VT100);
-                   if (!cfg.no_remote_charset)
-                       cset_attr[1] = ATTR_ASCII;
+                   if (!term->no_remote_charset)
+                       term->cset_attr[1] = CSET_ASCII;
                    break;
                  case ANSI('0', ')'):
                    compatibility(VT100);
-                   if (!cfg.no_remote_charset)
-                       cset_attr[1] = ATTR_LINEDRW;
+                   if (!term->no_remote_charset)
+                       term->cset_attr[1] = CSET_LINEDRW;
                    break;
                  case ANSI('U', ')'): 
                    compatibility(OTHER);
-                   if (!cfg.no_remote_charset)
-                       cset_attr[1] = ATTR_SCOACS; 
+                   if (!term->no_remote_charset)
+                       term->cset_attr[1] = CSET_SCOACS; 
                    break;
-
+                 /* DOCS: Designate other coding system */
                  case ANSI('8', '%'):  /* Old Linux code */
                  case ANSI('G', '%'):
                    compatibility(OTHER);
-                   if (!cfg.no_remote_charset)
-                       utf = 1;
+                   if (!term->no_remote_charset)
+                       term->utf = 1;
                    break;
                  case ANSI('@', '%'):
                    compatibility(OTHER);
-                   if (!cfg.no_remote_charset)
-                       utf = 0;
+                   if (!term->no_remote_charset)
+                       term->utf = 0;
                    break;
                }
                break;
              case SEEN_CSI:
-               termstate = TOPLEVEL;  /* default */
+               term->termstate = TOPLEVEL;  /* default */
                if (isdigit(c)) {
-                   if (esc_nargs <= ARGS_MAX) {
-                       if (esc_args[esc_nargs - 1] == ARG_DEFAULT)
-                           esc_args[esc_nargs - 1] = 0;
-                       esc_args[esc_nargs - 1] =
-                           10 * esc_args[esc_nargs - 1] + c - '0';
+                   if (term->esc_nargs <= ARGS_MAX) {
+                       if (term->esc_args[term->esc_nargs - 1] == ARG_DEFAULT)
+                           term->esc_args[term->esc_nargs - 1] = 0;
+                       term->esc_args[term->esc_nargs - 1] =
+                           10 * term->esc_args[term->esc_nargs - 1] + c - '0';
                    }
-                   termstate = SEEN_CSI;
+                   term->termstate = SEEN_CSI;
                } else if (c == ';') {
-                   if (++esc_nargs <= ARGS_MAX)
-                       esc_args[esc_nargs - 1] = ARG_DEFAULT;
-                   termstate = SEEN_CSI;
+                   if (term->esc_nargs < ARGS_MAX)
+                       term->esc_args[term->esc_nargs++] = ARG_DEFAULT;
+                   term->termstate = SEEN_CSI;
                } else if (c < '@') {
-                   if (esc_query)
-                       esc_query = -1;
+                   if (term->esc_query)
+                       term->esc_query = -1;
                    else if (c == '?')
-                       esc_query = TRUE;
+                       term->esc_query = TRUE;
                    else
-                       esc_query = c;
-                   termstate = SEEN_CSI;
+                       term->esc_query = c;
+                   term->termstate = SEEN_CSI;
                } else
-                   switch (ANSI(c, esc_query)) {
-                     case 'A':       /* move up N lines */
-                       move(curs.x, curs.y - def(esc_args[0], 1), 1);
-                       seen_disp_event = TRUE;
+                   switch (ANSI(c, term->esc_query)) {
+                     case 'A':       /* CUU: move up N lines */
+                       move(term, term->curs.x,
+                            term->curs.y - def(term->esc_args[0], 1), 1);
+                       seen_disp_event(term);
                        break;
-                     case 'e':       /* move down N lines */
+                     case 'e':         /* VPR: move down N lines */
                        compatibility(ANSI);
                        /* FALLTHROUGH */
-                     case 'B':
-                       move(curs.x, curs.y + def(esc_args[0], 1), 1);
-                       seen_disp_event = TRUE;
+                     case 'B':         /* CUD: Cursor down */
+                       move(term, term->curs.x,
+                            term->curs.y + def(term->esc_args[0], 1), 1);
+                       seen_disp_event(term);
                        break;
-                     case ANSI('c', '>'):      /* report xterm version */
+                     case ANSI('c', '>'):      /* DA: report xterm version */
                        compatibility(OTHER);
                        /* this reports xterm version 136 so that VIM can
                           use the drag messages from the mouse reporting */
-                       ldisc_send("\033[>0;136;0c", 11, 0);
+                       if (term->ldisc)
+                           ldisc_send(term->ldisc, "\033[>0;136;0c", 11, 0);
                        break;
-                     case 'a':       /* move right N cols */
+                     case 'a':         /* HPR: move right N cols */
                        compatibility(ANSI);
                        /* FALLTHROUGH */
-                     case 'C':
-                       move(curs.x + def(esc_args[0], 1), curs.y, 1);
-                       seen_disp_event = TRUE;
+                     case 'C':         /* CUF: Cursor right */ 
+                       move(term, term->curs.x + def(term->esc_args[0], 1),
+                            term->curs.y, 1);
+                       seen_disp_event(term);
                        break;
-                     case 'D':       /* move left N cols */
-                       move(curs.x - def(esc_args[0], 1), curs.y, 1);
-                       seen_disp_event = TRUE;
+                     case 'D':       /* CUB: move left N cols */
+                       move(term, term->curs.x - def(term->esc_args[0], 1),
+                            term->curs.y, 1);
+                       seen_disp_event(term);
                        break;
-                     case 'E':       /* move down N lines and CR */
+                     case 'E':       /* CNL: move down N lines and CR */
                        compatibility(ANSI);
-                       move(0, curs.y + def(esc_args[0], 1), 1);
-                       seen_disp_event = TRUE;
+                       move(term, 0,
+                            term->curs.y + def(term->esc_args[0], 1), 1);
+                       seen_disp_event(term);
                        break;
-                     case 'F':       /* move up N lines and CR */
+                     case 'F':       /* CPL: move up N lines and CR */
                        compatibility(ANSI);
-                       move(0, curs.y - def(esc_args[0], 1), 1);
-                       seen_disp_event = TRUE;
+                       move(term, 0,
+                            term->curs.y - def(term->esc_args[0], 1), 1);
+                       seen_disp_event(term);
                        break;
-                     case 'G':
-                     case '`':       /* set horizontal posn */
+                     case 'G':       /* CHA */
+                     case '`':       /* HPA: set horizontal posn */
                        compatibility(ANSI);
-                       move(def(esc_args[0], 1) - 1, curs.y, 0);
-                       seen_disp_event = TRUE;
+                       move(term, def(term->esc_args[0], 1) - 1,
+                            term->curs.y, 0);
+                       seen_disp_event(term);
                        break;
-                     case 'd':       /* set vertical posn */
+                     case 'd':       /* VPA: set vertical posn */
                        compatibility(ANSI);
-                       move(curs.x,
-                            (dec_om ? marg_t : 0) + def(esc_args[0],
-                                                        1) - 1,
-                            (dec_om ? 2 : 0));
-                       seen_disp_event = TRUE;
+                       move(term, term->curs.x,
+                            ((term->dec_om ? term->marg_t : 0) +
+                             def(term->esc_args[0], 1) - 1),
+                            (term->dec_om ? 2 : 0));
+                       seen_disp_event(term);
                        break;
-                     case 'H':
-                     case 'f':       /* set horz and vert posns at once */
-                       if (esc_nargs < 2)
-                           esc_args[1] = ARG_DEFAULT;
-                       move(def(esc_args[1], 1) - 1,
-                            (dec_om ? marg_t : 0) + def(esc_args[0],
-                                                        1) - 1,
-                            (dec_om ? 2 : 0));
-                       seen_disp_event = TRUE;
+                     case 'H':      /* CUP */
+                     case 'f':      /* HVP: set horz and vert posns at once */
+                       if (term->esc_nargs < 2)
+                           term->esc_args[1] = ARG_DEFAULT;
+                       move(term, def(term->esc_args[1], 1) - 1,
+                            ((term->dec_om ? term->marg_t : 0) +
+                             def(term->esc_args[0], 1) - 1),
+                            (term->dec_om ? 2 : 0));
+                       seen_disp_event(term);
                        break;
-                     case 'J':       /* erase screen or parts of it */
+                     case 'J':       /* ED: erase screen or parts of it */
                        {
-                           unsigned int i = def(esc_args[0], 0) + 1;
-                           if (i > 3)
-                               i = 0;
-                           erase_lots(FALSE, !!(i & 2), !!(i & 1));
+                           unsigned int i = def(term->esc_args[0], 0);
+                           if (i == 3) {
+                               /* Erase Saved Lines (xterm)
+                                * This follows Thomas Dickey's xterm. */
+                               term_clrsb(term);
+                           } else {
+                               i++;
+                               if (i > 3)
+                                   i = 0;
+                               erase_lots(term, FALSE, !!(i & 2), !!(i & 1));
+                           }
                        }
-                       disptop = 0;
-                       seen_disp_event = TRUE;
+                       term->disptop = 0;
+                       seen_disp_event(term);
                        break;
-                     case 'K':       /* erase line or parts of it */
+                     case 'K':       /* EL: erase line or parts of it */
                        {
-                           unsigned int i = def(esc_args[0], 0) + 1;
+                           unsigned int i = def(term->esc_args[0], 0) + 1;
                            if (i > 3)
                                i = 0;
-                           erase_lots(TRUE, !!(i & 2), !!(i & 1));
+                           erase_lots(term, TRUE, !!(i & 2), !!(i & 1));
                        }
-                       seen_disp_event = TRUE;
+                       seen_disp_event(term);
                        break;
-                     case 'L':       /* insert lines */
+                     case 'L':       /* IL: insert lines */
                        compatibility(VT102);
-                       if (curs.y <= marg_b)
-                           scroll(curs.y, marg_b, -def(esc_args[0], 1),
-                                  FALSE);
-                       fix_cpos;
-                       seen_disp_event = TRUE;
+                       if (term->curs.y <= term->marg_b)
+                           scroll(term, term->curs.y, term->marg_b,
+                                  -def(term->esc_args[0], 1), FALSE);
+                       seen_disp_event(term);
                        break;
-                     case 'M':       /* delete lines */
+                     case 'M':       /* DL: delete lines */
                        compatibility(VT102);
-                       if (curs.y <= marg_b)
-                           scroll(curs.y, marg_b, def(esc_args[0], 1),
+                       if (term->curs.y <= term->marg_b)
+                           scroll(term, term->curs.y, term->marg_b,
+                                  def(term->esc_args[0], 1),
                                   TRUE);
-                       fix_cpos;
-                       seen_disp_event = TRUE;
+                       seen_disp_event(term);
                        break;
-                     case '@':       /* insert chars */
+                     case '@':       /* ICH: insert chars */
                        /* XXX VTTEST says this is vt220, vt510 manual says vt102 */
                        compatibility(VT102);
-                       insch(def(esc_args[0], 1));
-                       seen_disp_event = TRUE;
+                       insch(term, def(term->esc_args[0], 1));
+                       seen_disp_event(term);
                        break;
-                     case 'P':       /* delete chars */
+                     case 'P':       /* DCH: delete chars */
                        compatibility(VT102);
-                       insch(-def(esc_args[0], 1));
-                       seen_disp_event = TRUE;
+                       insch(term, -def(term->esc_args[0], 1));
+                       seen_disp_event(term);
                        break;
-                     case 'c':       /* terminal type query */
+                     case 'c':       /* DA: terminal type query */
                        compatibility(VT100);
                        /* This is the response for a VT102 */
-                       ldisc_send(id_string, strlen(id_string), 0);
+                       if (term->ldisc)
+                           ldisc_send(term->ldisc, term->id_string,
+                                      strlen(term->id_string), 0);
                        break;
-                     case 'n':       /* cursor position query */
-                       if (esc_args[0] == 6) {
-                           char buf[32];
-                           sprintf(buf, "\033[%d;%dR", curs.y + 1,
-                                   curs.x + 1);
-                           ldisc_send(buf, strlen(buf), 0);
-                       } else if (esc_args[0] == 5) {
-                           ldisc_send("\033[0n", 4, 0);
+                     case 'n':       /* DSR: cursor position query */
+                       if (term->ldisc) {
+                           if (term->esc_args[0] == 6) {
+                               char buf[32];
+                               sprintf(buf, "\033[%d;%dR", term->curs.y + 1,
+                                       term->curs.x + 1);
+                               ldisc_send(term->ldisc, buf, strlen(buf), 0);
+                           } else if (term->esc_args[0] == 5) {
+                               ldisc_send(term->ldisc, "\033[0n", 4, 0);
+                           }
                        }
                        break;
-                     case 'h':       /* toggle modes to high */
+                     case 'h':       /* SM: toggle modes to high */
                      case ANSI_QUE('h'):
                        compatibility(VT100);
                        {
                            int i;
-                           for (i = 0; i < esc_nargs; i++)
-                               toggle_mode(esc_args[i], esc_query, TRUE);
+                           for (i = 0; i < term->esc_nargs; i++)
+                               toggle_mode(term, term->esc_args[i],
+                                           term->esc_query, TRUE);
                        }
                        break;
-                     case 'i':
+                     case 'i':         /* MC: Media copy */
                      case ANSI_QUE('i'):
                        compatibility(VT100);
                        {
-                           if (esc_nargs != 1) break;
-                           if (esc_args[0] == 5 && *cfg.printer) {
-                               printing = TRUE;
-                               only_printing = !esc_query;
-                               print_state = 0;
-                               term_print_setup();
-                           } else if (esc_args[0] == 4 && printing) {
-                               printing = FALSE;
-                               only_printing = FALSE;
-                               term_print_finish();
+                           char *printer;
+                           if (term->esc_nargs != 1) break;
+                           if (term->esc_args[0] == 5 && 
+                               (printer = conf_get_str(term->conf,
+                                                       CONF_printer))[0]) {
+                               term->printing = TRUE;
+                               term->only_printing = !term->esc_query;
+                               term->print_state = 0;
+                               term_print_setup(term, printer);
+                           } else if (term->esc_args[0] == 4 &&
+                                      term->printing) {
+                               term_print_finish(term);
                            }
                        }
                        break;                  
-                     case 'l':       /* toggle modes to low */
+                     case 'l':       /* RM: toggle modes to low */
                      case ANSI_QUE('l'):
                        compatibility(VT100);
                        {
                            int i;
-                           for (i = 0; i < esc_nargs; i++)
-                               toggle_mode(esc_args[i], esc_query, FALSE);
+                           for (i = 0; i < term->esc_nargs; i++)
+                               toggle_mode(term, term->esc_args[i],
+                                           term->esc_query, FALSE);
                        }
                        break;
-                     case 'g':       /* clear tabs */
+                     case 'g':       /* TBC: clear tabs */
                        compatibility(VT100);
-                       if (esc_nargs == 1) {
-                           if (esc_args[0] == 0) {
-                               tabs[curs.x] = FALSE;
-                           } else if (esc_args[0] == 3) {
+                       if (term->esc_nargs == 1) {
+                           if (term->esc_args[0] == 0) {
+                               term->tabs[term->curs.x] = FALSE;
+                           } else if (term->esc_args[0] == 3) {
                                int i;
-                               for (i = 0; i < cols; i++)
-                                   tabs[i] = FALSE;
+                               for (i = 0; i < term->cols; i++)
+                                   term->tabs[i] = FALSE;
                            }
                        }
                        break;
-                     case 'r':       /* set scroll margins */
+                     case 'r':       /* DECSTBM: set scroll margins */
                        compatibility(VT100);
-                       if (esc_nargs <= 2) {
+                       if (term->esc_nargs <= 2) {
                            int top, bot;
-                           top = def(esc_args[0], 1) - 1;
-                           bot = (esc_nargs <= 1
-                                  || esc_args[1] ==
-                                  0 ? rows : def(esc_args[1], rows)) - 1;
-                           if (bot >= rows)
-                               bot = rows - 1;
+                           top = def(term->esc_args[0], 1) - 1;
+                           bot = (term->esc_nargs <= 1
+                                  || term->esc_args[1] == 0 ?
+                                  term->rows :
+                                  def(term->esc_args[1], term->rows)) - 1;
+                           if (bot >= term->rows)
+                               bot = term->rows - 1;
                            /* VTTEST Bug 9 - if region is less than 2 lines
                             * don't change region.
                             */
                            if (bot - top > 0) {
-                               marg_t = top;
-                               marg_b = bot;
-                               curs.x = 0;
+                               term->marg_t = top;
+                               term->marg_b = bot;
+                               term->curs.x = 0;
                                /*
                                 * I used to think the cursor should be
                                 * placed at the top of the newly marginned
                                 * area. Apparently not: VMS TPU falls over
                                 * if so.
                                 *
-                                * Well actually it should for Origin mode - RDB
+                                * Well actually it should for
+                                * Origin mode - RDB
                                 */
-                               curs.y = (dec_om ? marg_t : 0);
-                               fix_cpos;
-                               seen_disp_event = TRUE;
+                               term->curs.y = (term->dec_om ?
+                                               term->marg_t : 0);
+                               seen_disp_event(term);
                            }
                        }
                        break;
-                     case 'm':       /* set graphics rendition */
+                     case 'm':       /* SGR: set graphics rendition */
                        {
                            /* 
-                            * A VT100 without the AVO only had one attribute, either
-                            * underline or reverse video depending on the cursor type,
-                            * this was selected by CSI 7m.
+                            * A VT100 without the AVO only had one
+                            * attribute, either underline or
+                            * reverse video depending on the
+                            * cursor type, this was selected by
+                            * CSI 7m.
                             *
                             * case 2:
-                            *  This is sometimes DIM, eg on the GIGI and Linux
+                            *  This is sometimes DIM, eg on the
+                            *  GIGI and Linux
                             * case 8:
                             *  This is sometimes INVIS various ANSI.
                             * case 21:
                             *  This like 22 disables BOLD, DIM and INVIS
                             *
-                            * The ANSI colours appear on any terminal that has colour
-                            * (obviously) but the interaction between sgr0 and the
-                            * colours varies but is usually related to the background
-                            * colour erase item.
-                            * The interaction between colour attributes and the mono
-                            * ones is also very implementation dependent.
+                            * The ANSI colours appear on any
+                            * terminal that has colour (obviously)
+                            * but the interaction between sgr0 and
+                            * the colours varies but is usually
+                            * related to the background colour
+                            * erase item. The interaction between
+                            * colour attributes and the mono ones
+                            * is also very implementation
+                            * dependent.
                             *
-                            * The 39 and 49 attributes are likely to be unimplemented.
+                            * The 39 and 49 attributes are likely
+                            * to be unimplemented.
                             */
                            int i;
-                           for (i = 0; i < esc_nargs; i++) {
-                               switch (def(esc_args[i], 0)) {
+                           for (i = 0; i < term->esc_nargs; i++) {
+                               switch (def(term->esc_args[i], 0)) {
                                  case 0:       /* restore defaults */
-                                   curr_attr = ATTR_DEFAULT;
+                                   term->curr_attr = term->default_attr;
                                    break;
                                  case 1:       /* enable bold */
                                    compatibility(VT100AVO);
-                                   curr_attr |= ATTR_BOLD;
+                                   term->curr_attr |= ATTR_BOLD;
                                    break;
                                  case 21:      /* (enable double underline) */
                                    compatibility(OTHER);
                                  case 4:       /* enable underline */
                                    compatibility(VT100AVO);
-                                   curr_attr |= ATTR_UNDER;
+                                   term->curr_attr |= ATTR_UNDER;
                                    break;
                                  case 5:       /* enable blink */
                                    compatibility(VT100AVO);
-                                   curr_attr |= ATTR_BLINK;
+                                   term->curr_attr |= ATTR_BLINK;
+                                   break;
+                                 case 6:       /* SCO light bkgrd */
+                                   compatibility(SCOANSI);
+                                   term->blink_is_real = FALSE;
+                                   term->curr_attr |= ATTR_BLINK;
+                                   term_schedule_tblink(term);
                                    break;
                                  case 7:       /* enable reverse video */
-                                   curr_attr |= ATTR_REVERSE;
+                                   term->curr_attr |= ATTR_REVERSE;
                                    break;
                                  case 10:      /* SCO acs off */
                                    compatibility(SCOANSI);
-                                   if (cfg.no_remote_charset) break;
-                                   sco_acs = 0; break;
+                                   if (term->no_remote_charset) break;
+                                   term->sco_acs = 0; break;
                                  case 11:      /* SCO acs on */
                                    compatibility(SCOANSI);
-                                   if (cfg.no_remote_charset) break;
-                                   sco_acs = 1; break;
-                                 case 12:      /* SCO acs on flipped */
+                                   if (term->no_remote_charset) break;
+                                   term->sco_acs = 1; break;
+                                 case 12:      /* SCO acs on, |0x80 */
                                    compatibility(SCOANSI);
-                                   if (cfg.no_remote_charset) break;
-                                   sco_acs = 2; break;
+                                   if (term->no_remote_charset) break;
+                                   term->sco_acs = 2; break;
                                  case 22:      /* disable bold */
                                    compatibility2(OTHER, VT220);
-                                   curr_attr &= ~ATTR_BOLD;
+                                   term->curr_attr &= ~ATTR_BOLD;
                                    break;
                                  case 24:      /* disable underline */
                                    compatibility2(OTHER, VT220);
-                                   curr_attr &= ~ATTR_UNDER;
+                                   term->curr_attr &= ~ATTR_UNDER;
                                    break;
                                  case 25:      /* disable blink */
                                    compatibility2(OTHER, VT220);
-                                   curr_attr &= ~ATTR_BLINK;
+                                   term->curr_attr &= ~ATTR_BLINK;
                                    break;
                                  case 27:      /* disable reverse video */
                                    compatibility2(OTHER, VT220);
-                                   curr_attr &= ~ATTR_REVERSE;
+                                   term->curr_attr &= ~ATTR_REVERSE;
                                    break;
                                  case 30:
                                  case 31:
@@ -2056,13 +3722,27 @@ void term_out(void)
                                  case 36:
                                  case 37:
                                    /* foreground */
-                                   curr_attr &= ~ATTR_FGMASK;
-                                   curr_attr |=
-                                       (esc_args[i] - 30) << ATTR_FGSHIFT;
+                                   term->curr_attr &= ~ATTR_FGMASK;
+                                   term->curr_attr |=
+                                       (term->esc_args[i] - 30)<<ATTR_FGSHIFT;
+                                   break;
+                                 case 90:
+                                 case 91:
+                                 case 92:
+                                 case 93:
+                                 case 94:
+                                 case 95:
+                                 case 96:
+                                 case 97:
+                                   /* aixterm-style bright foreground */
+                                   term->curr_attr &= ~ATTR_FGMASK;
+                                   term->curr_attr |=
+                                       ((term->esc_args[i] - 90 + 8)
+                                         << ATTR_FGSHIFT);
                                    break;
                                  case 39:      /* default-foreground */
-                                   curr_attr &= ~ATTR_FGMASK;
-                                   curr_attr |= ATTR_DEFFG;
+                                   term->curr_attr &= ~ATTR_FGMASK;
+                                   term->curr_attr |= ATTR_DEFFG;
                                    break;
                                  case 40:
                                  case 41:
@@ -2073,61 +3753,95 @@ void term_out(void)
                                  case 46:
                                  case 47:
                                    /* background */
-                                   curr_attr &= ~ATTR_BGMASK;
-                                   curr_attr |=
-                                       (esc_args[i] - 40) << ATTR_BGSHIFT;
+                                   term->curr_attr &= ~ATTR_BGMASK;
+                                   term->curr_attr |=
+                                       (term->esc_args[i] - 40)<<ATTR_BGSHIFT;
+                                   break;
+                                 case 100:
+                                 case 101:
+                                 case 102:
+                                 case 103:
+                                 case 104:
+                                 case 105:
+                                 case 106:
+                                 case 107:
+                                   /* aixterm-style bright background */
+                                   term->curr_attr &= ~ATTR_BGMASK;
+                                   term->curr_attr |=
+                                       ((term->esc_args[i] - 100 + 8)
+                                         << ATTR_BGSHIFT);
                                    break;
                                  case 49:      /* default-background */
-                                   curr_attr &= ~ATTR_BGMASK;
-                                   curr_attr |= ATTR_DEFBG;
+                                   term->curr_attr &= ~ATTR_BGMASK;
+                                   term->curr_attr |= ATTR_DEFBG;
+                                   break;
+                                 case 38:   /* xterm 256-colour mode */
+                                   if (i+2 < term->esc_nargs &&
+                                       term->esc_args[i+1] == 5) {
+                                       term->curr_attr &= ~ATTR_FGMASK;
+                                       term->curr_attr |=
+                                           ((term->esc_args[i+2] & 0xFF)
+                                            << ATTR_FGSHIFT);
+                                       i += 2;
+                                   }
+                                   break;
+                                 case 48:   /* xterm 256-colour mode */
+                                   if (i+2 < term->esc_nargs &&
+                                       term->esc_args[i+1] == 5) {
+                                       term->curr_attr &= ~ATTR_BGMASK;
+                                       term->curr_attr |=
+                                           ((term->esc_args[i+2] & 0xFF)
+                                            << ATTR_BGSHIFT);
+                                       i += 2;
+                                   }
                                    break;
                                }
                            }
-                           if (use_bce)
-                               erase_char = (' ' | ATTR_ASCII |
-                                            (curr_attr & 
-                                             (ATTR_FGMASK | ATTR_BGMASK)));
+                           set_erase_char(term);
                        }
                        break;
                      case 's':       /* save cursor */
-                       save_cursor(TRUE);
+                       save_cursor(term, TRUE);
                        break;
                      case 'u':       /* restore cursor */
-                       save_cursor(FALSE);
-                       seen_disp_event = TRUE;
+                       save_cursor(term, FALSE);
+                       seen_disp_event(term);
                        break;
-                     case 't':       /* set page size - ie window height */
+                     case 't': /* DECSLPP: set page size - ie window height */
                        /*
                         * VT340/VT420 sequence DECSLPP, DEC only allows values
                         *  24/25/36/48/72/144 other emulators (eg dtterm) use
                         * illegal values (eg first arg 1..9) for window changing 
                         * and reports.
                         */
-                       if (esc_nargs <= 1
-                           && (esc_args[0] < 1 || esc_args[0] >= 24)) {
+                       if (term->esc_nargs <= 1
+                           && (term->esc_args[0] < 1 ||
+                               term->esc_args[0] >= 24)) {
                            compatibility(VT340TEXT);
-                           if (!cfg.no_remote_resize)
-                               request_resize(cols, def(esc_args[0], 24));
-                           deselect();
-                       } else if (esc_nargs >= 1 &&
-                                  esc_args[0] >= 1 &&
-                                  esc_args[0] < 24) {
+                           if (!term->no_remote_resize)
+                               request_resize(term->frontend, term->cols,
+                                              def(term->esc_args[0], 24));
+                           deselect(term);
+                       } else if (term->esc_nargs >= 1 &&
+                                  term->esc_args[0] >= 1 &&
+                                  term->esc_args[0] < 24) {
                            compatibility(OTHER);
 
-                           switch (esc_args[0]) {
+                           switch (term->esc_args[0]) {
                                int x, y, len;
                                char buf[80], *p;
                              case 1:
-                               set_iconic(FALSE);
+                               set_iconic(term->frontend, FALSE);
                                break;
                              case 2:
-                               set_iconic(TRUE);
+                               set_iconic(term->frontend, TRUE);
                                break;
                              case 3:
-                               if (esc_nargs >= 3) {
-                                   if (!cfg.no_remote_resize)
-                                       move_window(def(esc_args[1], 0),
-                                                   def(esc_args[2], 0));
+                               if (term->esc_nargs >= 3) {
+                                   if (!term->no_remote_resize)
+                                       move_window(term->frontend,
+                                                   def(term->esc_args[1], 0),
+                                                   def(term->esc_args[2], 0));
                                }
                                break;
                              case 4:
@@ -2137,43 +3851,56 @@ void term_out(void)
                                 * manage it. */
                                break;
                              case 5:
-                               set_zorder(TRUE);   /* move to top */
+                               /* move to top */
+                               set_zorder(term->frontend, TRUE);
                                break;
                              case 6:
-                               set_zorder(FALSE);  /* move to bottom */
+                               /* move to bottom */
+                               set_zorder(term->frontend, FALSE);
                                break;
                              case 7:
-                               refresh_window();
+                               refresh_window(term->frontend);
                                break;
                              case 8:
-                               if (esc_nargs >= 3) {
-                                   if (!cfg.no_remote_resize)
-                                       request_resize(def(esc_args[2], cfg.width),
-                                                      def(esc_args[1], cfg.height));
+                               if (term->esc_nargs >= 3) {
+                                   if (!term->no_remote_resize)
+                                       request_resize(term->frontend,
+                                                      def(term->esc_args[2], term->conf_width),
+                                                      def(term->esc_args[1], term->conf_height));
                                }
                                break;
                              case 9:
-                               if (esc_nargs >= 2)
-                                   set_zoomed(esc_args[1] ? TRUE : FALSE);
+                               if (term->esc_nargs >= 2)
+                                   set_zoomed(term->frontend,
+                                              term->esc_args[1] ?
+                                              TRUE : FALSE);
                                break;
                              case 11:
-                               ldisc_send(is_iconic() ? "\033[1t" : "\033[2t",
-                                          4, 0);
+                               if (term->ldisc)
+                                   ldisc_send(term->ldisc,
+                                              is_iconic(term->frontend) ?
+                                              "\033[2t" : "\033[1t", 4, 0);
                                break;
                              case 13:
-                               get_window_pos(&x, &y);
-                               len = sprintf(buf, "\033[3;%d;%dt", x, y);
-                               ldisc_send(buf, len, 0);
+                               if (term->ldisc) {
+                                   get_window_pos(term->frontend, &x, &y);
+                                   len = sprintf(buf, "\033[3;%d;%dt", x, y);
+                                   ldisc_send(term->ldisc, buf, len, 0);
+                               }
                                break;
                              case 14:
-                               get_window_pixels(&x, &y);
-                               len = sprintf(buf, "\033[4;%d;%dt", x, y);
-                               ldisc_send(buf, len, 0);
+                               if (term->ldisc) {
+                                   get_window_pixels(term->frontend, &x, &y);
+                                   len = sprintf(buf, "\033[4;%d;%dt", y, x);
+                                   ldisc_send(term->ldisc, buf, len, 0);
+                               }
                                break;
                              case 18:
-                               len = sprintf(buf, "\033[8;%d;%dt",
-                                             rows, cols);
-                               ldisc_send(buf, len, 0);
+                               if (term->ldisc) {
+                                   len = sprintf(buf, "\033[8;%d;%dt",
+                                                 term->rows, term->cols);
+                                   ldisc_send(term->ldisc, buf, len, 0);
+                               }
                                break;
                              case 19:
                                /*
@@ -2193,186 +3920,280 @@ void term_out(void)
                                 */
                                break;
                              case 20:
-                               p = get_window_title(TRUE);
-                               len = strlen(p);
-                               ldisc_send("\033]L", 3, 0);
-                               ldisc_send(p, len, 0);
-                               ldisc_send("\033\\", 2, 0);
+                               if (term->ldisc &&
+                                   term->remote_qtitle_action != TITLE_NONE) {
+                                   if(term->remote_qtitle_action == TITLE_REAL)
+                                       p = get_window_title(term->frontend, TRUE);
+                                   else
+                                       p = EMPTY_WINDOW_TITLE;
+                                   len = strlen(p);
+                                   ldisc_send(term->ldisc, "\033]L", 3, 0);
+                                   ldisc_send(term->ldisc, p, len, 0);
+                                   ldisc_send(term->ldisc, "\033\\", 2, 0);
+                               }
                                break;
                              case 21:
-                               p = get_window_title(FALSE);
-                               len = strlen(p);
-                               ldisc_send("\033]l", 3, 0);
-                               ldisc_send(p, len, 0);
-                               ldisc_send("\033\\", 2, 0);
+                               if (term->ldisc &&
+                                   term->remote_qtitle_action != TITLE_NONE) {
+                                   if(term->remote_qtitle_action == TITLE_REAL)
+                                       p = get_window_title(term->frontend, FALSE);
+                                   else
+                                       p = EMPTY_WINDOW_TITLE;
+                                   len = strlen(p);
+                                   ldisc_send(term->ldisc, "\033]l", 3, 0);
+                                   ldisc_send(term->ldisc, p, len, 0);
+                                   ldisc_send(term->ldisc, "\033\\", 2, 0);
+                               }
                                break;
                            }
                        }
                        break;
-                     case 'S':
+                     case 'S':         /* SU: Scroll up */
                        compatibility(SCOANSI);
-                       scroll(marg_t, marg_b, def(esc_args[0], 1), TRUE);
-                       fix_cpos;
-                       wrapnext = FALSE;
-                       seen_disp_event = TRUE;
+                       scroll(term, term->marg_t, term->marg_b,
+                              def(term->esc_args[0], 1), TRUE);
+                       term->wrapnext = FALSE;
+                       seen_disp_event(term);
                        break;
-                     case 'T':
+                     case 'T':         /* SD: Scroll down */
                        compatibility(SCOANSI);
-                       scroll(marg_t, marg_b, -def(esc_args[0], 1), TRUE);
-                       fix_cpos;
-                       wrapnext = FALSE;
-                       seen_disp_event = TRUE;
+                       scroll(term, term->marg_t, term->marg_b,
+                              -def(term->esc_args[0], 1), TRUE);
+                       term->wrapnext = FALSE;
+                       seen_disp_event(term);
                        break;
-                     case ANSI('|', '*'):
-                       /* VT420 sequence DECSNLS
+                     case ANSI('|', '*'): /* DECSNLS */
+                       /* 
                         * Set number of lines on screen
-                        * VT420 uses VGA like hardware and can support any size in
-                        * reasonable range (24..49 AIUI) with no default specified.
+                        * VT420 uses VGA like hardware and can
+                        * support any size in reasonable range
+                        * (24..49 AIUI) with no default specified.
                         */
                        compatibility(VT420);
-                       if (esc_nargs == 1 && esc_args[0] > 0) {
-                           if (!cfg.no_remote_resize)
-                               request_resize(cols, def(esc_args[0], cfg.height));
-                           deselect();
+                       if (term->esc_nargs == 1 && term->esc_args[0] > 0) {
+                           if (!term->no_remote_resize)
+                               request_resize(term->frontend, term->cols,
+                                              def(term->esc_args[0],
+                                                  term->conf_height));
+                           deselect(term);
                        }
                        break;
-                     case ANSI('|', '$'):
-                       /* VT340/VT420 sequence DECSCPP
+                     case ANSI('|', '$'): /* DECSCPP */
+                       /*
                         * Set number of columns per page
-                        * Docs imply range is only 80 or 132, but I'll allow any.
+                        * Docs imply range is only 80 or 132, but
+                        * I'll allow any.
                         */
                        compatibility(VT340TEXT);
-                       if (esc_nargs <= 1) {
-                           if (!cfg.no_remote_resize)
-                               request_resize(def(esc_args[0], cfg.width), rows);
-                           deselect();
+                       if (term->esc_nargs <= 1) {
+                           if (!term->no_remote_resize)
+                               request_resize(term->frontend,
+                                              def(term->esc_args[0],
+                                                  term->conf_width),
+                                              term->rows);
+                           deselect(term);
                        }
                        break;
-                     case 'X':       /* write N spaces w/o moving cursor */
-                       /* XXX VTTEST says this is vt220, vt510 manual says vt100 */
+                     case 'X':     /* ECH: write N spaces w/o moving cursor */
+                       /* XXX VTTEST says this is vt220, vt510 manual
+                        * says vt100 */
                        compatibility(ANSIMIN);
                        {
-                           int n = def(esc_args[0], 1);
+                           int n = def(term->esc_args[0], 1);
                            pos cursplus;
-                           unsigned long *p = cpos;
-                           if (n > cols - curs.x)
-                               n = cols - curs.x;
-                           cursplus = curs;
+                           int p = term->curs.x;
+                           termline *cline = scrlineptr(term->curs.y);
+
+                           if (n > term->cols - term->curs.x)
+                               n = term->cols - term->curs.x;
+                           cursplus = term->curs;
                            cursplus.x += n;
-                           check_selection(curs, cursplus);
+                           check_boundary(term, term->curs.x, term->curs.y);
+                           check_boundary(term, term->curs.x+n, term->curs.y);
+                           check_selection(term, term->curs, cursplus);
                            while (n--)
-                               *p++ = erase_char;
-                           seen_disp_event = TRUE;
+                               copy_termchar(cline, p++,
+                                             &term->erase_char);
+                           seen_disp_event(term);
                        }
                        break;
-                     case 'x':       /* report terminal characteristics */
+                     case 'x':       /* DECREQTPARM: report terminal characteristics */
                        compatibility(VT100);
-                       {
+                       if (term->ldisc) {
                            char buf[32];
-                           int i = def(esc_args[0], 0);
+                           int i = def(term->esc_args[0], 0);
                            if (i == 0 || i == 1) {
                                strcpy(buf, "\033[2;1;1;112;112;1;0x");
                                buf[2] += i;
-                               ldisc_send(buf, 20, 0);
+                               ldisc_send(term->ldisc, buf, 20, 0);
                            }
                        }
                        break;
-                     case 'Z':         /* BackTab for xterm */
+                     case 'Z':         /* CBT */
                        compatibility(OTHER);
                        {
-                           int i = def(esc_args[0], 1);
-                           pos old_curs = curs;
+                           int i = def(term->esc_args[0], 1);
+                           pos old_curs = term->curs;
 
-                           for(;i>0 && curs.x>0; i--) {
+                           for(;i>0 && term->curs.x>0; i--) {
                                do {
-                                   curs.x--;
-                               } while (curs.x >0 && !tabs[curs.x]);
+                                   term->curs.x--;
+                               } while (term->curs.x >0 &&
+                                        !term->tabs[term->curs.x]);
                            }
-                           fix_cpos;
-                           check_selection(old_curs, curs);
+                           check_selection(term, old_curs, term->curs);
                        }
                        break;
-                     case ANSI('L', '='):
-                       compatibility(OTHER);
-                       use_bce = (esc_args[0] <= 0);
-                       erase_char = ERASE_CHAR;
-                       if (use_bce)
-                           erase_char = (' ' | ATTR_ASCII |
-                                        (curr_attr & 
-                                         (ATTR_FGMASK | ATTR_BGMASK)));
+                     case ANSI('c', '='):      /* Hide or Show Cursor */
+                       compatibility(SCOANSI);
+                       switch(term->esc_args[0]) {
+                         case 0:  /* hide cursor */
+                           term->cursor_on = FALSE;
+                           break;
+                         case 1:  /* restore cursor */
+                           term->big_cursor = FALSE;
+                           term->cursor_on = TRUE;
+                           break;
+                         case 2:  /* block cursor */
+                           term->big_cursor = TRUE;
+                           term->cursor_on = TRUE;
+                           break;
+                       }
+                       break;
+                     case ANSI('C', '='):
+                       /*
+                        * set cursor start on scanline esc_args[0] and
+                        * end on scanline esc_args[1].If you set
+                        * the bottom scan line to a value less than
+                        * the top scan line, the cursor will disappear.
+                        */
+                       compatibility(SCOANSI);
+                       if (term->esc_nargs >= 2) {
+                           if (term->esc_args[0] > term->esc_args[1])
+                               term->cursor_on = FALSE;
+                           else
+                               term->cursor_on = TRUE;
+                       }
+                       break;
+                     case ANSI('D', '='):
+                       compatibility(SCOANSI);
+                       term->blink_is_real = FALSE;
+                       term_schedule_tblink(term);
+                       if (term->esc_args[0]>=1)
+                           term->curr_attr |= ATTR_BLINK;
+                       else
+                           term->curr_attr &= ~ATTR_BLINK;
                        break;
                      case ANSI('E', '='):
-                       compatibility(OTHER);
-                       blink_is_real = (esc_args[0] >= 1);
+                       compatibility(SCOANSI);
+                       term->blink_is_real = (term->esc_args[0] >= 1);
+                       term_schedule_tblink(term);
+                       break;
+                     case ANSI('F', '='):      /* set normal foreground */
+                       compatibility(SCOANSI);
+                       if (term->esc_args[0] >= 0 && term->esc_args[0] < 16) {
+                           long colour =
+                               (sco2ansicolour[term->esc_args[0] & 0x7] |
+                                (term->esc_args[0] & 0x8)) <<
+                               ATTR_FGSHIFT;
+                           term->curr_attr &= ~ATTR_FGMASK;
+                           term->curr_attr |= colour;
+                           term->default_attr &= ~ATTR_FGMASK;
+                           term->default_attr |= colour;
+                           set_erase_char(term);
+                       }
+                       break;
+                     case ANSI('G', '='):      /* set normal background */
+                       compatibility(SCOANSI);
+                       if (term->esc_args[0] >= 0 && term->esc_args[0] < 16) {
+                           long colour =
+                               (sco2ansicolour[term->esc_args[0] & 0x7] |
+                                (term->esc_args[0] & 0x8)) <<
+                               ATTR_BGSHIFT;
+                           term->curr_attr &= ~ATTR_BGMASK;
+                           term->curr_attr |= colour;
+                           term->default_attr &= ~ATTR_BGMASK;
+                           term->default_attr |= colour;
+                           set_erase_char(term);
+                       }
+                       break;
+                     case ANSI('L', '='):
+                       compatibility(SCOANSI);
+                       term->use_bce = (term->esc_args[0] <= 0);
+                       set_erase_char(term);
                        break;
-                     case ANSI('p', '"'):
-                       /* Allow the host to make this emulator a 'perfect' VT102.
-                        * This first appeared in the VT220, but we do need to get 
-                        * back to PuTTY mode so I won't check it.
+                     case ANSI('p', '"'): /* DECSCL: set compat level */
+                       /*
+                        * Allow the host to make this emulator a
+                        * 'perfect' VT102. This first appeared in
+                        * the VT220, but we do need to get back to
+                        * PuTTY mode so I won't check it.
                         *
                         * The arg in 40..42,50 are a PuTTY extension.
                         * The 2nd arg, 8bit vs 7bit is not checked.
                         *
-                        * Setting VT102 mode should also change the Fkeys to
-                        * generate PF* codes as a real VT102 has no Fkeys.
-                        * The VT220 does this, F11..F13 become ESC,BS,LF other Fkeys
-                        * send nothing.
+                        * Setting VT102 mode should also change
+                        * the Fkeys to generate PF* codes as a
+                        * real VT102 has no Fkeys. The VT220 does
+                        * this, F11..F13 become ESC,BS,LF other
+                        * Fkeys send nothing.
                         *
                         * Note ESC c will NOT change this!
                         */
 
-                       switch (esc_args[0]) {
+                       switch (term->esc_args[0]) {
                          case 61:
-                           compatibility_level &= ~TM_VTXXX;
-                           compatibility_level |= TM_VT102;
+                           term->compatibility_level &= ~TM_VTXXX;
+                           term->compatibility_level |= TM_VT102;
                            break;
                          case 62:
-                           compatibility_level &= ~TM_VTXXX;
-                           compatibility_level |= TM_VT220;
+                           term->compatibility_level &= ~TM_VTXXX;
+                           term->compatibility_level |= TM_VT220;
                            break;
 
                          default:
-                           if (esc_args[0] > 60 && esc_args[0] < 70)
-                               compatibility_level |= TM_VTXXX;
+                           if (term->esc_args[0] > 60 &&
+                               term->esc_args[0] < 70)
+                               term->compatibility_level |= TM_VTXXX;
                            break;
 
                          case 40:
-                           compatibility_level &= TM_VTXXX;
+                           term->compatibility_level &= TM_VTXXX;
                            break;
                          case 41:
-                           compatibility_level = TM_PUTTY;
+                           term->compatibility_level = TM_PUTTY;
                            break;
                          case 42:
-                           compatibility_level = TM_SCOANSI;
+                           term->compatibility_level = TM_SCOANSI;
                            break;
 
                          case ARG_DEFAULT:
-                           compatibility_level = TM_PUTTY;
+                           term->compatibility_level = TM_PUTTY;
                            break;
                          case 50:
                            break;
                        }
 
                        /* Change the response to CSI c */
-                       if (esc_args[0] == 50) {
+                       if (term->esc_args[0] == 50) {
                            int i;
                            char lbuf[64];
-                           strcpy(id_string, "\033[?");
-                           for (i = 1; i < esc_nargs; i++) {
+                           strcpy(term->id_string, "\033[?");
+                           for (i = 1; i < term->esc_nargs; i++) {
                                if (i != 1)
-                                   strcat(id_string, ";");
-                               sprintf(lbuf, "%d", esc_args[i]);
-                               strcat(id_string, lbuf);
+                                   strcat(term->id_string, ";");
+                               sprintf(lbuf, "%d", term->esc_args[i]);
+                               strcat(term->id_string, lbuf);
                            }
-                           strcat(id_string, "c");
+                           strcat(term->id_string, "c");
                        }
 #if 0
                        /* Is this a good idea ? 
                         * Well we should do a soft reset at this point ...
                         */
                        if (!has_compat(VT420) && has_compat(VT100)) {
-                           if (!cfg.no_remote_resize) {
-                               if (reset_132)
+                           if (!term->no_remote_resize) {
+                               if (term->reset_132)
                                    request_resize(132, 24);
                                else
                                    request_resize(80, 24);
@@ -2383,20 +4204,20 @@ void term_out(void)
                    }
                break;
              case SEEN_OSC:
-               osc_w = FALSE;
+               term->osc_w = FALSE;
                switch (c) {
                  case 'P':            /* Linux palette sequence */
-                   termstate = SEEN_OSC_P;
-                   osc_strlen = 0;
+                   term->termstate = SEEN_OSC_P;
+                   term->osc_strlen = 0;
                    break;
                  case 'R':            /* Linux palette reset */
-                   palette_reset();
-                   term_invalidate();
-                   termstate = TOPLEVEL;
+                   palette_reset(term->frontend);
+                   term_invalidate(term);
+                   term->termstate = TOPLEVEL;
                    break;
                  case 'W':            /* word-set */
-                   termstate = SEEN_OSC_W;
-                   osc_w = TRUE;
+                   term->termstate = SEEN_OSC_W;
+                   term->osc_w = TRUE;
                    break;
                  case '0':
                  case '1':
@@ -2408,21 +4229,21 @@ void term_out(void)
                  case '7':
                  case '8':
                  case '9':
-                   esc_args[0] = 10 * esc_args[0] + c - '0';
+                   term->esc_args[0] = 10 * term->esc_args[0] + c - '0';
                    break;
                  case 'L':
                    /*
                     * Grotty hack to support xterm and DECterm title
                     * sequences concurrently.
                     */
-                   if (esc_args[0] == 2) {
-                       esc_args[0] = 1;
+                   if (term->esc_args[0] == 2) {
+                       term->esc_args[0] = 1;
                        break;
                    }
                    /* else fall through */
                  default:
-                   termstate = OSC_STRING;
-                   osc_strlen = 0;
+                   term->termstate = OSC_STRING;
+                   term->osc_strlen = 0;
                }
                break;
              case OSC_STRING:
@@ -2436,8 +4257,8 @@ void term_out(void)
                 *
                 * -- RDB
                 */
-               if (c == '\n' || c == '\r') {
-                   termstate = TOPLEVEL;
+               if (c == '\012' || c == '\015') {
+                   term->termstate = TOPLEVEL;
                } else if (c == 0234 || c == '\007') {
                    /*
                     * These characters terminate the string; ST and BEL
@@ -2446,35 +4267,35 @@ void term_out(void)
                     * mode unless it is followed by \, in which case it is
                     * synonymous with ST in the first place.
                     */
-                   do_osc();
-                   termstate = TOPLEVEL;
+                   do_osc(term);
+                   term->termstate = TOPLEVEL;
                } else if (c == '\033')
-                   termstate = OSC_MAYBE_ST;
-               else if (osc_strlen < OSC_STR_MAX)
-                   osc_string[osc_strlen++] = c;
+                   term->termstate = OSC_MAYBE_ST;
+               else if (term->osc_strlen < OSC_STR_MAX)
+                   term->osc_string[term->osc_strlen++] = (char)c;
                break;
              case SEEN_OSC_P:
                {
-                   int max = (osc_strlen == 0 ? 21 : 16);
+                   int max = (term->osc_strlen == 0 ? 21 : 15);
                    int val;
-                   if (c >= '0' && c <= '9')
+                   if ((int)c >= '0' && (int)c <= '9')
                        val = c - '0';
-                   else if (c >= 'A' && c <= 'A' + max - 10)
+                   else if ((int)c >= 'A' && (int)c <= 'A' + max - 10)
                        val = c - 'A' + 10;
-                   else if (c >= 'a' && c <= 'a' + max - 10)
+                   else if ((int)c >= 'a' && (int)c <= 'a' + max - 10)
                        val = c - 'a' + 10;
                    else {
-                       termstate = TOPLEVEL;
+                       term->termstate = TOPLEVEL;
                        break;
                    }
-                   osc_string[osc_strlen++] = val;
-                   if (osc_strlen >= 7) {
-                       palette_set(osc_string[0],
-                                   osc_string[1] * 16 + osc_string[2],
-                                   osc_string[3] * 16 + osc_string[4],
-                                   osc_string[5] * 16 + osc_string[6]);
-                       term_invalidate();
-                       termstate = TOPLEVEL;
+                   term->osc_string[term->osc_strlen++] = val;
+                   if (term->osc_strlen >= 7) {
+                       palette_set(term->frontend, term->osc_string[0],
+                                   term->osc_string[1] * 16 + term->osc_string[2],
+                                   term->osc_string[3] * 16 + term->osc_string[4],
+                                   term->osc_string[5] * 16 + term->osc_string[6]);
+                       term_invalidate(term);
+                       term->termstate = TOPLEVEL;
                    }
                }
                break;
@@ -2490,28 +4311,28 @@ void term_out(void)
                  case '7':
                  case '8':
                  case '9':
-                   esc_args[0] = 10 * esc_args[0] + c - '0';
+                   term->esc_args[0] = 10 * term->esc_args[0] + c - '0';
                    break;
                  default:
-                   termstate = OSC_STRING;
-                   osc_strlen = 0;
+                   term->termstate = OSC_STRING;
+                   term->osc_strlen = 0;
                }
                break;
              case VT52_ESC:
-               termstate = TOPLEVEL;
-               seen_disp_event = TRUE;
+               term->termstate = TOPLEVEL;
+               seen_disp_event(term);
                switch (c) {
                  case 'A':
-                   move(curs.x, curs.y - 1, 1);
+                   move(term, term->curs.x, term->curs.y - 1, 1);
                    break;
                  case 'B':
-                   move(curs.x, curs.y + 1, 1);
+                   move(term, term->curs.x, term->curs.y + 1, 1);
                    break;
                  case 'C':
-                   move(curs.x + 1, curs.y, 1);
+                   move(term, term->curs.x + 1, term->curs.y, 1);
                    break;
                  case 'D':
-                   move(curs.x - 1, curs.y, 1);
+                   move(term, term->curs.x - 1, term->curs.y, 1);
                    break;
                    /*
                     * From the VT100 Manual
@@ -2554,28 +4375,27 @@ void term_out(void)
                     *
                     */
                  case 'F':
-                   cset_attr[cset = 0] = ATTR_LINEDRW;
+                   term->cset_attr[term->cset = 0] = CSET_LINEDRW;
                    break;
                  case 'G':
-                   cset_attr[cset = 0] = ATTR_ASCII;
+                   term->cset_attr[term->cset = 0] = CSET_ASCII;
                    break;
                  case 'H':
-                   move(0, 0, 0);
+                   move(term, 0, 0, 0);
                    break;
                  case 'I':
-                   if (curs.y == 0)
-                       scroll(0, rows - 1, -1, TRUE);
-                   else if (curs.y > 0)
-                       curs.y--;
-                   fix_cpos;
-                   wrapnext = FALSE;
+                   if (term->curs.y == 0)
+                       scroll(term, 0, term->rows - 1, -1, TRUE);
+                   else if (term->curs.y > 0)
+                       term->curs.y--;
+                   term->wrapnext = FALSE;
                    break;
                  case 'J':
-                   erase_lots(FALSE, FALSE, TRUE);
-                   disptop = 0;
+                   erase_lots(term, FALSE, FALSE, TRUE);
+                   term->disptop = 0;
                    break;
                  case 'K':
-                   erase_lots(TRUE, FALSE, TRUE);
+                   erase_lots(term, TRUE, FALSE, TRUE);
                    break;
 #if 0
                  case 'V':
@@ -2589,24 +4409,26 @@ void term_out(void)
                    break;
 #endif
                  case 'Y':
-                   termstate = VT52_Y1;
+                   term->termstate = VT52_Y1;
                    break;
                  case 'Z':
-                   ldisc_send("\033/Z", 3, 0);
+                   if (term->ldisc)
+                       ldisc_send(term->ldisc, "\033/Z", 3, 0);
                    break;
                  case '=':
-                   app_keypad_keys = TRUE;
+                   term->app_keypad_keys = TRUE;
                    break;
                  case '>':
-                   app_keypad_keys = FALSE;
+                   term->app_keypad_keys = FALSE;
                    break;
                  case '<':
                    /* XXX This should switch to VT100 mode not current or default
                     *     VT mode. But this will only have effect in a VT220+
                     *     emulation.
                     */
-                   vt52_mode = FALSE;
-                   blink_is_real = cfg.blinktext;
+                   term->vt52_mode = FALSE;
+                   term->blink_is_real = term->blinktext;
+                   term_schedule_tblink(term);
                    break;
 #if 0
                  case '^':
@@ -2623,282 +4445,508 @@ void term_out(void)
 #ifdef VT52_PLUS
                  case 'E':
                    /* compatibility(ATARI) */
-                   move(0, 0, 0);
-                   erase_lots(FALSE, FALSE, TRUE);
-                   disptop = 0;
+                   move(term, 0, 0, 0);
+                   erase_lots(term, FALSE, FALSE, TRUE);
+                   term->disptop = 0;
                    break;
                  case 'L':
                    /* compatibility(ATARI) */
-                   if (curs.y <= marg_b)
-                       scroll(curs.y, marg_b, -1, FALSE);
+                   if (term->curs.y <= term->marg_b)
+                       scroll(term, term->curs.y, term->marg_b, -1, FALSE);
                    break;
                  case 'M':
                    /* compatibility(ATARI) */
-                   if (curs.y <= marg_b)
-                       scroll(curs.y, marg_b, 1, TRUE);
+                   if (term->curs.y <= term->marg_b)
+                       scroll(term, term->curs.y, term->marg_b, 1, TRUE);
                    break;
                  case 'b':
                    /* compatibility(ATARI) */
-                   termstate = VT52_FG;
+                   term->termstate = VT52_FG;
                    break;
                  case 'c':
                    /* compatibility(ATARI) */
-                   termstate = VT52_BG;
+                   term->termstate = VT52_BG;
                    break;
                  case 'd':
                    /* compatibility(ATARI) */
-                   erase_lots(FALSE, TRUE, FALSE);
-                   disptop = 0;
+                   erase_lots(term, FALSE, TRUE, FALSE);
+                   term->disptop = 0;
                    break;
                  case 'e':
                    /* compatibility(ATARI) */
-                   cursor_on = TRUE;
+                   term->cursor_on = TRUE;
                    break;
                  case 'f':
                    /* compatibility(ATARI) */
-                   cursor_on = FALSE;
+                   term->cursor_on = FALSE;
                    break;
                    /* case 'j': Save cursor position - broken on ST */
                    /* case 'k': Restore cursor position */
                  case 'l':
                    /* compatibility(ATARI) */
-                   erase_lots(TRUE, TRUE, TRUE);
-                   curs.x = 0;
-                   wrapnext = FALSE;
-                   fix_cpos;
+                   erase_lots(term, TRUE, TRUE, TRUE);
+                   term->curs.x = 0;
+                   term->wrapnext = FALSE;
                    break;
                  case 'o':
                    /* compatibility(ATARI) */
-                   erase_lots(TRUE, TRUE, FALSE);
+                   erase_lots(term, TRUE, TRUE, FALSE);
                    break;
                  case 'p':
                    /* compatibility(ATARI) */
-                   curr_attr |= ATTR_REVERSE;
+                   term->curr_attr |= ATTR_REVERSE;
                    break;
                  case 'q':
                    /* compatibility(ATARI) */
-                   curr_attr &= ~ATTR_REVERSE;
+                   term->curr_attr &= ~ATTR_REVERSE;
                    break;
                  case 'v':            /* wrap Autowrap on - Wyse style */
                    /* compatibility(ATARI) */
-                   wrap = 1;
+                   term->wrap = 1;
                    break;
                  case 'w':            /* Autowrap off */
                    /* compatibility(ATARI) */
-                   wrap = 0;
+                   term->wrap = 0;
                    break;
 
                  case 'R':
                    /* compatibility(OTHER) */
-                   vt52_bold = FALSE;
-                   curr_attr = ATTR_DEFAULT;
-                   if (use_bce)
-                       erase_char = (' ' | ATTR_ASCII |
-                                    (curr_attr & 
-                                     (ATTR_FGMASK | ATTR_BGMASK)));
+                   term->vt52_bold = FALSE;
+                   term->curr_attr = ATTR_DEFAULT;
+                   set_erase_char(term);
                    break;
                  case 'S':
                    /* compatibility(VI50) */
-                   curr_attr |= ATTR_UNDER;
+                   term->curr_attr |= ATTR_UNDER;
                    break;
                  case 'W':
                    /* compatibility(VI50) */
-                   curr_attr &= ~ATTR_UNDER;
+                   term->curr_attr &= ~ATTR_UNDER;
                    break;
                  case 'U':
                    /* compatibility(VI50) */
-                   vt52_bold = TRUE;
-                   curr_attr |= ATTR_BOLD;
+                   term->vt52_bold = TRUE;
+                   term->curr_attr |= ATTR_BOLD;
                    break;
                  case 'T':
                    /* compatibility(VI50) */
-                   vt52_bold = FALSE;
-                   curr_attr &= ~ATTR_BOLD;
+                   term->vt52_bold = FALSE;
+                   term->curr_attr &= ~ATTR_BOLD;
                    break;
 #endif
                }
                break;
              case VT52_Y1:
-               termstate = VT52_Y2;
-               move(curs.x, c - ' ', 0);
+               term->termstate = VT52_Y2;
+               move(term, term->curs.x, c - ' ', 0);
                break;
              case VT52_Y2:
-               termstate = TOPLEVEL;
-               move(c - ' ', curs.y, 0);
+               term->termstate = TOPLEVEL;
+               move(term, c - ' ', term->curs.y, 0);
                break;
 
 #ifdef VT52_PLUS
              case VT52_FG:
-               termstate = TOPLEVEL;
-               curr_attr &= ~ATTR_FGMASK;
-               curr_attr &= ~ATTR_BOLD;
-               curr_attr |= (c & 0x7) << ATTR_FGSHIFT;
-               if ((c & 0x8) || vt52_bold)
-                   curr_attr |= ATTR_BOLD;
-
-               if (use_bce)
-                   erase_char = (' ' | ATTR_ASCII |
-                                (curr_attr & (ATTR_FGMASK | ATTR_BGMASK)));
+               term->termstate = TOPLEVEL;
+               term->curr_attr &= ~ATTR_FGMASK;
+               term->curr_attr &= ~ATTR_BOLD;
+               term->curr_attr |= (c & 0xF) << ATTR_FGSHIFT;
+               set_erase_char(term);
                break;
              case VT52_BG:
-               termstate = TOPLEVEL;
-               curr_attr &= ~ATTR_BGMASK;
-               curr_attr &= ~ATTR_BLINK;
-               curr_attr |= (c & 0x7) << ATTR_BGSHIFT;
-
-               /* Note: bold background */
-               if (c & 0x8)
-                   curr_attr |= ATTR_BLINK;
-
-               if (use_bce)
-                   erase_char = (' ' | ATTR_ASCII |
-                                (curr_attr & (ATTR_FGMASK | ATTR_BGMASK)));
+               term->termstate = TOPLEVEL;
+               term->curr_attr &= ~ATTR_BGMASK;
+               term->curr_attr &= ~ATTR_BLINK;
+               term->curr_attr |= (c & 0xF) << ATTR_BGSHIFT;
+               set_erase_char(term);
                break;
 #endif
              default: break;          /* placate gcc warning about enum use */
            }
-       if (selstate != NO_SELECTION) {
-           pos cursplus = curs;
+       if (term->selstate != NO_SELECTION) {
+           pos cursplus = term->curs;
            incpos(cursplus);
-           check_selection(curs, cursplus);
+           check_selection(term, term->curs, cursplus);
        }
     }
 
-    term_print_flush();
+    term_print_flush(term);
+    if (term->logflush)
+       logflush(term->logctx);
 }
 
-#if 0
 /*
- * Compare two lines to determine whether they are sufficiently
- * alike to scroll-optimise one to the other. Return the degree of
- * similarity.
+ * To prevent having to run the reasonably tricky bidi algorithm
+ * too many times, we maintain a cache of the last lineful of data
+ * fed to the algorithm on each line of the display.
  */
-static int linecmp(unsigned long *a, unsigned long *b)
+static int term_bidi_cache_hit(Terminal *term, int line,
+                              termchar *lbefore, int width)
 {
-    int i, n;
+    int i;
+
+    if (!term->pre_bidi_cache)
+       return FALSE;                  /* cache doesn't even exist yet! */
+
+    if (line >= term->bidi_cache_size)
+       return FALSE;                  /* cache doesn't have this many lines */
+
+    if (!term->pre_bidi_cache[line].chars)
+       return FALSE;                  /* cache doesn't contain _this_ line */
 
-    for (i = n = 0; i < cols; i++)
-       n += (*a++ == *b++);
-    return n;
+    if (term->pre_bidi_cache[line].width != width)
+       return FALSE;                  /* line is wrong width */
+
+    for (i = 0; i < width; i++)
+       if (!termchars_equal(term->pre_bidi_cache[line].chars+i, lbefore+i))
+           return FALSE;              /* line doesn't match cache */
+
+    return TRUE;                      /* it didn't match. */
+}
+
+static void term_bidi_cache_store(Terminal *term, int line, termchar *lbefore,
+                                 termchar *lafter, bidi_char *wcTo,
+                                 int width, int size)
+{
+    int i;
+
+    if (!term->pre_bidi_cache || term->bidi_cache_size <= line) {
+       int j = term->bidi_cache_size;
+       term->bidi_cache_size = line+1;
+       term->pre_bidi_cache = sresize(term->pre_bidi_cache,
+                                      term->bidi_cache_size,
+                                      struct bidi_cache_entry);
+       term->post_bidi_cache = sresize(term->post_bidi_cache,
+                                       term->bidi_cache_size,
+                                       struct bidi_cache_entry);
+       while (j < term->bidi_cache_size) {
+           term->pre_bidi_cache[j].chars =
+               term->post_bidi_cache[j].chars = NULL;
+           term->pre_bidi_cache[j].width =
+               term->post_bidi_cache[j].width = -1;
+           term->pre_bidi_cache[j].forward =
+               term->post_bidi_cache[j].forward = NULL;
+           term->pre_bidi_cache[j].backward =
+               term->post_bidi_cache[j].backward = NULL;
+           j++;
+       }
+    }
+
+    sfree(term->pre_bidi_cache[line].chars);
+    sfree(term->post_bidi_cache[line].chars);
+    sfree(term->post_bidi_cache[line].forward);
+    sfree(term->post_bidi_cache[line].backward);
+
+    term->pre_bidi_cache[line].width = width;
+    term->pre_bidi_cache[line].chars = snewn(size, termchar);
+    term->post_bidi_cache[line].width = width;
+    term->post_bidi_cache[line].chars = snewn(size, termchar);
+    term->post_bidi_cache[line].forward = snewn(width, int);
+    term->post_bidi_cache[line].backward = snewn(width, int);
+
+    memcpy(term->pre_bidi_cache[line].chars, lbefore, size * TSIZE);
+    memcpy(term->post_bidi_cache[line].chars, lafter, size * TSIZE);
+    memset(term->post_bidi_cache[line].forward, 0, width * sizeof(int));
+    memset(term->post_bidi_cache[line].backward, 0, width * sizeof(int));
+
+    for (i = 0; i < width; i++) {
+       int p = wcTo[i].index;
+
+       assert(0 <= p && p < width);
+
+       term->post_bidi_cache[line].backward[i] = p;
+       term->post_bidi_cache[line].forward[p] = i;
+    }
+}
+
+/*
+ * Prepare the bidi information for a screen line. Returns the
+ * transformed list of termchars, or NULL if no transformation at
+ * all took place (because bidi is disabled). If return was
+ * non-NULL, auxiliary information such as the forward and reverse
+ * mappings of permutation position are available in
+ * term->post_bidi_cache[scr_y].*.
+ */
+static termchar *term_bidi_line(Terminal *term, struct termline *ldata,
+                               int scr_y)
+{
+    termchar *lchars;
+    int it;
+
+    /* Do Arabic shaping and bidi. */
+    if(!term->bidi || !term->arabicshaping) {
+
+       if (!term_bidi_cache_hit(term, scr_y, ldata->chars, term->cols)) {
+
+           if (term->wcFromTo_size < term->cols) {
+               term->wcFromTo_size = term->cols;
+               term->wcFrom = sresize(term->wcFrom, term->wcFromTo_size,
+                                      bidi_char);
+               term->wcTo = sresize(term->wcTo, term->wcFromTo_size,
+                                    bidi_char);
+           }
+
+           for(it=0; it<term->cols ; it++)
+           {
+               unsigned long uc = (ldata->chars[it].chr);
+
+               switch (uc & CSET_MASK) {
+                 case CSET_LINEDRW:
+                   if (!term->rawcnp) {
+                       uc = term->ucsdata->unitab_xterm[uc & 0xFF];
+                       break;
+                   }
+                 case CSET_ASCII:
+                   uc = term->ucsdata->unitab_line[uc & 0xFF];
+                   break;
+                 case CSET_SCOACS:
+                   uc = term->ucsdata->unitab_scoacs[uc&0xFF];
+                   break;
+               }
+               switch (uc & CSET_MASK) {
+                 case CSET_ACP:
+                   uc = term->ucsdata->unitab_font[uc & 0xFF];
+                   break;
+                 case CSET_OEMCP:
+                   uc = term->ucsdata->unitab_oemcp[uc & 0xFF];
+                   break;
+               }
+
+               term->wcFrom[it].origwc = term->wcFrom[it].wc =
+                   (unsigned int)uc;
+               term->wcFrom[it].index = it;
+           }
+
+           if(!term->bidi)
+               do_bidi(term->wcFrom, term->cols);
+
+           /* this is saved iff done from inside the shaping */
+           if(!term->bidi && term->arabicshaping)
+               for(it=0; it<term->cols; it++)
+                   term->wcTo[it] = term->wcFrom[it];
+
+           if(!term->arabicshaping)
+               do_shape(term->wcFrom, term->wcTo, term->cols);
+
+           if (term->ltemp_size < ldata->size) {
+               term->ltemp_size = ldata->size;
+               term->ltemp = sresize(term->ltemp, term->ltemp_size,
+                                     termchar);
+           }
+
+           memcpy(term->ltemp, ldata->chars, ldata->size * TSIZE);
+
+           for(it=0; it<term->cols ; it++)
+           {
+               term->ltemp[it] = ldata->chars[term->wcTo[it].index];
+               if (term->ltemp[it].cc_next)
+                   term->ltemp[it].cc_next -=
+                   it - term->wcTo[it].index;
+
+               if (term->wcTo[it].origwc != term->wcTo[it].wc)
+                   term->ltemp[it].chr = term->wcTo[it].wc;
+           }
+           term_bidi_cache_store(term, scr_y, ldata->chars,
+                                 term->ltemp, term->wcTo,
+                                  term->cols, ldata->size);
+
+           lchars = term->ltemp;
+       } else {
+           lchars = term->post_bidi_cache[scr_y].chars;
+       }
+    } else {
+       lchars = NULL;
+    }
+
+    return lchars;
 }
-#endif
 
 /*
  * Given a context, update the window. Out of paranoia, we don't
  * allow WM_PAINT responses to do scrolling optimisations.
  */
-static void do_paint(Context ctx, int may_optimise)
+static void do_paint(Terminal *term, Context ctx, int may_optimise)
 {
-    int i, j, our_curs_y;
-    unsigned long rv, cursor;
+    int i, j, our_curs_y, our_curs_x;
+    int rv, cursor;
     pos scrpos;
-    char ch[1024];
-    long cursor_background = ERASE_CHAR;
-    unsigned long ticks;
+    wchar_t *ch;
+    int chlen;
+#ifdef OPTIMISE_SCROLL
+    struct scrollregion *sr;
+#endif /* OPTIMISE_SCROLL */
+    termchar *newline;
 
-    /*
-     * Check the visual bell state.
-     */
-    if (in_vbell) {
-       ticks = GETTICKCOUNT();
-       if (ticks - vbell_startpoint >= VBELL_TIMEOUT)
-           in_vbell = FALSE; 
-   }
+    chlen = 1024;
+    ch = snewn(chlen, wchar_t);
+
+    newline = snewn(term->cols, termchar);
 
-    rv = (!rvideo ^ !in_vbell ? ATTR_REVERSE : 0);
+    rv = (!term->rvideo ^ !term->in_vbell ? ATTR_REVERSE : 0);
 
     /* Depends on:
      * screen array, disptop, scrtop,
      * selection, rv, 
-     * cfg.blinkpc, blink_is_real, tblinker, 
-     * curs.y, curs.x, blinker, cfg.blink_cur, cursor_on, has_focus, wrapnext
+     * blinkpc, blink_is_real, tblinker, 
+     * curs.y, curs.x, cblinker, blink_cur, cursor_on, has_focus, wrapnext
      */
 
     /* Has the cursor position or type changed ? */
-    if (cursor_on) {
-       if (has_focus) {
-           if (blinker || !cfg.blink_cur)
+    if (term->cursor_on) {
+       if (term->has_focus) {
+           if (term->cblinker || !term->blink_cur)
                cursor = TATTR_ACTCURS;
            else
                cursor = 0;
        } else
            cursor = TATTR_PASCURS;
-       if (wrapnext)
+       if (term->wrapnext)
            cursor |= TATTR_RIGHTCURS;
     } else
        cursor = 0;
-    our_curs_y = curs.y - disptop;
+    our_curs_y = term->curs.y - term->disptop;
+    {
+       /*
+        * Adjust the cursor position:
+        *  - for bidi
+        *  - in the case where it's resting on the right-hand half
+        *    of a CJK wide character. xterm's behaviour here,
+        *    which seems adequate to me, is to display the cursor
+        *    covering the _whole_ character, exactly as if it were
+        *    one space to the left.
+        */
+       termline *ldata = lineptr(term->curs.y);
+       termchar *lchars;
+
+       our_curs_x = term->curs.x;
+
+       if ( (lchars = term_bidi_line(term, ldata, our_curs_y)) != NULL) {
+           our_curs_x = term->post_bidi_cache[our_curs_y].forward[our_curs_x];
+       } else
+           lchars = ldata->chars;
 
-    if (dispcurs && (curstype != cursor ||
-                    dispcurs !=
-                    disptext + our_curs_y * (cols + 1) + curs.x)) {
-       if (dispcurs > disptext && 
-               (*dispcurs & (CHAR_MASK | CSET_MASK)) == UCSWIDE)
-           dispcurs[-1] |= ATTR_INVALID;
-       if ( (dispcurs[1] & (CHAR_MASK | CSET_MASK)) == UCSWIDE)
-           dispcurs[1] |= ATTR_INVALID;
-       *dispcurs |= ATTR_INVALID;
-       curstype = 0;
+       if (our_curs_x > 0 &&
+           lchars[our_curs_x].chr == UCSWIDE)
+           our_curs_x--;
+
+       unlineptr(ldata);
+    }
+
+    /*
+     * If the cursor is not where it was last time we painted, and
+     * its previous position is visible on screen, invalidate its
+     * previous position.
+     */
+    if (term->dispcursy >= 0 &&
+       (term->curstype != cursor ||
+        term->dispcursy != our_curs_y ||
+        term->dispcursx != our_curs_x)) {
+       termchar *dispcurs = term->disptext[term->dispcursy]->chars +
+           term->dispcursx;
+
+       if (term->dispcursx > 0 && dispcurs->chr == UCSWIDE)
+           dispcurs[-1].attr |= ATTR_INVALID;
+       if (term->dispcursx < term->cols-1 && dispcurs[1].chr == UCSWIDE)
+           dispcurs[1].attr |= ATTR_INVALID;
+       dispcurs->attr |= ATTR_INVALID;
+
+       term->curstype = 0;
+    }
+    term->dispcursx = term->dispcursy = -1;
+
+#ifdef OPTIMISE_SCROLL
+    /* Do scrolls */
+    sr = term->scrollhead;
+    while (sr) {
+       struct scrollregion *next = sr->next;
+       do_scroll(ctx, sr->topline, sr->botline, sr->lines);
+       sfree(sr);
+       sr = next;
     }
-    dispcurs = NULL;
+    term->scrollhead = term->scrolltail = NULL;
+#endif /* OPTIMISE_SCROLL */
 
     /* The normal screen data */
-    for (i = 0; i < rows; i++) {
-       unsigned long *ldata;
-       int lattr;
-       int idx, dirty_line, dirty_run, selected;
-       unsigned long attr = 0;
-       int updated_line = 0;
+    for (i = 0; i < term->rows; i++) {
+       termline *ldata;
+       termchar *lchars;
+       int dirty_line, dirty_run, selected;
+       unsigned long attr = 0, cset = 0;
        int start = 0;
        int ccount = 0;
        int last_run_dirty = 0;
+       int laststart, dirtyrect;
+       int *backward;
 
-       scrpos.y = i + disptop;
+       scrpos.y = i + term->disptop;
        ldata = lineptr(scrpos.y);
-       lattr = (ldata[cols] & LATTR_MODE);
 
-       idx = i * (cols + 1);
-       dirty_run = dirty_line = (ldata[cols] != disptext[idx + cols]);
-       disptext[idx + cols] = ldata[cols];
+       /* Do Arabic shaping and bidi. */
+       lchars = term_bidi_line(term, ldata, i);
+       if (lchars) {
+           backward = term->post_bidi_cache[i].backward;
+       } else {
+           lchars = ldata->chars;
+           backward = NULL;
+       }
 
-       for (j = 0; j < cols; j++, idx++) {
+       /*
+        * First loop: work along the line deciding what we want
+        * each character cell to look like.
+        */
+       for (j = 0; j < term->cols; j++) {
            unsigned long tattr, tchar;
-           unsigned long *d = ldata + j;
-           int break_run;
-           scrpos.x = j;
+           termchar *d = lchars + j;
+           scrpos.x = backward ? backward[j] : j;
+
+           tchar = d->chr;
+           tattr = d->attr;
+
+            if (!term->ansi_colour)
+                tattr = (tattr & ~(ATTR_FGMASK | ATTR_BGMASK)) | 
+                ATTR_DEFFG | ATTR_DEFBG;
+
+           if (!term->xterm_256_colour) {
+               int colour;
+               colour = (tattr & ATTR_FGMASK) >> ATTR_FGSHIFT;
+               if (colour >= 16 && colour < 256)
+                   tattr = (tattr &~ ATTR_FGMASK) | ATTR_DEFFG;
+               colour = (tattr & ATTR_BGMASK) >> ATTR_BGSHIFT;
+               if (colour >= 16 && colour < 256)
+                   tattr = (tattr &~ ATTR_BGMASK) | ATTR_DEFBG;
+           }
 
-           tchar = (*d & (CHAR_MASK | CSET_MASK));
-           tattr = (*d & (ATTR_MASK ^ CSET_MASK));
            switch (tchar & CSET_MASK) {
-             case ATTR_ASCII:
-               tchar = unitab_line[tchar & 0xFF];
+             case CSET_ASCII:
+               tchar = term->ucsdata->unitab_line[tchar & 0xFF];
                break;
-             case ATTR_LINEDRW:
-               tchar = unitab_xterm[tchar & 0xFF];
+             case CSET_LINEDRW:
+               tchar = term->ucsdata->unitab_xterm[tchar & 0xFF];
                break;
-             case ATTR_SCOACS:  
-               tchar = unitab_scoacs[tchar&0xFF]; 
+             case CSET_SCOACS:  
+               tchar = term->ucsdata->unitab_scoacs[tchar&0xFF]; 
                break;
            }
-           tattr |= (tchar & CSET_MASK);
-           tchar &= CHAR_MASK;
-           if ((d[1] & (CHAR_MASK | CSET_MASK)) == UCSWIDE)
-                   tattr |= ATTR_WIDE;
+           if (j < term->cols-1 && d[1].chr == UCSWIDE)
+               tattr |= ATTR_WIDE;
 
            /* Video reversing things */
-           if (seltype == LEXICOGRAPHIC)
-               selected = posle(selstart, scrpos) && poslt(scrpos, selend);
-           else
-               selected = posPle(selstart, scrpos) && posPlt(scrpos, selend);
+           if (term->selstate == DRAGGING || term->selstate == SELECTED) {
+               if (term->seltype == LEXICOGRAPHIC)
+                   selected = (posle(term->selstart, scrpos) &&
+                               poslt(scrpos, term->selend));
+               else
+                   selected = (posPle(term->selstart, scrpos) &&
+                               posPlt(scrpos, term->selend));
+           } else
+               selected = FALSE;
            tattr = (tattr ^ rv
                     ^ (selected ? ATTR_REVERSE : 0));
 
            /* 'Real' blinking ? */
-           if (blink_is_real && (tattr & ATTR_BLINK)) {
-               if (has_focus && tblinker) {
-                   tchar = ' ';
-                   tattr &= ~CSET_MASK;
-                   tattr |= ATTR_ACP;
+           if (term->blink_is_real && (tattr & ATTR_BLINK)) {
+               if (term->has_focus && term->tblinker) {
+                   tchar = term->ucsdata->unitab_line[(unsigned char)' '];
                }
                tattr &= ~ATTR_BLINK;
            }
@@ -2907,30 +4955,112 @@ static void do_paint(Context ctx, int may_optimise)
             * Check the font we'll _probably_ be using to see if 
             * the character is wide when we don't want it to be.
             */
-           if ((tchar | tattr) != (disptext[idx]& ~ATTR_NARROW)) {
-               if ((tattr & ATTR_WIDE) == 0 && 
-                   CharWidth(ctx, (tchar | tattr) & 0xFFFF) == 2)
+           if (tchar != term->disptext[i]->chars[j].chr ||
+               tattr != (term->disptext[i]->chars[j].attr &~
+                         (ATTR_NARROW | DATTR_MASK))) {
+               if ((tattr & ATTR_WIDE) == 0 && char_width(ctx, tchar) == 2)
                    tattr |= ATTR_NARROW;
-           } else if (disptext[idx]&ATTR_NARROW)
+           } else if (term->disptext[i]->chars[j].attr & ATTR_NARROW)
                tattr |= ATTR_NARROW;
 
-           /* Cursor here ? Save the 'background' */
-           if (i == our_curs_y && j == curs.x) {
-               cursor_background = tattr | tchar;
-               dispcurs = disptext + idx;
+           if (i == our_curs_y && j == our_curs_x) {
+               tattr |= cursor;
+               term->curstype = cursor;
+               term->dispcursx = j;
+               term->dispcursy = i;
+           }
+
+           /* FULL-TERMCHAR */
+           newline[j].attr = tattr;
+           newline[j].chr = tchar;
+           /* Combining characters are still read from lchars */
+           newline[j].cc_next = 0;
+       }
+
+       /*
+        * Now loop over the line again, noting where things have
+        * changed.
+        * 
+        * During this loop, we keep track of where we last saw
+        * DATTR_STARTRUN. Any mismatch automatically invalidates
+        * _all_ of the containing run that was last printed: that
+        * is, any rectangle that was drawn in one go in the
+        * previous update should be either left completely alone
+        * or overwritten in its entirety. This, along with the
+        * expectation that front ends clip all text runs to their
+        * bounding rectangle, should solve any possible problems
+        * with fonts that overflow their character cells.
+        */
+       laststart = 0;
+       dirtyrect = FALSE;
+       for (j = 0; j < term->cols; j++) {
+           if (term->disptext[i]->chars[j].attr & DATTR_STARTRUN) {
+               laststart = j;
+               dirtyrect = FALSE;
+           }
+
+           if (term->disptext[i]->chars[j].chr != newline[j].chr ||
+               (term->disptext[i]->chars[j].attr &~ DATTR_MASK)
+               != newline[j].attr) {
+               int k;
+
+               if (!dirtyrect) {
+                   for (k = laststart; k < j; k++)
+                       term->disptext[i]->chars[k].attr |= ATTR_INVALID;
+
+                   dirtyrect = TRUE;
+               }
            }
 
-           if ((disptext[idx] ^ tattr) & ATTR_WIDE)
+           if (dirtyrect)
+               term->disptext[i]->chars[j].attr |= ATTR_INVALID;
+       }
+
+       /*
+        * Finally, loop once more and actually do the drawing.
+        */
+       dirty_run = dirty_line = (ldata->lattr !=
+                                 term->disptext[i]->lattr);
+       term->disptext[i]->lattr = ldata->lattr;
+
+       for (j = 0; j < term->cols; j++) {
+           unsigned long tattr, tchar;
+           int break_run, do_copy;
+           termchar *d = lchars + j;
+
+           tattr = newline[j].attr;
+           tchar = newline[j].chr;
+
+           if ((term->disptext[i]->chars[j].attr ^ tattr) & ATTR_WIDE)
                dirty_line = TRUE;
 
-           break_run = (tattr != attr || j - start >= sizeof(ch));
+           break_run = ((tattr ^ attr) & term->attr_mask) != 0;
 
+#ifdef USES_VTLINE_HACK
            /* Special hack for VT100 Linedraw glyphs */
-           if ((attr & CSET_MASK) == 0x2300 && tchar >= 0xBA
-               && tchar <= 0xBD) break_run = TRUE;
+           if ((tchar >= 0x23BA && tchar <= 0x23BD) ||
+                (j > 0 && (newline[j-1].chr >= 0x23BA &&
+                           newline[j-1].chr <= 0x23BD)))
+               break_run = TRUE;
+#endif
+
+           /*
+            * Separate out sequences of characters that have the
+            * same CSET, if that CSET is a magic one.
+            */
+           if (CSET_OF(tchar) != cset)
+               break_run = TRUE;
 
-           if (!dbcs_screenfont && !dirty_line) {
-               if ((tchar | tattr) == disptext[idx])
+           /*
+            * Break on both sides of any combined-character cell.
+            */
+           if (d->cc_next != 0 ||
+               (j > 0 && d[-1].cc_next != 0))
+               break_run = TRUE;
+
+           if (!term->ucsdata->dbcs_screenfont && !dirty_line) {
+               if (term->disptext[i]->chars[j].chr == tchar &&
+                   (term->disptext[i]->chars[j].attr &~ DATTR_MASK) == tattr)
                    break_run = TRUE;
                else if (!dirty_run && ccount == 1)
                    break_run = TRUE;
@@ -2938,125 +5068,158 @@ static void do_paint(Context ctx, int may_optimise)
 
            if (break_run) {
                if ((dirty_run || last_run_dirty) && ccount > 0) {
-                   do_text(ctx, start, i, ch, ccount, attr, lattr);
-                   updated_line = 1;
+                   do_text(ctx, start, i, ch, ccount, attr,
+                           ldata->lattr);
+                   if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
+                       do_cursor(ctx, start, i, ch, ccount, attr,
+                                 ldata->lattr);
                }
                start = j;
                ccount = 0;
                attr = tattr;
-               if (dbcs_screenfont)
+               cset = CSET_OF(tchar);
+               if (term->ucsdata->dbcs_screenfont)
                    last_run_dirty = dirty_run;
                dirty_run = dirty_line;
            }
 
-           if ((tchar | tattr) != disptext[idx])
+           do_copy = FALSE;
+           if (!termchars_equal_override(&term->disptext[i]->chars[j],
+                                         d, tchar, tattr)) {
+               do_copy = TRUE;
                dirty_run = TRUE;
-           ch[ccount++] = (char) tchar;
-           disptext[idx] = tchar | tattr;
+           }
+
+           if (ccount+2 > chlen) {
+               chlen = ccount + 256;
+               ch = sresize(ch, chlen, wchar_t);
+           }
+
+#ifdef PLATFORM_IS_UTF16
+           if (tchar > 0x10000 && tchar < 0x110000) {
+               ch[ccount++] = (wchar_t) HIGH_SURROGATE_OF(tchar);
+               ch[ccount++] = (wchar_t) LOW_SURROGATE_OF(tchar);
+           } else
+#endif /* PLATFORM_IS_UTF16 */
+           ch[ccount++] = (wchar_t) tchar;
+
+           if (d->cc_next) {
+               termchar *dd = d;
+
+               while (dd->cc_next) {
+                   unsigned long schar;
+
+                   dd += dd->cc_next;
+
+                   schar = dd->chr;
+                   switch (schar & CSET_MASK) {
+                     case CSET_ASCII:
+                       schar = term->ucsdata->unitab_line[schar & 0xFF];
+                       break;
+                     case CSET_LINEDRW:
+                       schar = term->ucsdata->unitab_xterm[schar & 0xFF];
+                       break;
+                     case CSET_SCOACS:
+                       schar = term->ucsdata->unitab_scoacs[schar&0xFF];
+                       break;
+                   }
+
+                   if (ccount+2 > chlen) {
+                       chlen = ccount + 256;
+                       ch = sresize(ch, chlen, wchar_t);
+                   }
+
+#ifdef PLATFORM_IS_UTF16
+                   if (schar > 0x10000 && schar < 0x110000) {
+                       ch[ccount++] = (wchar_t) HIGH_SURROGATE_OF(schar);
+                       ch[ccount++] = (wchar_t) LOW_SURROGATE_OF(schar);
+                   } else
+#endif /* PLATFORM_IS_UTF16 */
+                   ch[ccount++] = (wchar_t) schar;
+               }
+
+               attr |= TATTR_COMBINING;
+           }
+
+           if (do_copy) {
+               copy_termchar(term->disptext[i], j, d);
+               term->disptext[i]->chars[j].chr = tchar;
+               term->disptext[i]->chars[j].attr = tattr;
+               if (start == j)
+                   term->disptext[i]->chars[j].attr |= DATTR_STARTRUN;
+           }
 
            /* If it's a wide char step along to the next one. */
            if (tattr & ATTR_WIDE) {
-               if (++j < cols) {
-                   idx++;
+               if (++j < term->cols) {
                    d++;
-                   /* Cursor is here ? Ouch! */
-                   if (i == our_curs_y && j == curs.x) {
-                       cursor_background = *d;
-                       dispcurs = disptext + idx;
-                   }
-                   if (disptext[idx] != *d)
+                   /*
+                    * By construction above, the cursor should not
+                    * be on the right-hand half of this character.
+                    * Ever.
+                    */
+                   assert(!(i == our_curs_y && j == our_curs_x));
+                   if (!termchars_equal(&term->disptext[i]->chars[j], d))
                        dirty_run = TRUE;
-                   disptext[idx] = *d;
+                   copy_termchar(term->disptext[i], j, d);
                }
            }
        }
        if (dirty_run && ccount > 0) {
-           do_text(ctx, start, i, ch, ccount, attr, lattr);
-           updated_line = 1;
-       }
-
-       /* Cursor on this line ? (and changed) */
-       if (i == our_curs_y && (curstype != cursor || updated_line)) {
-           ch[0] = (char) (cursor_background & CHAR_MASK);
-           attr = (cursor_background & ATTR_MASK) | cursor;
-           do_cursor(ctx, curs.x, i, ch, 1, attr, lattr);
-           curstype = cursor;
+           do_text(ctx, start, i, ch, ccount, attr,
+                   ldata->lattr);
+           if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
+               do_cursor(ctx, start, i, ch, ccount, attr,
+                         ldata->lattr);
        }
-    }
-}
-
-/*
- * Flick the switch that says if blinking things should be shown or hidden.
- */
-
-void term_blink(int flg)
-{
-    static long last_blink = 0;
-    static long last_tblink = 0;
-    long now, blink_diff;
 
-    now = GETTICKCOUNT();
-    blink_diff = now - last_tblink;
-
-    /* Make sure the text blinks no more than 2Hz; we'll use 0.45 s period. */
-    if (blink_diff < 0 || blink_diff > (TICKSPERSEC * 9 / 20)) {
-       last_tblink = now;
-       tblinker = !tblinker;
-    }
-
-    if (flg) {
-       blinker = 1;
-       last_blink = now;
-       return;
+       unlineptr(ldata);
     }
 
-    blink_diff = now - last_blink;
-
-    /* Make sure the cursor blinks no faster than system blink rate */
-    if (blink_diff >= 0 && blink_diff < (long) CURSORBLINK)
-       return;
-
-    last_blink = now;
-    blinker = !blinker;
+    sfree(newline);
+    sfree(ch);
 }
 
 /*
  * Invalidate the whole screen so it will be repainted in full.
  */
-void term_invalidate(void)
+void term_invalidate(Terminal *term)
 {
-    int i;
+    int i, j;
+
+    for (i = 0; i < term->rows; i++)
+       for (j = 0; j < term->cols; j++)
+           term->disptext[i]->chars[j].attr |= ATTR_INVALID;
 
-    for (i = 0; i < rows * (cols + 1); i++)
-       disptext[i] = ATTR_INVALID;
+    term_schedule_update(term);
 }
 
 /*
  * Paint the window in response to a WM_PAINT message.
  */
-void term_paint(Context ctx, int left, int top, int right, int bottom)
+void term_paint(Terminal *term, Context ctx,
+               int left, int top, int right, int bottom, int immediately)
 {
     int i, j;
     if (left < 0) left = 0;
     if (top < 0) top = 0;
-    if (right >= cols) right = cols-1;
-    if (bottom >= rows) bottom = rows-1;
+    if (right >= term->cols) right = term->cols-1;
+    if (bottom >= term->rows) bottom = term->rows-1;
 
-    for (i = top; i <= bottom && i < rows; i++) {
-       if ((disptext[i * (cols + 1) + cols] & LATTR_MODE) == LATTR_NORM)
-           for (j = left; j <= right && j < cols; j++)
-               disptext[i * (cols + 1) + j] = ATTR_INVALID;
+    for (i = top; i <= bottom && i < term->rows; i++) {
+       if ((term->disptext[i]->lattr & LATTR_MODE) == LATTR_NORM)
+           for (j = left; j <= right && j < term->cols; j++)
+               term->disptext[i]->chars[j].attr |= ATTR_INVALID;
        else
-           for (j = left / 2; j <= right / 2 + 1 && j < cols; j++)
-               disptext[i * (cols + 1) + j] = ATTR_INVALID;
+           for (j = left / 2; j <= right / 2 + 1 && j < term->cols; j++)
+               term->disptext[i]->chars[j].attr |= ATTR_INVALID;
     }
 
-    /* This should happen soon enough, also for some reason it sometimes 
-     * fails to actually do anything when re-sizing ... painting the wrong
-     * window perhaps ?
-     */
-    if (alt_pressed)
-        do_paint (ctx, FALSE);
+    if (immediately) {
+        do_paint (term, ctx, FALSE);
+    } else {
+       term_schedule_update(term);
+    }
 }
 
 /*
@@ -3066,35 +5229,95 @@ void term_paint(Context ctx, int left, int top, int right, int bottom)
  * to denote it is relative to the end, and 0 to denote that it is
  * relative to the current position.
  */
-void term_scroll(int rel, int where)
+void term_scroll(Terminal *term, int rel, int where)
+{
+    int sbtop = -sblines(term);
+#ifdef OPTIMISE_SCROLL
+    int olddisptop = term->disptop;
+    int shift;
+#endif /* OPTIMISE_SCROLL */
+
+    term->disptop = (rel < 0 ? 0 : rel > 0 ? sbtop : term->disptop) + where;
+    if (term->disptop < sbtop)
+       term->disptop = sbtop;
+    if (term->disptop > 0)
+       term->disptop = 0;
+    update_sbar(term);
+#ifdef OPTIMISE_SCROLL
+    shift = (term->disptop - olddisptop);
+    if (shift < term->rows && shift > -term->rows)
+       scroll_display(term, 0, term->rows - 1, shift);
+#endif /* OPTIMISE_SCROLL */
+    term_update(term);
+}
+
+/*
+ * Scroll the scrollback to centre it on the beginning or end of the
+ * current selection, if any.
+ */
+void term_scroll_to_selection(Terminal *term, int which_end)
 {
-    int sbtop = -count234(scrollback);
+    pos target;
+    int y;
+    int sbtop = -sblines(term);
+
+    if (term->selstate != SELECTED)
+       return;
+    if (which_end)
+       target = term->selend;
+    else
+       target = term->selstart;
+
+    y = target.y - term->rows/2;
+    if (y < sbtop)
+       y = sbtop;
+    else if (y > 0)
+       y = 0;
+    term_scroll(term, -1, y);
+}
 
-    disptop = (rel < 0 ? 0 : rel > 0 ? sbtop : disptop) + where;
-    if (disptop < sbtop)
-       disptop = sbtop;
-    if (disptop > 0)
-       disptop = 0;
-    update_sbar();
-    term_update();
+/*
+ * Helper routine for clipme(): growing buffer.
+ */
+typedef struct {
+    int buflen;                    /* amount of allocated space in textbuf/attrbuf */
+    int bufpos;                    /* amount of actual data */
+    wchar_t *textbuf;      /* buffer for copied text */
+    wchar_t *textptr;      /* = textbuf + bufpos (current insertion point) */
+    int *attrbuf;          /* buffer for copied attributes */
+    int *attrptr;          /* = attrbuf + bufpos */
+} clip_workbuf;
+
+static void clip_addchar(clip_workbuf *b, wchar_t chr, int attr)
+{
+    if (b->bufpos >= b->buflen) {
+       b->buflen += 128;
+       b->textbuf = sresize(b->textbuf, b->buflen, wchar_t);
+       b->textptr = b->textbuf + b->bufpos;
+       b->attrbuf = sresize(b->attrbuf, b->buflen, int);
+       b->attrptr = b->attrbuf + b->bufpos;
+    }
+    *b->textptr++ = chr;
+    *b->attrptr++ = attr;
+    b->bufpos++;
 }
 
-static void clipme(pos top, pos bottom, int rect)
+static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
 {
-    wchar_t *workbuf;
-    wchar_t *wbptr;                   /* where next char goes within workbuf */
+    clip_workbuf buf;
     int old_top_x;
-    int wblen = 0;                    /* workbuf len */
-    int buflen;                               /* amount of memory allocated to workbuf */
+    int attr;
+
+    buf.buflen = 5120;                 
+    buf.bufpos = 0;
+    buf.textptr = buf.textbuf = snewn(buf.buflen, wchar_t);
+    buf.attrptr = buf.attrbuf = snewn(buf.buflen, int);
 
-    buflen = 5120;                    /* Default size */
-    workbuf = smalloc(buflen * sizeof(wchar_t));
-    wbptr = workbuf;                  /* start filling here */
     old_top_x = top.x;                /* needed for rect==1 */
 
     while (poslt(top, bottom)) {
        int nl = FALSE;
-       unsigned long *ldata = lineptr(top.y);
+       termline *ldata = lineptr(top.y);
        pos nlpos;
 
        /*
@@ -3103,7 +5326,7 @@ static void clipme(pos top, pos bottom, int rect)
         * line...
         */
        nlpos.y = top.y;
-       nlpos.x = cols;
+       nlpos.x = term->cols;
 
        /*
         * ... move it backwards if there's unused space at the end
@@ -3111,14 +5334,17 @@ static void clipme(pos top, pos bottom, int rect)
         * because in normal selection mode this means we need a
         * newline at the end)...
         */
-       if (!(ldata[cols] & LATTR_WRAPPED)) {
-           while (((ldata[nlpos.x - 1] & 0xFF) == 0x20 ||
-                   (DIRECT_CHAR(ldata[nlpos.x - 1]) &&
-                    (ldata[nlpos.x - 1] & CHAR_MASK) == 0x20))
-                  && poslt(top, nlpos))
+       if (!(ldata->lattr & LATTR_WRAPPED)) {
+           while (nlpos.x &&
+                  IS_SPACE_CHR(ldata->chars[nlpos.x - 1].chr) &&
+                  !ldata->chars[nlpos.x - 1].cc_next &&
+                  poslt(top, nlpos))
                decpos(nlpos);
            if (poslt(nlpos, bottom))
                nl = TRUE;
+       } else if (ldata->lattr & LATTR_WRAPPED2) {
+           /* Ignore the last char on the line in a WRAPPED2 line. */
+           decpos(nlpos);
        }
 
        /*
@@ -3140,113 +5366,127 @@ static void clipme(pos top, pos bottom, int rect)
            sprintf(cbuf, "<U+%04x>", (ldata[top.x] & 0xFFFF));
 #else
            wchar_t cbuf[16], *p;
-           int uc = (ldata[top.x] & 0xFFFF);
-           int set, c;
+           int c;
+           int x = top.x;
 
-           if (uc == UCSWIDE) {
+           if (ldata->chars[x].chr == UCSWIDE) {
                top.x++;
                continue;
            }
 
-           switch (uc & CSET_MASK) {
-             case ATTR_LINEDRW:
-               if (!cfg.rawcnp) {
-                   uc = unitab_xterm[uc & 0xFF];
+           while (1) {
+               int uc = ldata->chars[x].chr;
+                attr = ldata->chars[x].attr;
+
+               switch (uc & CSET_MASK) {
+                 case CSET_LINEDRW:
+                   if (!term->rawcnp) {
+                       uc = term->ucsdata->unitab_xterm[uc & 0xFF];
+                       break;
+                   }
+                 case CSET_ASCII:
+                   uc = term->ucsdata->unitab_line[uc & 0xFF];
+                   break;
+                 case CSET_SCOACS:
+                   uc = term->ucsdata->unitab_scoacs[uc&0xFF];
+                   break;
+               }
+               switch (uc & CSET_MASK) {
+                 case CSET_ACP:
+                   uc = term->ucsdata->unitab_font[uc & 0xFF];
+                   break;
+                 case CSET_OEMCP:
+                   uc = term->ucsdata->unitab_oemcp[uc & 0xFF];
                    break;
                }
-             case ATTR_ASCII:
-               uc = unitab_line[uc & 0xFF];
-               break;
-             case ATTR_SCOACS:  
-               uc = unitab_scoacs[uc&0xFF]; 
-               break;
-           }
-           switch (uc & CSET_MASK) {
-             case ATTR_ACP:
-               uc = unitab_font[uc & 0xFF];
-               break;
-             case ATTR_OEMCP:
-               uc = unitab_oemcp[uc & 0xFF];
-               break;
-           }
 
-           set = (uc & CSET_MASK);
-           c = (uc & CHAR_MASK);
-           cbuf[0] = uc;
-           cbuf[1] = 0;
-
-           if (DIRECT_FONT(uc)) {
-               if (c >= ' ' && c != 0x7F) {
-                   unsigned char buf[4];
-                   WCHAR wbuf[4];
-                   int rv;
-                   if (is_dbcs_leadbyte(font_codepage, (BYTE) c)) {
-                       buf[0] = c;
-                       buf[1] = (unsigned char) ldata[top.x + 1];
-                       rv = mb_to_wc(font_codepage, 0, buf, 2, wbuf, 4);
-                       top.x++;
-                   } else {
-                       buf[0] = c;
-                       rv = mb_to_wc(font_codepage, 0, buf, 1, wbuf, 4);
-                   }
+               c = (uc & ~CSET_MASK);
+#ifdef PLATFORM_IS_UTF16
+               if (uc > 0x10000 && uc < 0x110000) {
+                   cbuf[0] = 0xD800 | ((uc - 0x10000) >> 10);
+                   cbuf[1] = 0xDC00 | ((uc - 0x10000) & 0x3FF);
+                   cbuf[2] = 0;
+               } else
+#endif
+               {
+                   cbuf[0] = uc;
+                   cbuf[1] = 0;
+               }
+
+               if (DIRECT_FONT(uc)) {
+                   if (c >= ' ' && c != 0x7F) {
+                       char buf[4];
+                       WCHAR wbuf[4];
+                       int rv;
+                       if (is_dbcs_leadbyte(term->ucsdata->font_codepage, (BYTE) c)) {
+                           buf[0] = c;
+                           buf[1] = (char) (0xFF & ldata->chars[top.x + 1].chr);
+                           rv = mb_to_wc(term->ucsdata->font_codepage, 0, buf, 2, wbuf, 4);
+                           top.x++;
+                       } else {
+                           buf[0] = c;
+                           rv = mb_to_wc(term->ucsdata->font_codepage, 0, buf, 1, wbuf, 4);
+                       }
 
-                   if (rv > 0) {
-                       memcpy(cbuf, wbuf, rv * sizeof(wchar_t));
-                       cbuf[rv] = 0;
+                       if (rv > 0) {
+                           memcpy(cbuf, wbuf, rv * sizeof(wchar_t));
+                           cbuf[rv] = 0;
+                       }
                    }
                }
-           }
 #endif
 
-           for (p = cbuf; *p; p++) {
-               /* Enough overhead for trailing NL and nul */
-               if (wblen >= buflen - 16) {
-                   workbuf =
-                       srealloc(workbuf,
-                                sizeof(wchar_t) * (buflen += 100));
-                   wbptr = workbuf + wblen;
-               }
-               wblen++;
-               *wbptr++ = *p;
+               for (p = cbuf; *p; p++)
+                   clip_addchar(&buf, *p, attr);
+
+               if (ldata->chars[x].cc_next)
+                   x += ldata->chars[x].cc_next;
+               else
+                   break;
            }
            top.x++;
        }
        if (nl) {
            int i;
-           for (i = 0; i < sel_nl_sz; i++) {
-               wblen++;
-               *wbptr++ = sel_nl[i];
-           }
+           for (i = 0; i < sel_nl_sz; i++)
+               clip_addchar(&buf, sel_nl[i], 0);
        }
        top.y++;
        top.x = rect ? old_top_x : 0;
+
+       unlineptr(ldata);
     }
 #if SELECTION_NUL_TERMINATED
-    wblen++;
-    *wbptr++ = 0;
+    clip_addchar(&buf, 0, 0);
 #endif
-    write_clip(workbuf, wblen, FALSE); /* transfer to clipboard */
-    if (buflen > 0)                   /* indicates we allocated this buffer */
-       sfree(workbuf);
+    /* Finally, transfer all that to the clipboard. */
+    write_clip(term->frontend, buf.textbuf, buf.attrbuf, buf.bufpos, desel);
+    sfree(buf.textbuf);
+    sfree(buf.attrbuf);
 }
 
-void term_copyall(void)
+void term_copyall(Terminal *term)
 {
     pos top;
-    top.y = -count234(scrollback);
+    pos bottom;
+    tree234 *screen = term->screen;
+    top.y = -sblines(term);
     top.x = 0;
-    clipme(top, curs, 0);
+    bottom.y = find_last_nonempty_line(term, screen);
+    bottom.x = term->cols;
+    clipme(term, top, bottom, 0, TRUE);
 }
 
 /*
- * The wordness array is mainly for deciding the disposition of the US-ASCII 
- * characters.
+ * The wordness array is mainly for deciding the disposition of the
+ * US-ASCII characters.
  */
-static int wordtype(int uc)
+static int wordtype(Terminal *term, int uc)
 {
-    static struct {
+    struct ucsword {
        int start, end, ctype;
-    } *wptr, ucs_words[] = {
+    };
+    static const struct ucsword ucs_words[] = {
        {
        128, 160, 0}, {
        161, 191, 1}, {
@@ -3310,37 +5550,37 @@ static int wordtype(int uc)
        {
        0, 0, 0}
     };
-
-    uc &= (CSET_MASK | CHAR_MASK);
+    const struct ucsword *wptr;
 
     switch (uc & CSET_MASK) {
-      case ATTR_LINEDRW:
-       uc = unitab_xterm[uc & 0xFF];
+      case CSET_LINEDRW:
+       uc = term->ucsdata->unitab_xterm[uc & 0xFF];
        break;
-      case ATTR_ASCII:
-       uc = unitab_line[uc & 0xFF];
+      case CSET_ASCII:
+       uc = term->ucsdata->unitab_line[uc & 0xFF];
        break;
-      case ATTR_SCOACS:  
-       uc = unitab_scoacs[uc&0xFF]; 
+      case CSET_SCOACS:  
+       uc = term->ucsdata->unitab_scoacs[uc&0xFF]; 
        break;
     }
     switch (uc & CSET_MASK) {
-      case ATTR_ACP:
-       uc = unitab_font[uc & 0xFF];
+      case CSET_ACP:
+       uc = term->ucsdata->unitab_font[uc & 0xFF];
        break;
-      case ATTR_OEMCP:
-       uc = unitab_oemcp[uc & 0xFF];
+      case CSET_OEMCP:
+       uc = term->ucsdata->unitab_oemcp[uc & 0xFF];
        break;
     }
 
-    /* For DBCS font's I can't do anything usefull. Even this will sometimes
+    /* For DBCS fonts I can't do anything useful. Even this will sometimes
      * fail as there's such a thing as a double width space. :-(
      */
-    if (dbcs_screenfont && font_codepage == line_codepage)
+    if (term->ucsdata->dbcs_screenfont &&
+       term->ucsdata->font_codepage == term->ucsdata->line_codepage)
        return (uc != ' ');
 
     if (uc < 0x80)
-       return wordness[uc];
+       return term->wordness[uc];
 
     for (wptr = ucs_words; wptr->start; wptr++) {
        if (uc >= wptr->start && uc <= wptr->end)
@@ -3353,28 +5593,29 @@ static int wordtype(int uc)
 /*
  * Spread the selection outwards according to the selection mode.
  */
-static pos sel_spread_half(pos p, int dir)
+static pos sel_spread_half(Terminal *term, pos p, int dir)
 {
-    unsigned long *ldata;
+    termline *ldata;
     short wvalue;
-    int topy = -count234(scrollback);
+    int topy = -sblines(term);
 
     ldata = lineptr(p.y);
 
-    switch (selmode) {
+    switch (term->selmode) {
       case SM_CHAR:
        /*
         * In this mode, every character is a separate unit, except
         * for runs of spaces at the end of a non-wrapping line.
         */
-       if (!(ldata[cols] & LATTR_WRAPPED)) {
-           unsigned long *q = ldata + cols;
-           while (q > ldata && (q[-1] & CHAR_MASK) == 0x20)
+       if (!(ldata->lattr & LATTR_WRAPPED)) {
+           termchar *q = ldata->chars + term->cols;
+           while (q > ldata->chars &&
+                  IS_SPACE_CHR(q[-1].chr) && !q[-1].cc_next)
                q--;
-           if (q == ldata + cols)
+           if (q == ldata->chars + term->cols)
                q--;
-           if (p.x >= q - ldata)
-               p.x = (dir == -1 ? q - ldata : cols - 1);
+           if (p.x >= q - ldata->chars)
+               p.x = (dir == -1 ? q - ldata->chars : term->cols - 1);
        }
        break;
       case SM_WORD:
@@ -3382,24 +5623,31 @@ static pos sel_spread_half(pos p, int dir)
         * In this mode, the units are maximal runs of characters
         * whose `wordness' has the same value.
         */
-       wvalue = wordtype(ldata[p.x]);
+       wvalue = wordtype(term, UCSGET(ldata->chars, p.x));
        if (dir == +1) {
            while (1) {
-               if (p.x < cols-1) {
-                   if (wordtype(ldata[p.x + 1]) == wvalue)
+               int maxcols = (ldata->lattr & LATTR_WRAPPED2 ?
+                              term->cols-1 : term->cols);
+               if (p.x < maxcols-1) {
+                   if (wordtype(term, UCSGET(ldata->chars, p.x+1)) == wvalue)
                        p.x++;
                    else
                        break;
                } else {
-                   if (ldata[cols] & LATTR_WRAPPED) {
-                       unsigned long *ldata2;
+                   if (p.y+1 < term->rows && 
+                        (ldata->lattr & LATTR_WRAPPED)) {
+                       termline *ldata2;
                        ldata2 = lineptr(p.y+1);
-                       if (wordtype(ldata2[0]) == wvalue) {
+                       if (wordtype(term, UCSGET(ldata2->chars, 0))
+                           == wvalue) {
                            p.x = 0;
                            p.y++;
+                           unlineptr(ldata);
                            ldata = ldata2;
-                       } else
+                       } else {
+                           unlineptr(ldata2);
                            break;
+                       }
                    } else
                        break;
                }
@@ -3407,20 +5655,29 @@ static pos sel_spread_half(pos p, int dir)
        } else {
            while (1) {
                if (p.x > 0) {
-                   if (wordtype(ldata[p.x - 1]) == wvalue)
+                   if (wordtype(term, UCSGET(ldata->chars, p.x-1)) == wvalue)
                        p.x--;
                    else
                        break;
                } else {
-                   unsigned long *ldata2;
+                   termline *ldata2;
+                   int maxcols;
                    if (p.y <= topy)
                        break;
                    ldata2 = lineptr(p.y-1);
-                   if ((ldata2[cols] & LATTR_WRAPPED) &&
-                       wordtype(ldata2[cols-1]) == wvalue) {
-                       p.x = cols-1;
-                       p.y--;
-                       ldata = ldata2;
+                   maxcols = (ldata2->lattr & LATTR_WRAPPED2 ?
+                             term->cols-1 : term->cols);
+                   if (ldata2->lattr & LATTR_WRAPPED) {
+                       if (wordtype(term, UCSGET(ldata2->chars, maxcols-1))
+                           == wvalue) {
+                           p.x = maxcols-1;
+                           p.y--;
+                           unlineptr(ldata);
+                           ldata = ldata2;
+                       } else {
+                           unlineptr(ldata2);
+                           break;
+                       }
                    } else
                        break;
                }
@@ -3431,35 +5688,44 @@ static pos sel_spread_half(pos p, int dir)
        /*
         * In this mode, every line is a unit.
         */
-       p.x = (dir == -1 ? 0 : cols - 1);
+       p.x = (dir == -1 ? 0 : term->cols - 1);
        break;
     }
+
+    unlineptr(ldata);
     return p;
 }
 
-static void sel_spread(void)
+static void sel_spread(Terminal *term)
 {
-    if (seltype == LEXICOGRAPHIC) {
-       selstart = sel_spread_half(selstart, -1);
-       decpos(selend);
-       selend = sel_spread_half(selend, +1);
-       incpos(selend);
+    if (term->seltype == LEXICOGRAPHIC) {
+       term->selstart = sel_spread_half(term, term->selstart, -1);
+       decpos(term->selend);
+       term->selend = sel_spread_half(term, term->selend, +1);
+       incpos(term->selend);
     }
 }
 
-void term_do_paste(void)
+void term_do_paste(Terminal *term)
 {
     wchar_t *data;
     int len;
 
-    get_clip(&data, &len);
-    if (data) {
+    get_clip(term->frontend, &data, &len);
+    if (data && len > 0) {
         wchar_t *p, *q;
 
-        if (paste_buffer)
-            sfree(paste_buffer);
-        paste_pos = paste_hold = paste_len = 0;
-        paste_buffer = smalloc(len * sizeof(wchar_t));
+       term_seen_key_event(term);     /* pasted data counts */
+
+        if (term->paste_buffer)
+            sfree(term->paste_buffer);
+        term->paste_pos = term->paste_hold = term->paste_len = 0;
+        term->paste_buffer = snewn(len + 12, wchar_t);
+
+        if (term->bracketed_paste) {
+            memcpy(term->paste_buffer, L"\033[200~", 6 * sizeof(wchar_t));
+            term->paste_len += 6;
+        }
 
         p = q = data;
         while (p < data + len) {
@@ -3471,164 +5737,202 @@ void term_do_paste(void)
             {
                 int i;
                 for (i = 0; i < p - q; i++) {
-                    paste_buffer[paste_len++] = q[i];
+                    term->paste_buffer[term->paste_len++] = q[i];
                 }
             }
 
             if (p <= data + len - sel_nl_sz &&
                 !memcmp(p, sel_nl, sizeof(sel_nl))) {
-                paste_buffer[paste_len++] = '\r';
+                term->paste_buffer[term->paste_len++] = '\015';
                 p += sel_nl_sz;
             }
             q = p;
         }
 
+        if (term->bracketed_paste) {
+            memcpy(term->paste_buffer + term->paste_len,
+                   L"\033[201~", 6 * sizeof(wchar_t));
+            term->paste_len += 6;
+        }
+
         /* Assume a small paste will be OK in one go. */
-        if (paste_len < 256) {
-            luni_send(paste_buffer, paste_len, 0);
-            if (paste_buffer)
-                sfree(paste_buffer);
-            paste_buffer = 0;
-            paste_pos = paste_hold = paste_len = 0;
+        if (term->paste_len < 256) {
+            if (term->ldisc)
+               luni_send(term->ldisc, term->paste_buffer, term->paste_len, 0);
+            if (term->paste_buffer)
+                sfree(term->paste_buffer);
+            term->paste_buffer = 0;
+            term->paste_pos = term->paste_hold = term->paste_len = 0;
         }
     }
-    get_clip(NULL, NULL);
+    get_clip(term->frontend, NULL, NULL);
 }
 
-void term_mouse(Mouse_Button b, Mouse_Action a, int x, int y,
-               int shift, int ctrl, int alt)
+void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked,
+               Mouse_Action a, int x, int y, int shift, int ctrl, int alt)
 {
     pos selpoint;
-    unsigned long *ldata;
-    int raw_mouse = (xterm_mouse &&
-                    !cfg.no_mouse_rep &&
-                    !(cfg.mouse_override && shift));
+    termline *ldata;
+    int raw_mouse = (term->xterm_mouse &&
+                    !term->no_mouse_rep &&
+                    !(term->mouse_override && shift));
     int default_seltype;
 
     if (y < 0) {
        y = 0;
        if (a == MA_DRAG && !raw_mouse)
-           term_scroll(0, -1);
+           term_scroll(term, 0, -1);
     }
-    if (y >= rows) {
-       y = rows - 1;
+    if (y >= term->rows) {
+       y = term->rows - 1;
        if (a == MA_DRAG && !raw_mouse)
-           term_scroll(0, +1);
+           term_scroll(term, 0, +1);
     }
     if (x < 0) {
        if (y > 0) {
-           x = cols - 1;
+           x = term->cols - 1;
            y--;
        } else
            x = 0;
     }
-    if (x >= cols)
-       x = cols - 1;
+    if (x >= term->cols)
+       x = term->cols - 1;
 
-    selpoint.y = y + disptop;
-    selpoint.x = x;
+    selpoint.y = y + term->disptop;
     ldata = lineptr(selpoint.y);
-    if ((ldata[cols] & LATTR_MODE) != LATTR_NORM)
-       selpoint.x /= 2;
 
-    if (raw_mouse) {
+    if ((ldata->lattr & LATTR_MODE) != LATTR_NORM)
+       x /= 2;
+
+    /*
+     * Transform x through the bidi algorithm to find the _logical_
+     * click point from the physical one.
+     */
+    if (term_bidi_line(term, ldata, y) != NULL) {
+       x = term->post_bidi_cache[y].backward[x];
+    }
+
+    selpoint.x = x;
+    unlineptr(ldata);
+
+    /*
+     * If we're in the middle of a selection operation, we ignore raw
+     * mouse mode until it's done (we must have been not in raw mouse
+     * mode when it started).
+     * This makes use of Shift for selection reliable, and avoids the
+     * host seeing mouse releases for which they never saw corresponding
+     * presses.
+     */
+    if (raw_mouse &&
+       (term->selstate != ABOUT_TO) && (term->selstate != DRAGGING)) {
        int encstate = 0, r, c;
-       char abuf[16];
-       static int is_down = 0;
+       char abuf[32];
+       int len = 0;
 
-       switch (b) {
-         case MBT_LEFT:
-           encstate = 0x20;           /* left button down */
-           break;
-         case MBT_MIDDLE:
-           encstate = 0x21;
-           break;
-         case MBT_RIGHT:
-           encstate = 0x22;
-           break;
-         case MBT_WHEEL_UP:
-           encstate = 0x60;
-           break;
-         case MBT_WHEEL_DOWN:
-           encstate = 0x61;
-           break;
-         default: break;              /* placate gcc warning about enum use */
-       }
-       switch (a) {
-         case MA_DRAG:
-           if (xterm_mouse == 1)
-               return;
-           encstate += 0x20;
-           break;
-         case MA_RELEASE:
-           encstate = 0x23;
-           is_down = 0;
-           break;
-         case MA_CLICK:
-           if (is_down == b)
-               return;
-           is_down = b;
-           break;
-         default: break;              /* placate gcc warning about enum use */
-       }
-       if (shift)
-           encstate += 0x04;
-       if (ctrl)
-           encstate += 0x10;
-       r = y + 33;
-       c = x + 33;
+       if (term->ldisc) {
 
-       sprintf(abuf, "\033[M%c%c%c", encstate, c, r);
-       ldisc_send(abuf, 6, 0);
+           switch (braw) {
+             case MBT_LEFT:
+               encstate = 0x00;               /* left button down */
+               break;
+             case MBT_MIDDLE:
+               encstate = 0x01;
+               break;
+             case MBT_RIGHT:
+               encstate = 0x02;
+               break;
+             case MBT_WHEEL_UP:
+               encstate = 0x40;
+               break;
+             case MBT_WHEEL_DOWN:
+               encstate = 0x41;
+               break;
+             default: break;          /* placate gcc warning about enum use */
+           }
+           switch (a) {
+             case MA_DRAG:
+               if (term->xterm_mouse == 1)
+                   return;
+               encstate += 0x20;
+               break;
+             case MA_RELEASE:
+               /* If multiple extensions are enabled, the xterm 1006 is used, so it's okay to check for only that */
+               if (!term->xterm_extended_mouse)
+                   encstate = 0x03;
+               term->mouse_is_down = 0;
+               break;
+             case MA_CLICK:
+               if (term->mouse_is_down == braw)
+                   return;
+               term->mouse_is_down = braw;
+               break;
+             default: break;          /* placate gcc warning about enum use */
+           }
+           if (shift)
+               encstate += 0x04;
+           if (ctrl)
+               encstate += 0x10;
+           r = y + 1;
+           c = x + 1;
+
+           /* Check the extensions in decreasing order of preference. Encoding the release event above assumes that 1006 comes first. */
+           if (term->xterm_extended_mouse) {
+               len = sprintf(abuf, "\033[<%d;%d;%d%c", encstate, c, r, a == MA_RELEASE ? 'm' : 'M');
+           } else if (term->urxvt_extended_mouse) {
+               len = sprintf(abuf, "\033[%d;%d;%dM", encstate + 32, c, r);
+           } else if (c <= 223 && r <= 223) {
+               len = sprintf(abuf, "\033[M%c%c%c", encstate + 32, c + 32, r + 32);
+           }
+           ldisc_send(term->ldisc, abuf, len, 0);
+       }
        return;
     }
 
-    b = translate_button(b);
-
     /*
      * Set the selection type (rectangular or normal) at the start
      * of a selection attempt, from the state of Alt.
      */
-    if (!alt ^ !cfg.rect_select)
+    if (!alt ^ !term->rect_select)
        default_seltype = RECTANGULAR;
     else
        default_seltype = LEXICOGRAPHIC;
        
-    if (selstate == NO_SELECTION) {
-       seltype = default_seltype;
-    }
-
-    if (b == MBT_SELECT && a == MA_CLICK) {
-       deselect();
-       selstate = ABOUT_TO;
-       seltype = default_seltype;
-       selanchor = selpoint;
-       selmode = SM_CHAR;
-    } else if (b == MBT_SELECT && (a == MA_2CLK || a == MA_3CLK)) {
-       deselect();
-       selmode = (a == MA_2CLK ? SM_WORD : SM_LINE);
-       selstate = DRAGGING;
-       selstart = selanchor = selpoint;
-       selend = selstart;
-       incpos(selend);
-       sel_spread();
-    } else if ((b == MBT_SELECT && a == MA_DRAG) ||
-              (b == MBT_EXTEND && a != MA_RELEASE)) {
-       if (selstate == ABOUT_TO && poseq(selanchor, selpoint))
+    if (term->selstate == NO_SELECTION) {
+       term->seltype = default_seltype;
+    }
+
+    if (bcooked == MBT_SELECT && a == MA_CLICK) {
+       deselect(term);
+       term->selstate = ABOUT_TO;
+       term->seltype = default_seltype;
+       term->selanchor = selpoint;
+       term->selmode = SM_CHAR;
+    } else if (bcooked == MBT_SELECT && (a == MA_2CLK || a == MA_3CLK)) {
+       deselect(term);
+       term->selmode = (a == MA_2CLK ? SM_WORD : SM_LINE);
+       term->selstate = DRAGGING;
+       term->selstart = term->selanchor = selpoint;
+       term->selend = term->selstart;
+       incpos(term->selend);
+       sel_spread(term);
+    } else if ((bcooked == MBT_SELECT && a == MA_DRAG) ||
+              (bcooked == MBT_EXTEND && a != MA_RELEASE)) {
+       if (term->selstate == ABOUT_TO && poseq(term->selanchor, selpoint))
            return;
-       if (b == MBT_EXTEND && a != MA_DRAG && selstate == SELECTED) {
-           if (seltype == LEXICOGRAPHIC) {
+       if (bcooked == MBT_EXTEND && a != MA_DRAG &&
+           term->selstate == SELECTED) {
+           if (term->seltype == LEXICOGRAPHIC) {
                /*
                 * For normal selection, we extend by moving
                 * whichever end of the current selection is closer
                 * to the mouse.
                 */
-               if (posdiff(selpoint, selstart) <
-                   posdiff(selend, selstart) / 2) {
-                   selanchor = selend;
-                   decpos(selanchor);
+               if (posdiff(selpoint, term->selstart) <
+                   posdiff(term->selend, term->selstart) / 2) {
+                   term->selanchor = term->selend;
+                   decpos(term->selanchor);
                } else {
-                   selanchor = selstart;
+                   term->selanchor = term->selstart;
                }
            } else {
                /*
@@ -3636,34 +5940,34 @@ void term_mouse(Mouse_Button b, Mouse_Action a, int x, int y,
                 * _four_ places to put selanchor and selpoint: the
                 * four corners of the selection.
                 */
-               if (2*selpoint.x < selstart.x + selend.x)
-                   selanchor.x = selend.x-1;
+               if (2*selpoint.x < term->selstart.x + term->selend.x)
+                   term->selanchor.x = term->selend.x-1;
                else
-                   selanchor.x = selstart.x;
+                   term->selanchor.x = term->selstart.x;
 
-               if (2*selpoint.y < selstart.y + selend.y)
-                   selanchor.y = selend.y;
+               if (2*selpoint.y < term->selstart.y + term->selend.y)
+                   term->selanchor.y = term->selend.y;
                else
-                   selanchor.y = selstart.y;
+                   term->selanchor.y = term->selstart.y;
            }
-           selstate = DRAGGING;
+           term->selstate = DRAGGING;
        }
-       if (selstate != ABOUT_TO && selstate != DRAGGING)
-           selanchor = selpoint;
-       selstate = DRAGGING;
-       if (seltype == LEXICOGRAPHIC) {
+       if (term->selstate != ABOUT_TO && term->selstate != DRAGGING)
+           term->selanchor = selpoint;
+       term->selstate = DRAGGING;
+       if (term->seltype == LEXICOGRAPHIC) {
            /*
             * For normal selection, we set (selstart,selend) to
             * (selpoint,selanchor) in some order.
             */
-           if (poslt(selpoint, selanchor)) {
-               selstart = selpoint;
-               selend = selanchor;
-               incpos(selend);
+           if (poslt(selpoint, term->selanchor)) {
+               term->selstart = selpoint;
+               term->selend = term->selanchor;
+               incpos(term->selend);
            } else {
-               selstart = selanchor;
-               selend = selpoint;
-               incpos(selend);
+               term->selstart = term->selanchor;
+               term->selend = selpoint;
+               incpos(term->selend);
            }
        } else {
            /*
@@ -3671,113 +5975,174 @@ void term_mouse(Mouse_Button b, Mouse_Action a, int x, int y,
             * interchange x and y coordinates (if the user has
             * dragged in the -x and +y directions, or vice versa).
             */
-           selstart.x = min(selanchor.x, selpoint.x);
-           selend.x = 1+max(selanchor.x, selpoint.x);
-           selstart.y = min(selanchor.y, selpoint.y);
-           selend.y =   max(selanchor.y, selpoint.y);
+           term->selstart.x = min(term->selanchor.x, selpoint.x);
+           term->selend.x = 1+max(term->selanchor.x, selpoint.x);
+           term->selstart.y = min(term->selanchor.y, selpoint.y);
+           term->selend.y =   max(term->selanchor.y, selpoint.y);
        }
-       sel_spread();
-    } else if ((b == MBT_SELECT || b == MBT_EXTEND) && a == MA_RELEASE) {
-       if (selstate == DRAGGING) {
+       sel_spread(term);
+    } else if ((bcooked == MBT_SELECT || bcooked == MBT_EXTEND) &&
+              a == MA_RELEASE) {
+       if (term->selstate == DRAGGING) {
            /*
             * We've completed a selection. We now transfer the
             * data to the clipboard.
             */
-           clipme(selstart, selend, (seltype == RECTANGULAR));
-           selstate = SELECTED;
+           clipme(term, term->selstart, term->selend,
+                  (term->seltype == RECTANGULAR), FALSE);
+           term->selstate = SELECTED;
        } else
-           selstate = NO_SELECTION;
-    } else if (b == MBT_PASTE
+           term->selstate = NO_SELECTION;
+    } else if (bcooked == MBT_PASTE
               && (a == MA_CLICK
 #if MULTICLICK_ONLY_EVENT
                   || a == MA_2CLK || a == MA_3CLK
 #endif
                   )) {
-       request_paste();
+       request_paste(term->frontend);
+    }
+
+    /*
+     * Since terminal output is suppressed during drag-selects, we
+     * should make sure to write any pending output if one has just
+     * finished.
+     */
+    if (term->selstate != DRAGGING)
+        term_out(term);
+    term_update(term);
+}
+
+int format_arrow_key(char *buf, Terminal *term, int xkey, int ctrl)
+{
+    char *p = buf;
+
+    if (term->vt52_mode)
+       p += sprintf((char *) p, "\x1B%c", xkey);
+    else {
+       int app_flg = (term->app_cursor_keys && !term->no_applic_c);
+#if 0
+       /*
+        * RDB: VT100 & VT102 manuals both state the app cursor
+        * keys only work if the app keypad is on.
+        *
+        * SGT: That may well be true, but xterm disagrees and so
+        * does at least one application, so I've #if'ed this out
+        * and the behaviour is back to PuTTY's original: app
+        * cursor and app keypad are independently switchable
+        * modes. If anyone complains about _this_ I'll have to
+        * put in a configurable option.
+        */
+       if (!term->app_keypad_keys)
+           app_flg = 0;
+#endif
+       /* Useful mapping of Ctrl-arrows */
+       if (ctrl)
+           app_flg = !app_flg;
+
+       if (app_flg)
+           p += sprintf((char *) p, "\x1BO%c", xkey);
+       else
+           p += sprintf((char *) p, "\x1B[%c", xkey);
     }
 
-    term_update();
+    return p - buf;
 }
 
-void term_nopaste()
+void term_nopaste(Terminal *term)
 {
-    if (paste_len == 0)
+    if (term->paste_len == 0)
        return;
-    sfree(paste_buffer);
-    paste_buffer = 0;
-    paste_len = 0;
+    sfree(term->paste_buffer);
+    term->paste_buffer = NULL;
+    term->paste_len = 0;
 }
 
-int term_paste_pending(void)
+int term_paste_pending(Terminal *term)
 {
-    return paste_len != 0;
+    return term->paste_len != 0;
 }
 
-void term_paste()
+void term_paste(Terminal *term)
 {
-    static long last_paste = 0;
     long now, paste_diff;
 
-    if (paste_len == 0)
+    if (term->paste_len == 0)
        return;
 
     /* Don't wait forever to paste */
-    if (paste_hold) {
+    if (term->paste_hold) {
        now = GETTICKCOUNT();
-       paste_diff = now - last_paste;
+       paste_diff = now - term->last_paste;
        if (paste_diff >= 0 && paste_diff < 450)
            return;
     }
-    paste_hold = 0;
+    term->paste_hold = 0;
 
-    while (paste_pos < paste_len) {
+    while (term->paste_pos < term->paste_len) {
        int n = 0;
-       while (n + paste_pos < paste_len) {
-           if (paste_buffer[paste_pos + n++] == '\r')
+       while (n + term->paste_pos < term->paste_len) {
+           if (term->paste_buffer[term->paste_pos + n++] == '\015')
                break;
        }
-       luni_send(paste_buffer + paste_pos, n, 0);
-       paste_pos += n;
+       if (term->ldisc)
+           luni_send(term->ldisc, term->paste_buffer + term->paste_pos, n, 0);
+       term->paste_pos += n;
 
-       if (paste_pos < paste_len) {
-           paste_hold = 1;
+       if (term->paste_pos < term->paste_len) {
+           term->paste_hold = 1;
            return;
        }
     }
-    sfree(paste_buffer);
-    paste_buffer = 0;
-    paste_len = 0;
+    sfree(term->paste_buffer);
+    term->paste_buffer = NULL;
+    term->paste_len = 0;
 }
 
-static void deselect(void)
+static void deselect(Terminal *term)
 {
-    selstate = NO_SELECTION;
-    selstart.x = selstart.y = selend.x = selend.y = 0;
+    term->selstate = NO_SELECTION;
+    term->selstart.x = term->selstart.y = term->selend.x = term->selend.y = 0;
 }
 
-void term_deselect(void)
+void term_deselect(Terminal *term)
 {
-    deselect();
-    term_update();
+    deselect(term);
+    term_update(term);
+
+    /*
+     * Since terminal output is suppressed during drag-selects, we
+     * should make sure to write any pending output if one has just
+     * finished.
+     */
+    if (term->selstate != DRAGGING)
+        term_out(term);
 }
 
-int term_ldisc(int option)
+int term_ldisc(Terminal *term, int option)
 {
     if (option == LD_ECHO)
-       return term_echoing;
+       return term->term_echoing;
     if (option == LD_EDIT)
-       return term_editing;
+       return term->term_editing;
     return FALSE;
 }
 
-/*
- * from_backend(), to get data from the backend for the terminal.
- */
-int from_backend(int is_stderr, char *data, int len)
+int term_data(Terminal *term, int is_stderr, const char *data, int len)
 {
-    assert(len > 0);
+    bufchain_add(&term->inbuf, data, len);
 
-    bufchain_add(&inbuf, data, len);
+    if (!term->in_term_out) {
+       term->in_term_out = TRUE;
+       term_reset_cblink(term);
+       /*
+        * During drag-selects, we do not process terminal input,
+        * because the user will want the screen to hold still to
+        * be selected.
+        */
+       if (term->selstate != DRAGGING)
+           term_out(term);
+       term->in_term_out = FALSE;
+    }
 
     /*
      * term_out() always completely empties inbuf. Therefore,
@@ -3786,13 +6151,13 @@ int from_backend(int is_stderr, 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.
      *
@@ -3800,3 +6165,173 @@ int from_backend(int is_stderr, char *data, int len)
      */
     return 0;
 }
+
+/*
+ * Write untrusted data to the terminal.
+ * The only control character that should be honoured is \n (which
+ * will behave as a CRLF).
+ */
+int term_data_untrusted(Terminal *term, const char *data, int len)
+{
+    int i;
+    /* FIXME: more sophisticated checking? */
+    for (i = 0; i < len; i++) {
+       if (data[i] == '\n')
+           term_data(term, 1, "\r\n", 2);
+       else if (data[i] & 0x60)
+           term_data(term, 1, data + i, 1);
+    }
+    return 0; /* assumes that term_data() always returns 0 */
+}
+
+void term_provide_logctx(Terminal *term, void *logctx)
+{
+    term->logctx = logctx;
+}
+
+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->bksp_is_delete ? "^?" : "^H";
+    }
+    /* FIXME: perhaps we should set ONLCR based on lfhascr as well? */
+    /* FIXME: or ECHO and friends based on local echo state? */
+    return dupstr(val);
+}
+
+struct term_userpass_state {
+    size_t curr_prompt;
+    int done_prompt;   /* printed out prompt yet? */
+    size_t pos;                /* cursor position */
+};
+
+/*
+ * Process some terminal data in the course of username/password
+ * input.
+ */
+int term_get_userpass_input(Terminal *term, prompts_t *p,
+                           unsigned char *in, int inlen)
+{
+    struct term_userpass_state *s = (struct term_userpass_state *)p->data;
+    if (!s) {
+       /*
+        * First call. Set some stuff up.
+        */
+       p->data = s = snew(struct term_userpass_state);
+       s->curr_prompt = 0;
+       s->done_prompt = 0;
+       /* We only print the `name' caption if we have to... */
+       if (p->name_reqd && p->name) {
+           size_t l = strlen(p->name);
+           term_data_untrusted(term, p->name, l);
+           if (p->name[l-1] != '\n')
+               term_data_untrusted(term, "\n", 1);
+       }
+       /* ...but we always print any `instruction'. */
+       if (p->instruction) {
+           size_t l = strlen(p->instruction);
+           term_data_untrusted(term, p->instruction, l);
+           if (p->instruction[l-1] != '\n')
+               term_data_untrusted(term, "\n", 1);
+       }
+       /*
+        * Zero all the results, in case we abort half-way through.
+        */
+       {
+           int i;
+           for (i = 0; i < (int)p->n_prompts; i++)
+                prompt_set_result(p->prompts[i], "");
+       }
+    }
+
+    while (s->curr_prompt < p->n_prompts) {
+
+       prompt_t *pr = p->prompts[s->curr_prompt];
+       int finished_prompt = 0;
+
+       if (!s->done_prompt) {
+           term_data_untrusted(term, pr->prompt, strlen(pr->prompt));
+           s->done_prompt = 1;
+           s->pos = 0;
+       }
+
+       /* Breaking out here ensures that the prompt is printed even
+        * if we're now waiting for user data. */
+       if (!in || !inlen) break;
+
+       /* FIXME: should we be using local-line-editing code instead? */
+       while (!finished_prompt && inlen) {
+           char c = *in++;
+           inlen--;
+           switch (c) {
+             case 10:
+             case 13:
+               term_data(term, 0, "\r\n", 2);
+                prompt_ensure_result_size(pr, s->pos + 1);
+               pr->result[s->pos] = '\0';
+               /* go to next prompt, if any */
+               s->curr_prompt++;
+               s->done_prompt = 0;
+               finished_prompt = 1; /* break out */
+               break;
+             case 8:
+             case 127:
+               if (s->pos > 0) {
+                   if (pr->echo)
+                       term_data(term, 0, "\b \b", 3);
+                   s->pos--;
+               }
+               break;
+             case 21:
+             case 27:
+               while (s->pos > 0) {
+                   if (pr->echo)
+                       term_data(term, 0, "\b \b", 3);
+                   s->pos--;
+               }
+               break;
+             case 3:
+             case 4:
+               /* Immediate abort. */
+               term_data(term, 0, "\r\n", 2);
+               sfree(s);
+               p->data = NULL;
+               return 0; /* user abort */
+             default:
+               /*
+                * This simplistic check for printability is disabled
+                * when we're doing password input, because some people
+                * have control characters in their passwords.
+                */
+               if (!pr->echo || (c >= ' ' && c <= '~') ||
+                    ((unsigned char) c >= 160)) {
+                    prompt_ensure_result_size(pr, s->pos + 1);
+                   pr->result[s->pos++] = c;
+                   if (pr->echo)
+                       term_data(term, 0, &c, 1);
+               }
+               break;
+           }
+       }
+       
+    }
+
+    if (s->curr_prompt < p->n_prompts) {
+       return -1; /* more data required */
+    } else {
+       sfree(s);
+       p->data = NULL;
+       return +1; /* all done */
+    }
+}