X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7b966c9b996d5797596942b8052e4011b77badc8..c85623f918b8a6c639afc15604414f9b113bb20d:/terminal.c

diff --git a/terminal.c b/terminal.c
index 1446fa21..9ad33d61 100644
--- a/terminal.c
+++ b/terminal.c
@@ -60,8 +60,20 @@
 const wchar_t sel_nl[] = SEL_NL;
 
 /*
+ * 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)] & (CHAR_MASK | CSET_MASK)) == UCSWIDE ? \
+	(a)[(x)-1] : (a)[(x)] )
+
+/*
  * Internal prototypes.
  */
+static unsigned long *resizeline(unsigned long *, int);
+static unsigned long *lineptr(Terminal *, int, int);
 static void do_paint(Terminal *, Context, int);
 static void erase_lots(Terminal *, int, int, int);
 static void swap_screen(Terminal *, int, int, int);
@@ -75,7 +87,7 @@ static void scroll_display(Terminal *, int, int, int);
 /*
  * Resize a line to make it `cols' columns wide.
  */
-unsigned long *resizeline(unsigned long *line, int cols)
+static unsigned long *resizeline(unsigned long *line, int cols)
 {
     int i, oldlen;
     unsigned long lineattrs;
@@ -102,7 +114,7 @@ unsigned long *resizeline(unsigned long *line, int cols)
  * whether the y coordinate is non-negative or negative
  * (respectively).
  */
-unsigned long *lineptr(Terminal *term, int y, int lineno)
+static unsigned long *lineptr(Terminal *term, int y, int lineno)
 {
     unsigned long *line, *newline;
     tree234 *whichtree;
@@ -150,10 +162,10 @@ static void power_on(Terminal *term)
 	for (i = 0; i < term->cols; i++)
 	    term->tabs[i] = (i % 8 == 0 ? TRUE : FALSE);
     }
-    term->alt_om = term->dec_om = term->cfg->dec_om;
+    term->alt_om = term->dec_om = term->cfg.dec_om;
     term->alt_ins = term->insert = FALSE;
     term->alt_wnext = term->wrapnext = term->save_wnext = FALSE;
-    term->alt_wrap = term->wrap = term->cfg->wrap_mode;
+    term->alt_wrap = term->wrap = term->cfg.wrap_mode;
     term->alt_cset = term->cset = term->save_cset = 0;
     term->alt_utf = term->utf = term->save_utf = 0;
     term->utf_state = 0;
@@ -165,17 +177,17 @@ static void power_on(Terminal *term)
     term->big_cursor = 0;
     term->save_attr = term->curr_attr = ATTR_DEFAULT;
     term->term_editing = term->term_echoing = FALSE;
-    term->app_cursor_keys = term->cfg->app_cursor;
-    term->app_keypad_keys = term->cfg->app_keypad;
-    term->use_bce = term->cfg->bce;
-    term->blink_is_real = term->cfg->blinktext;
+    term->app_cursor_keys = term->cfg.app_cursor;
+    term->app_keypad_keys = term->cfg.app_keypad;
+    term->use_bce = term->cfg.bce;
+    term->blink_is_real = term->cfg.blinktext;
     term->erase_char = ERASE_CHAR;
     term->alt_which = 0;
     term_print_finish(term);
     {
 	int i;
 	for (i = 0; i < 256; i++)
-	    term->wordness[i] = term->cfg->wordness[i];
+	    term->wordness[i] = term->cfg.wordness[i];
     }
     if (term->screen) {
 	swap_screen(term, 1, FALSE, FALSE);
@@ -194,7 +206,7 @@ void term_update(Terminal *term)
     ctx = get_ctx(term->frontend);
     if (ctx) {
 	int need_sbar_update = term->seen_disp_event;
-	if (term->seen_disp_event && term->cfg->scroll_on_disp) {
+	if (term->seen_disp_event && term->cfg.scroll_on_disp) {
 	    term->disptop = 0;	       /* return to main screen */
 	    term->seen_disp_event = 0;
 	    need_sbar_update = TRUE;
@@ -232,7 +244,7 @@ void term_seen_key_event(Terminal *term)
     /*
      * Reset the scrollback on keypress, if we're doing that.
      */
-    if (term->cfg->scroll_on_key) {
+    if (term->cfg.scroll_on_key) {
 	term->disptop = 0;	       /* return to main screen */
 	term->seen_disp_event = 1;
     }
@@ -258,20 +270,53 @@ void term_pwron(Terminal *term)
  * user has disabled mouse reporting, and abandon a print job if
  * the user has disabled printing.
  */
-void term_reconfig(Terminal *term)
+void term_reconfig(Terminal *term, Config *cfg)
 {
-    if (term->cfg->no_alt_screen)
+    /*
+     * 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_blink, reset_charclass;
+    int i;
+
+    reset_wrap = (term->cfg.wrap_mode != cfg->wrap_mode);
+    reset_decom = (term->cfg.dec_om != cfg->dec_om);
+    reset_bce = (term->cfg.bce != cfg->bce);
+    reset_blink = (term->cfg.blinktext != cfg->blinktext);
+    reset_charclass = 0;
+    for (i = 0; i < lenof(term->cfg.wordness); i++)
+	if (term->cfg.wordness[i] != cfg->wordness[i])
+	    reset_charclass = 1;
+
+    term->cfg = *cfg;		       /* STRUCTURE COPY */
+
+    if (reset_wrap)
+	term->alt_wrap = term->wrap = term->cfg.wrap_mode;
+    if (reset_decom)
+	term->alt_om = term->dec_om = term->cfg.dec_om;
+    if (reset_bce)
+	term->use_bce = term->cfg.bce;
+    if (reset_blink)
+	term->blink_is_real = term->cfg.blinktext;
+    if (reset_charclass)
+	for (i = 0; i < 256; i++)
+	    term->wordness[i] = term->cfg.wordness[i];
+
+    if (term->cfg.no_alt_screen)
 	swap_screen(term, 0, FALSE, FALSE);
-    if (term->cfg->no_mouse_rep) {
+    if (term->cfg.no_mouse_rep) {
 	term->xterm_mouse = 0;
 	set_raw_mouse_mode(term->frontend, 0);
     }
-    if (term->cfg->no_remote_charset) {
+    if (term->cfg.no_remote_charset) {
 	term->cset_attr[0] = term->cset_attr[1] = ATTR_ASCII;
 	term->sco_acs = term->alt_sco_acs = 0;
 	term->utf = 0;
     }
-    if (!*term->cfg->printer) {
+    if (!*term->cfg.printer) {
 	term_print_finish(term);
     }
 }
@@ -292,7 +337,8 @@ void term_clrsb(Terminal *term)
 /*
  * Initialise the terminal.
  */
-Terminal *term_init(Config *mycfg, void *frontend)
+Terminal *term_init(Config *mycfg, struct unicode_data *ucsdata,
+		    void *frontend)
 {
     Terminal *term;
 
@@ -302,12 +348,14 @@ Terminal *term_init(Config *mycfg, void *frontend)
      */
     term = smalloc(sizeof(Terminal));
     term->frontend = frontend;
-    term->cfg = mycfg;
+    term->ucsdata = ucsdata;
+    term->cfg = *mycfg;		       /* STRUCTURE COPY */
     term->logctx = NULL;
     term->compatibility_level = TM_PUTTY;
     strcpy(term->id_string, "\033[?6c");
     term->last_blink = term->last_tblink = 0;
     term->paste_buffer = NULL;
+    term->paste_len = 0;
     term->last_paste = 0;
     bufchain_init(&term->inbuf);
     bufchain_init(&term->printer_buf);
@@ -818,6 +866,44 @@ static void save_cursor(Terminal *term, int save)
 }
 
 /*
+ * 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)
+{
+    unsigned long *ldata;
+
+    /* Validate input coordinates, just in case. */
+    if (x == 0 || x > term->cols)
+	return;
+
+    ldata = lineptr(y);
+    if (x == term->cols) {
+	ldata[x] &= ~LATTR_WRAPPED2;
+    } else {
+	if ((ldata[x] & (CHAR_MASK | CSET_MASK)) == UCSWIDE) {
+	    ldata[x-1] = ldata[x] =
+		(ldata[x-1] &~ (CHAR_MASK | CSET_MASK)) | ATTR_ASCII | ' ';
+	}
+    }
+}
+
+/*
  * Erase a large portion of the screen: the whole screen, or the
  * whole line, or parts thereof.
  */
@@ -848,6 +934,8 @@ static void erase_lots(Terminal *term,
 	end = term->curs;
 	incpos(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. */
@@ -857,7 +945,7 @@ static void erase_lots(Terminal *term,
     ldata = lineptr(start.y);
     while (poslt(start, end)) {
 	if (start.x == term->cols && !erase_lattr)
-	    ldata[start.x] &= ~LATTR_WRAPPED;
+	    ldata[start.x] &= ~(LATTR_WRAPPED | LATTR_WRAPPED2);
 	else
 	    ldata[start.x] = term->erase_char;
 	if (incpos(start) && start.y < term->rows)
@@ -883,6 +971,9 @@ static void insch(Terminal *term, int 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 = lineptr(term->curs.y);
     if (dir < 0) {
 	memmove(ldata + term->curs.x, ldata + term->curs.x + n, m * TSIZE);
@@ -914,12 +1005,12 @@ static void toggle_mode(Terminal *term, int mode, int query, int state)
 		term->blink_is_real = FALSE;
 		term->vt52_bold = FALSE;
 	    } else {
-		term->blink_is_real = term->cfg->blinktext;
+		term->blink_is_real = term->cfg.blinktext;
 	    }
 	    break;
 	  case 3:		       /* 80/132 columns */
 	    deselect(term);
-	    if (!term->cfg->no_remote_resize)
+	    if (!term->cfg.no_remote_resize)
 		request_resize(term->frontend, state ? 132 : 80, term->rows);
 	    term->reset_132 = state;
 	    break;
@@ -974,7 +1065,7 @@ static void toggle_mode(Terminal *term, int mode, int query, int state)
 	  case 47:		       /* alternate screen */
 	    compatibility(OTHER);
 	    deselect(term);
-	    swap_screen(term, term->cfg->no_alt_screen ? 0 : state, FALSE, FALSE);
+	    swap_screen(term, term->cfg.no_alt_screen ? 0 : state, FALSE, FALSE);
 	    term->disptop = 0;
 	    break;
 	  case 1000:		       /* xterm mouse 1 */
@@ -988,7 +1079,7 @@ static void toggle_mode(Terminal *term, int mode, int query, int state)
 	  case 1047:                   /* alternate screen */
 	    compatibility(OTHER);
 	    deselect(term);
-	    swap_screen(term, term->cfg->no_alt_screen ? 0 : state, TRUE, TRUE);
+	    swap_screen(term, term->cfg.no_alt_screen ? 0 : state, TRUE, TRUE);
 	    term->disptop = 0;
 	    break;
 	  case 1048:                   /* save/restore cursor */
@@ -1001,7 +1092,7 @@ static void toggle_mode(Terminal *term, int mode, int query, int state)
 	    if (!state) term->seen_disp_event = TRUE;
 	    compatibility(OTHER);
 	    deselect(term);
-	    swap_screen(term, term->cfg->no_alt_screen ? 0 : state, TRUE, FALSE);
+	    swap_screen(term, term->cfg.no_alt_screen ? 0 : state, TRUE, FALSE);
 	    if (!state)
 		save_cursor(term, state);
 	    term->disptop = 0;
@@ -1040,14 +1131,14 @@ static void do_osc(Terminal *term)
 	switch (term->esc_args[0]) {
 	  case 0:
 	  case 1:
-	    if (!term->cfg->no_remote_wintitle)
+	    if (!term->cfg.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 (!term->cfg->no_remote_wintitle)
+	    if (!term->cfg.no_remote_wintitle)
 		set_title(term->frontend, term->osc_string);
 	    break;
 	}
@@ -1060,7 +1151,7 @@ static void do_osc(Terminal *term)
 static void term_print_setup(Terminal *term)
 {
     bufchain_clear(&term->printer_buf);
-    term->print_job = printer_start_job(term->cfg->printer);
+    term->print_job = printer_start_job(term->cfg.printer);
 }
 static void term_print_flush(Terminal *term)
 {
@@ -1134,7 +1225,7 @@ void term_out(Terminal *term)
 	     * Optionally log the session traffic to a file. Useful for
 	     * debugging and possibly also useful for actual logging.
 	     */
-	    if (term->cfg->logtype == LGTYP_DEBUG && term->logctx)
+	    if (term->cfg.logtype == LGTYP_DEBUG && term->logctx)
 		logtraffic(term->logctx, (unsigned char) c, LGTYP_DEBUG);
 	} else {
 	    c = unget;
@@ -1185,8 +1276,8 @@ void term_out(Terminal *term)
 		  case 0:
 		    if (c < 0x80) {
 			/* UTF-8 must be stateless so we ignore iso2022. */
-			if (unitab_ctrl[c] != 0xFF) 
-			     c = unitab_ctrl[c];
+			if (term->ucsdata->unitab_ctrl[c] != 0xFF) 
+			     c = term->ucsdata->unitab_ctrl[c];
 			else c = ((unsigned char)c) | ATTR_ASCII;
 			break;
 		    } else if ((c & 0xe0) == 0xc0) {
@@ -1272,7 +1363,7 @@ void term_out(Terminal *term)
 	    else if(term->sco_acs && 
 		    (c!='\033' && c!='\012' && c!='\015' && c!='\b'))
 	    {
-	       if (term->sco_acs == 2) c ^= 0x80;
+	       if (term->sco_acs == 2) c |= 0x80;
 	       c |= ATTR_SCOACS;
 	    } else {
 		switch (term->cset_attr[term->cset]) {
@@ -1283,8 +1374,8 @@ void term_out(Terminal *term)
 		     * the same encoding.
 		     */
 		  case ATTR_LINEDRW:
-		    if (unitab_ctrl[c] != 0xFF)
-			c = unitab_ctrl[c];
+		    if (term->ucsdata->unitab_ctrl[c] != 0xFF)
+			c = term->ucsdata->unitab_ctrl[c];
 		    else
 			c = ((unsigned char) c) | ATTR_LINEDRW;
 		    break;
@@ -1296,8 +1387,8 @@ void term_out(Terminal *term)
 			break;
 		    }
 		  /*FALLTHROUGH*/ case ATTR_ASCII:
-		    if (unitab_ctrl[c] != 0xFF)
-			c = unitab_ctrl[c];
+		    if (term->ucsdata->unitab_ctrl[c] != 0xFF)
+			c = term->ucsdata->unitab_ctrl[c];
 		    else
 			c = ((unsigned char) c) | ATTR_ASCII;
 		    break;
@@ -1322,7 +1413,7 @@ void term_out(Terminal *term)
 		term->curs.x--;
 	    term->wrapnext = FALSE;
 	    fix_cpos;
-	    if (!term->cfg->no_dbackspace)    /* destructive bksp might be disabled */
+	    if (!term->cfg.no_dbackspace)    /* destructive bksp might be disabled */
 		*term->cpos = (' ' | term->curr_attr | ATTR_ASCII);
 	} else
 	    /* Or normal C0 controls. */
@@ -1341,7 +1432,7 @@ void term_out(Terminal *term)
 		if (term->ldisc) {
 		    char abuf[256], *s, *d;
 		    int state = 0;
-		    for (s = term->cfg->answerback, d = abuf; *s; s++) {
+		    for (s = term->cfg.answerback, d = abuf; *s; s++) {
 			if (state) {
 			    if (*s >= 'a' && *s <= 'z')
 				*d++ = (*s - ('a' - 1));
@@ -1384,7 +1475,7 @@ void term_out(Terminal *term)
 		     * t seconds ago.
 		     */
 		    while (term->beephead &&
-			   term->beephead->ticks < ticks - term->cfg->bellovl_t) {
+			   term->beephead->ticks < ticks - term->cfg.bellovl_t) {
 			struct beeptime *tmp = term->beephead;
 			term->beephead = tmp->next;
 			sfree(tmp);
@@ -1393,16 +1484,16 @@ void term_out(Terminal *term)
 			term->nbeeps--;
 		    }
 
-		    if (term->cfg->bellovl && term->beep_overloaded &&
-			ticks - term->lastbeep >= (unsigned)term->cfg->bellovl_s) {
+		    if (term->cfg.bellovl && term->beep_overloaded &&
+			ticks - term->lastbeep >= (unsigned)term->cfg.bellovl_s) {
 			/*
 			 * If we're currently overloaded and the
 			 * last beep was more than s seconds ago,
 			 * leave overload mode.
 			 */
 			term->beep_overloaded = FALSE;
-		    } else if (term->cfg->bellovl && !term->beep_overloaded &&
-			       term->nbeeps >= term->cfg->bellovl_n) {
+		    } else if (term->cfg.bellovl && !term->beep_overloaded &&
+			       term->nbeeps >= term->cfg.bellovl_n) {
 			/*
 			 * Now, if we have n or more beeps
 			 * remaining in the queue, go into overload
@@ -1415,9 +1506,9 @@ void term_out(Terminal *term)
 		    /*
 		     * Perform an actual beep if we're not overloaded.
 		     */
-		    if (!term->cfg->bellovl || !term->beep_overloaded) {
-			beep(term->frontend, term->cfg->beep);
-			if (term->cfg->beep == BELL_VISUAL) {
+		    if (!term->cfg.bellovl || !term->beep_overloaded) {
+			beep(term->frontend, term->cfg.beep);
+			if (term->cfg.beep == BELL_VISUAL) {
 			    term->in_vbell = TRUE;
 			    term->vbell_startpoint = ticks;
 			    term_update(term);
@@ -1481,7 +1572,7 @@ void term_out(Terminal *term)
 		    scroll(term, term->marg_t, term->marg_b, 1, TRUE);
 		else if (term->curs.y < term->rows - 1)
 		    term->curs.y++;
-		if (term->cfg->lfhascr)
+		if (term->cfg.lfhascr)
 		    term->curs.x = 0;
 		fix_cpos;
 		term->wrapnext = FALSE;
@@ -1540,7 +1631,6 @@ void term_out(Terminal *term)
 		    term->logctx)
 		    logtraffic(term->logctx, (unsigned char) c, LGTYP_ASCII);
 		{
-		    extern int wcwidth(wchar_t ucs);
 		    int width = 0;
 		    if (DIRECT_CHAR(c))
 			width = 1;
@@ -1548,9 +1638,30 @@ void term_out(Terminal *term)
 			width = wcwidth((wchar_t) c);
 		    switch (width) {
 		      case 2:
-			*term->cpos++ = c | term->curr_attr;
-			if (++term->curs.x == term->cols) {
-			    *term->cpos |= LATTR_WRAPPED;
+			/*
+			 * 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) {
+			    *term->cpos++ = ATTR_ASCII | ' ' | term->curr_attr;
+			    *term->cpos |= LATTR_WRAPPED | LATTR_WRAPPED2;
 			    if (term->curs.y == term->marg_b)
 				scroll(term, term->marg_t, term->marg_b,
 				       1, TRUE);
@@ -1558,10 +1669,17 @@ void term_out(Terminal *term)
 				term->curs.y++;
 			    term->curs.x = 0;
 			    fix_cpos;
+			    /* 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);
 			}
+			*term->cpos++ = c | term->curr_attr;
 			*term->cpos++ = UCSWIDE | term->curr_attr;
+			term->curs.x++;
 			break;
 		      case 1:
+			check_boundary(term, term->curs.x, term->curs.y);
+			check_boundary(term, term->curs.x+1, term->curs.y);
 			*term->cpos++ = c | term->curr_attr;
 			break;
 		      default:
@@ -1681,7 +1799,7 @@ void term_out(Terminal *term)
 		    if (term->ldisc)   /* cause ldisc to notice changes */
 			ldisc_send(term->ldisc, NULL, 0, 0);
 		    if (term->reset_132) {
-			if (!term->cfg->no_remote_resize)
+			if (!term->cfg.no_remote_resize)
 			    request_resize(term->frontend, 80, term->rows);
 			term->reset_132 = 0;
 		    }
@@ -1746,55 +1864,55 @@ void term_out(Terminal *term)
 
 		  case ANSI('A', '('):
 		    compatibility(VT100);
-		    if (!term->cfg->no_remote_charset)
+		    if (!term->cfg.no_remote_charset)
 			term->cset_attr[0] = ATTR_GBCHR;
 		    break;
 		  case ANSI('B', '('):
 		    compatibility(VT100);
-		    if (!term->cfg->no_remote_charset)
+		    if (!term->cfg.no_remote_charset)
 			term->cset_attr[0] = ATTR_ASCII;
 		    break;
 		  case ANSI('0', '('):
 		    compatibility(VT100);
-		    if (!term->cfg->no_remote_charset)
+		    if (!term->cfg.no_remote_charset)
 			term->cset_attr[0] = ATTR_LINEDRW;
 		    break;
 		  case ANSI('U', '('): 
 		    compatibility(OTHER);
-		    if (!term->cfg->no_remote_charset)
+		    if (!term->cfg.no_remote_charset)
 			term->cset_attr[0] = ATTR_SCOACS; 
 		    break;
 
 		  case ANSI('A', ')'):
 		    compatibility(VT100);
-		    if (!term->cfg->no_remote_charset)
+		    if (!term->cfg.no_remote_charset)
 			term->cset_attr[1] = ATTR_GBCHR;
 		    break;
 		  case ANSI('B', ')'):
 		    compatibility(VT100);
-		    if (!term->cfg->no_remote_charset)
+		    if (!term->cfg.no_remote_charset)
 			term->cset_attr[1] = ATTR_ASCII;
 		    break;
 		  case ANSI('0', ')'):
 		    compatibility(VT100);
-		    if (!term->cfg->no_remote_charset)
+		    if (!term->cfg.no_remote_charset)
 			term->cset_attr[1] = ATTR_LINEDRW;
 		    break;
 		  case ANSI('U', ')'): 
 		    compatibility(OTHER);
-		    if (!term->cfg->no_remote_charset)
+		    if (!term->cfg.no_remote_charset)
 			term->cset_attr[1] = ATTR_SCOACS; 
 		    break;
 
 		  case ANSI('8', '%'):	/* Old Linux code */
 		  case ANSI('G', '%'):
 		    compatibility(OTHER);
-		    if (!term->cfg->no_remote_charset)
+		    if (!term->cfg.no_remote_charset)
 			term->utf = 1;
 		    break;
 		  case ANSI('@', '%'):
 		    compatibility(OTHER);
-		    if (!term->cfg->no_remote_charset)
+		    if (!term->cfg.no_remote_charset)
 			term->utf = 0;
 		    break;
 		}
@@ -1974,7 +2092,7 @@ void term_out(Terminal *term)
 			compatibility(VT100);
 			{
 			    if (term->esc_nargs != 1) break;
-			    if (term->esc_args[0] == 5 && *term->cfg->printer) {
+			    if (term->esc_args[0] == 5 && *term->cfg.printer) {
 				term->printing = TRUE;
 				term->only_printing = !term->esc_query;
 				term->print_state = 0;
@@ -2096,15 +2214,15 @@ void term_out(Terminal *term)
 				    break;
 				  case 10:      /* SCO acs off */
 				    compatibility(SCOANSI);
-				    if (term->cfg->no_remote_charset) break;
+				    if (term->cfg.no_remote_charset) break;
 				    term->sco_acs = 0; break;
 				  case 11:      /* SCO acs on */
 				    compatibility(SCOANSI);
-				    if (term->cfg->no_remote_charset) break;
+				    if (term->cfg.no_remote_charset) break;
 				    term->sco_acs = 1; break;
-				  case 12:      /* SCO acs on flipped */
+				  case 12:      /* SCO acs on, |0x80 */
 				    compatibility(SCOANSI);
-				    if (term->cfg->no_remote_charset) break;
+				    if (term->cfg.no_remote_charset) break;
 				    term->sco_acs = 2; break;
 				  case 22:	/* disable bold */
 				    compatibility2(OTHER, VT220);
@@ -2183,7 +2301,7 @@ void term_out(Terminal *term)
 			    && (term->esc_args[0] < 1 ||
 				term->esc_args[0] >= 24)) {
 			    compatibility(VT340TEXT);
-			    if (!term->cfg->no_remote_resize)
+			    if (!term->cfg.no_remote_resize)
 				request_resize(term->frontend, term->cols,
 					       def(term->esc_args[0], 24));
 			    deselect(term);
@@ -2203,7 +2321,7 @@ void term_out(Terminal *term)
 				break;
 			      case 3:
 				if (term->esc_nargs >= 3) {
-				    if (!term->cfg->no_remote_resize)
+				    if (!term->cfg.no_remote_resize)
 					move_window(term->frontend,
 						    def(term->esc_args[1], 0),
 						    def(term->esc_args[2], 0));
@@ -2228,10 +2346,10 @@ void term_out(Terminal *term)
 				break;
 			      case 8:
 				if (term->esc_nargs >= 3) {
-				    if (!term->cfg->no_remote_resize)
+				    if (!term->cfg.no_remote_resize)
 					request_resize(term->frontend,
-						       def(term->esc_args[2], term->cfg->width),
-						       def(term->esc_args[1], term->cfg->height));
+						       def(term->esc_args[2], term->cfg.width),
+						       def(term->esc_args[1], term->cfg.height));
 				}
 				break;
 			      case 9:
@@ -2329,10 +2447,10 @@ void term_out(Terminal *term)
 			 */
 			compatibility(VT420);
 			if (term->esc_nargs == 1 && term->esc_args[0] > 0) {
-			    if (!term->cfg->no_remote_resize)
+			    if (!term->cfg.no_remote_resize)
 				request_resize(term->frontend, term->cols,
 					       def(term->esc_args[0],
-						   term->cfg->height));
+						   term->cfg.height));
 			    deselect(term);
 			}
 			break;
@@ -2343,10 +2461,10 @@ void term_out(Terminal *term)
 			 */
 			compatibility(VT340TEXT);
 			if (term->esc_nargs <= 1) {
-			    if (!term->cfg->no_remote_resize)
+			    if (!term->cfg.no_remote_resize)
 				request_resize(term->frontend,
 					       def(term->esc_args[0],
-						   term->cfg->width), term->rows);
+						   term->cfg.width), term->rows);
 			    deselect(term);
 			}
 			break;
@@ -2361,6 +2479,8 @@ void term_out(Terminal *term)
 				n = term->cols - term->curs.x;
 			    cursplus = term->curs;
 			    cursplus.x += n;
+			    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++ = term->erase_char;
@@ -2478,7 +2598,7 @@ void term_out(Terminal *term)
 			 * Well we should do a soft reset at this point ...
 			 */
 			if (!has_compat(VT420) && has_compat(VT100)) {
-			    if (!term->cfg->no_remote_resize) {
+			    if (!term->cfg.no_remote_resize) {
 				if (term->reset_132)
 				    request_resize(132, 24);
 				else
@@ -2714,7 +2834,7 @@ void term_out(Terminal *term)
 		     *     emulation.
 		     */
 		    term->vt52_mode = FALSE;
-		    term->blink_is_real = term->cfg->blinktext;
+		    term->blink_is_real = term->cfg.blinktext;
 		    break;
 #if 0
 		  case '^':
@@ -2899,7 +3019,7 @@ static int linecmp(Terminal *term, unsigned long *a, unsigned long *b)
  */
 static void do_paint(Terminal *term, Context ctx, int may_optimise)
 {
-    int i, j, our_curs_y;
+    int i, j, our_curs_y, our_curs_x;
     unsigned long rv, cursor;
     pos scrpos;
     char ch[1024];
@@ -2927,7 +3047,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
     /* Has the cursor position or type changed ? */
     if (term->cursor_on) {
 	if (term->has_focus) {
-	    if (term->blinker || !term->cfg->blink_cur)
+	    if (term->blinker || !term->cfg.blink_cur)
 		cursor = TATTR_ACTCURS;
 	    else
 		cursor = 0;
@@ -2938,13 +3058,27 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
     } else
 	cursor = 0;
     our_curs_y = term->curs.y - term->disptop;
+    {
+	/*
+	 * Adjust the cursor position 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.
+	 */
+	unsigned long *ldata = lineptr(term->curs.y);
+	our_curs_x = term->curs.x;
+	if (our_curs_x > 0 &&
+	    (ldata[our_curs_x] & (CHAR_MASK | CSET_MASK)) == UCSWIDE)
+	    our_curs_x--;
+    }
 
     if (term->dispcurs && (term->curstype != cursor ||
 			   term->dispcurs !=
 			   term->disptext + our_curs_y * (term->cols + 1) +
-			   term->curs.x)) {
+			   our_curs_x)) {
 	if (term->dispcurs > term->disptext && 
-		(*term->dispcurs & (CHAR_MASK | CSET_MASK)) == UCSWIDE)
+	    (*term->dispcurs & (CHAR_MASK | CSET_MASK)) == UCSWIDE)
 	    term->dispcurs[-1] |= ATTR_INVALID;
 	if ( (term->dispcurs[1] & (CHAR_MASK | CSET_MASK)) == UCSWIDE)
 	    term->dispcurs[1] |= ATTR_INVALID;
@@ -2983,13 +3117,13 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 	    tattr = (*d & (ATTR_MASK ^ CSET_MASK));
 	    switch (tchar & CSET_MASK) {
 	      case ATTR_ASCII:
-		tchar = unitab_line[tchar & 0xFF];
+		tchar = term->ucsdata->unitab_line[tchar & 0xFF];
 		break;
 	      case ATTR_LINEDRW:
-		tchar = unitab_xterm[tchar & 0xFF];
+		tchar = term->ucsdata->unitab_xterm[tchar & 0xFF];
 		break;
 	      case ATTR_SCOACS:  
-		tchar = unitab_scoacs[tchar&0xFF]; 
+		tchar = term->ucsdata->unitab_scoacs[tchar&0xFF]; 
 		break;
 	    }
 	    tattr |= (tchar & CSET_MASK);
@@ -3032,7 +3166,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 		tattr |= ATTR_NARROW;
 
 	    /* Cursor here ? Save the 'background' */
-	    if (i == our_curs_y && j == term->curs.x) {
+	    if (i == our_curs_y && j == our_curs_x) {
 		cursor_background = tattr | tchar;
 		term->dispcurs = term->disptext + idx;
 	    }
@@ -3047,7 +3181,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 	    if ((attr & CSET_MASK) == 0x2300 && tchar >= 0xBA
 		&& tchar <= 0xBD) break_run = TRUE;
 
-	    if (!dbcs_screenfont && !dirty_line) {
+	    if (!term->ucsdata->dbcs_screenfont && !dirty_line) {
 		if ((tchar | tattr) == term->disptext[idx])
 		    break_run = TRUE;
 		else if (!dirty_run && ccount == 1)
@@ -3062,7 +3196,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 		start = j;
 		ccount = 0;
 		attr = tattr;
-		if (dbcs_screenfont)
+		if (term->ucsdata->dbcs_screenfont)
 		    last_run_dirty = dirty_run;
 		dirty_run = dirty_line;
 	    }
@@ -3077,11 +3211,12 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 		if (++j < term->cols) {
 		    idx++;
 		    d++;
-		    /* Cursor is here ? Ouch! */
-		    if (i == our_curs_y && j == term->curs.x) {
-			cursor_background = *d;
-			term->dispcurs = term->disptext + idx;
-		    }
+		    /*
+		     * 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 (term->disptext[idx] != *d)
 			dirty_run = TRUE;
 		    term->disptext[idx] = *d;
@@ -3097,7 +3232,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 	if (i == our_curs_y && (term->curstype != cursor || updated_line)) {
 	    ch[0] = (char) (cursor_background & CHAR_MASK);
 	    attr = (cursor_background & ATTR_MASK) | cursor;
-	    do_cursor(ctx, term->curs.x, i, ch, 1, attr, lattr);
+	    do_cursor(ctx, our_curs_x, i, ch, 1, attr, lattr);
 	    term->curstype = cursor;
 	}
     }
@@ -3246,6 +3381,9 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect)
 		decpos(nlpos);
 	    if (poslt(nlpos, bottom))
 		nl = TRUE;
+	} else if (ldata[term->cols] & LATTR_WRAPPED2) {
+	    /* Ignore the last char on the line in a WRAPPED2 line. */
+	    decpos(nlpos);
 	}
 
 	/*
@@ -3277,23 +3415,23 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect)
 
 	    switch (uc & CSET_MASK) {
 	      case ATTR_LINEDRW:
-		if (!term->cfg->rawcnp) {
-		    uc = unitab_xterm[uc & 0xFF];
+		if (!term->cfg.rawcnp) {
+		    uc = term->ucsdata->unitab_xterm[uc & 0xFF];
 		    break;
 		}
 	      case ATTR_ASCII:
-		uc = unitab_line[uc & 0xFF];
+		uc = term->ucsdata->unitab_line[uc & 0xFF];
 		break;
 	      case ATTR_SCOACS:  
-		uc = unitab_scoacs[uc&0xFF]; 
+		uc = term->ucsdata->unitab_scoacs[uc&0xFF]; 
 		break;
 	    }
 	    switch (uc & CSET_MASK) {
 	      case ATTR_ACP:
-		uc = unitab_font[uc & 0xFF];
+		uc = term->ucsdata->unitab_font[uc & 0xFF];
 		break;
 	      case ATTR_OEMCP:
-		uc = unitab_oemcp[uc & 0xFF];
+		uc = term->ucsdata->unitab_oemcp[uc & 0xFF];
 		break;
 	    }
 
@@ -3307,14 +3445,14 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect)
 		    char buf[4];
 		    WCHAR wbuf[4];
 		    int rv;
-		    if (is_dbcs_leadbyte(font_codepage, (BYTE) c)) {
+		    if (is_dbcs_leadbyte(term->ucsdata->font_codepage, (BYTE) c)) {
 			buf[0] = c;
 			buf[1] = (char) (0xFF & ldata[top.x + 1]);
-			rv = mb_to_wc(font_codepage, 0, buf, 2, wbuf, 4);
+			rv = mb_to_wc(term->ucsdata->font_codepage, 0, buf, 2, wbuf, 4);
 			top.x++;
 		    } else {
 			buf[0] = c;
-			rv = mb_to_wc(font_codepage, 0, buf, 1, wbuf, 4);
+			rv = mb_to_wc(term->ucsdata->font_codepage, 0, buf, 1, wbuf, 4);
 		    }
 
 		    if (rv > 0) {
@@ -3444,28 +3582,29 @@ static int wordtype(Terminal *term, int uc)
 
     switch (uc & CSET_MASK) {
       case ATTR_LINEDRW:
-	uc = unitab_xterm[uc & 0xFF];
+	uc = term->ucsdata->unitab_xterm[uc & 0xFF];
 	break;
       case ATTR_ASCII:
-	uc = unitab_line[uc & 0xFF];
+	uc = term->ucsdata->unitab_line[uc & 0xFF];
 	break;
       case ATTR_SCOACS:  
-	uc = unitab_scoacs[uc&0xFF]; 
+	uc = term->ucsdata->unitab_scoacs[uc&0xFF]; 
 	break;
     }
     switch (uc & CSET_MASK) {
       case ATTR_ACP:
-	uc = unitab_font[uc & 0xFF];
+	uc = term->ucsdata->unitab_font[uc & 0xFF];
 	break;
       case ATTR_OEMCP:
-	uc = unitab_oemcp[uc & 0xFF];
+	uc = term->ucsdata->unitab_oemcp[uc & 0xFF];
 	break;
     }
 
     /* For DBCS font's I can't do anything usefull. 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)
@@ -3511,11 +3650,13 @@ static pos sel_spread_half(Terminal *term, pos p, int dir)
 	 * In this mode, the units are maximal runs of characters
 	 * whose `wordness' has the same value.
 	 */
-	wvalue = wordtype(term, ldata[p.x]);
+	wvalue = wordtype(term, UCSGET(ldata, p.x));
 	if (dir == +1) {
 	    while (1) {
-		if (p.x < term->cols-1) {
-		    if (wordtype(term, ldata[p.x + 1]) == wvalue)
+		int maxcols = (ldata[term->cols] & LATTR_WRAPPED2 ?
+			       term->cols-1 : term->cols);
+		if (p.x < maxcols-1) {
+		    if (wordtype(term, UCSGET(ldata, p.x + 1)) == wvalue)
 			p.x++;
 		    else
 			break;
@@ -3523,7 +3664,7 @@ static pos sel_spread_half(Terminal *term, pos p, int dir)
 		    if (ldata[term->cols] & LATTR_WRAPPED) {
 			unsigned long *ldata2;
 			ldata2 = lineptr(p.y+1);
-			if (wordtype(term, ldata2[0]) == wvalue) {
+			if (wordtype(term, UCSGET(ldata2, 0)) == wvalue) {
 			    p.x = 0;
 			    p.y++;
 			    ldata = ldata2;
@@ -3536,20 +3677,26 @@ static pos sel_spread_half(Terminal *term, pos p, int dir)
 	} else {
 	    while (1) {
 		if (p.x > 0) {
-		    if (wordtype(term, ldata[p.x - 1]) == wvalue)
+		    if (wordtype(term, UCSGET(ldata, p.x - 1)) == wvalue)
 			p.x--;
 		    else
 			break;
 		} else {
 		    unsigned long *ldata2;
+		    int maxcols;
 		    if (p.y <= topy)
 			break;
 		    ldata2 = lineptr(p.y-1);
-		    if ((ldata2[term->cols] & LATTR_WRAPPED) &&
-			wordtype(term, ldata2[term->cols-1]) == wvalue) {
-			p.x = term->cols-1;
-			p.y--;
-			ldata = ldata2;
+		    maxcols = (ldata2[term->cols] & LATTR_WRAPPED2 ?
+			      term->cols-1 : term->cols);
+		    if (ldata2[term->cols] & LATTR_WRAPPED) {
+			if (wordtype(term, UCSGET(ldata2, maxcols-1))
+			    == wvalue) {
+			    p.x = maxcols-1;
+			    p.y--;
+			    ldata = ldata2;
+			} else
+			    break;
 		    } else
 			break;
 		}
@@ -3633,8 +3780,8 @@ void term_mouse(Terminal *term, Mouse_Button b, Mouse_Action a, int x, int y,
     pos selpoint;
     unsigned long *ldata;
     int raw_mouse = (term->xterm_mouse &&
-		     !term->cfg->no_mouse_rep &&
-		     !(term->cfg->mouse_override && shift));
+		     !term->cfg.no_mouse_rep &&
+		     !(term->cfg.mouse_override && shift));
     int default_seltype;
 
     if (y < 0) {
@@ -3723,7 +3870,7 @@ void term_mouse(Terminal *term, Mouse_Button b, Mouse_Action a, int x, int y,
      * Set the selection type (rectangular or normal) at the start
      * of a selection attempt, from the state of Alt.
      */
-    if (!alt ^ !term->cfg->rect_select)
+    if (!alt ^ !term->cfg.rect_select)
 	default_seltype = RECTANGULAR;
     else
 	default_seltype = LEXICOGRAPHIC;