X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2102eb8a3a40dbf18235c73cf23f018f411db9bc..b7a189f38294c745ae4ea6efb55891c8196e275b:/terminal.c

diff --git a/terminal.c b/terminal.c
index dc2392ef..1446fa21 100644
--- a/terminal.c
+++ b/terminal.c
@@ -68,6 +68,9 @@ static void swap_screen(Terminal *, int, int, int);
 static void update_sbar(Terminal *);
 static void deselect(Terminal *);
 static void term_print_finish(Terminal *);
+#ifdef OPTIMISE_SCROLL
+static void scroll_display(Terminal *, int, int, int);
+#endif /* OPTIMISE_SCROLL */
 
 /*
  * Resize a line to make it `cols' columns wide.
@@ -147,10 +150,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 = 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 = 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;
@@ -162,17 +165,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 = cfg.app_cursor;
-    term->app_keypad_keys = cfg.app_keypad;
-    term->use_bce = cfg.bce;
-    term->blink_is_real = 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] = cfg.wordness[i];
+	    term->wordness[i] = term->cfg->wordness[i];
     }
     if (term->screen) {
 	swap_screen(term, 1, FALSE, FALSE);
@@ -191,7 +194,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 && 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;
@@ -229,7 +232,7 @@ void term_seen_key_event(Terminal *term)
     /*
      * Reset the scrollback on keypress, if we're doing that.
      */
-    if (cfg.scroll_on_key) {
+    if (term->cfg->scroll_on_key) {
 	term->disptop = 0;	       /* return to main screen */
 	term->seen_disp_event = 1;
     }
@@ -257,18 +260,18 @@ void term_pwron(Terminal *term)
  */
 void term_reconfig(Terminal *term)
 {
-    if (cfg.no_alt_screen)
+    if (term->cfg->no_alt_screen)
 	swap_screen(term, 0, FALSE, FALSE);
-    if (cfg.no_mouse_rep) {
+    if (term->cfg->no_mouse_rep) {
 	term->xterm_mouse = 0;
 	set_raw_mouse_mode(term->frontend, 0);
     }
-    if (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 (!*cfg.printer) {
+    if (!*term->cfg->printer) {
 	term_print_finish(term);
     }
 }
@@ -289,7 +292,7 @@ void term_clrsb(Terminal *term)
 /*
  * Initialise the terminal.
  */
-Terminal *term_init(void *frontend)
+Terminal *term_init(Config *mycfg, void *frontend)
 {
     Terminal *term;
 
@@ -299,6 +302,7 @@ Terminal *term_init(void *frontend)
      */
     term = smalloc(sizeof(Terminal));
     term->frontend = frontend;
+    term->cfg = mycfg;
     term->logctx = NULL;
     term->compatibility_level = TM_PUTTY;
     strcpy(term->id_string, "\033[?6c");
@@ -332,6 +336,7 @@ Terminal *term_init(void *frontend)
     term->nbeeps = 0;
     term->lastbeep = FALSE;
     term->beep_overloaded = FALSE;
+    term->attr_mask = 0xffffffff;
     term->resize_fn = NULL;
     term->resize_ctx = NULL;
 
@@ -588,11 +593,13 @@ static void check_selection(Terminal *term, pos from, pos to)
 static void scroll(Terminal *term, int topline, int botline, int lines, int sb)
 {
     unsigned long *line, *line2;
-    int i, seltop;
+    int i, seltop, olddisptop, shift;
 
     if (topline != 0 || term->alt_which != 0)
 	sb = FALSE;
 
+    olddisptop = term->disptop;
+    shift = lines;
     if (lines < 0) {
 	while (lines < 0) {
 	    line = delpos234(term->screen, botline);
@@ -701,8 +708,44 @@ static void scroll(Terminal *term, int topline, int botline, int lines, int sb)
 	    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
+/*
+ * Scroll the physical display, and our conception of it in disptext.
+ */
+static void scroll_display(Terminal *term, int topline, int botline, int lines)
+{
+    unsigned long *start, *end;
+    int distance, size, i;
+
+    start = term->disptext + topline * (term->cols + 1);
+    end = term->disptext + (botline + 1) * (term->cols + 1);
+    distance = (lines > 0 ? lines : -lines) * (term->cols + 1);
+    size = end - start - distance;
+    if (lines > 0) {
+	memmove(start, start + distance, size * TSIZE);
+	if (term->dispcurs >= start + distance &&
+	    term->dispcurs <= start + distance + size)
+	    term->dispcurs -= distance;
+	for (i = 0; i < distance; i++)
+	    (start + size)[i] |= ATTR_INVALID;
+    } else {
+	memmove(start + distance, start, size * TSIZE);
+	if (term->dispcurs >= start && term->dispcurs <= start + size)
+	    term->dispcurs += distance;
+	for (i = 0; i < distance; i++)
+	    start[i] |= ATTR_INVALID;
+    }
+    do_scroll(term->frontend, topline, botline, lines);
+}
+#endif /* OPTIMISE_SCROLL */
+
 /*
  * Move the cursor to a given position, clipping at boundaries. We
  * may or may not want to clip at the scroll margin: marg_clip is 0
@@ -871,12 +914,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 = cfg.blinktext;
+		term->blink_is_real = term->cfg->blinktext;
 	    }
 	    break;
 	  case 3:		       /* 80/132 columns */
 	    deselect(term);
-	    if (!cfg.no_remote_resize)
+	    if (!term->cfg->no_remote_resize)
 		request_resize(term->frontend, state ? 132 : 80, term->rows);
 	    term->reset_132 = state;
 	    break;
@@ -931,7 +974,7 @@ static void toggle_mode(Terminal *term, int mode, int query, int state)
 	  case 47:		       /* alternate screen */
 	    compatibility(OTHER);
 	    deselect(term);
-	    swap_screen(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 */
@@ -945,7 +988,7 @@ static void toggle_mode(Terminal *term, int mode, int query, int state)
 	  case 1047:                   /* alternate screen */
 	    compatibility(OTHER);
 	    deselect(term);
-	    swap_screen(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 */
@@ -958,7 +1001,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, 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;
@@ -997,14 +1040,14 @@ static void do_osc(Terminal *term)
 	switch (term->esc_args[0]) {
 	  case 0:
 	  case 1:
-	    if (!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 (!cfg.no_remote_wintitle)
+	    if (!term->cfg->no_remote_wintitle)
 		set_title(term->frontend, term->osc_string);
 	    break;
 	}
@@ -1017,7 +1060,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(cfg.printer);
+    term->print_job = printer_start_job(term->cfg->printer);
 }
 static void term_print_flush(Terminal *term)
 {
@@ -1091,7 +1134,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 (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;
@@ -1227,7 +1270,7 @@ void term_out(Terminal *term)
 	    }
 	    /* Are we in the nasty ACS mode? Note: no sco in utf mode. */
 	    else if(term->sco_acs && 
-		    (c!='\033' && c!='\n' && c!='\r' && c!='\b'))
+		    (c!='\033' && c!='\012' && c!='\015' && c!='\b'))
 	    {
 	       if (term->sco_acs == 2) c ^= 0x80;
 	       c |= ATTR_SCOACS;
@@ -1279,7 +1322,7 @@ void term_out(Terminal *term)
 		term->curs.x--;
 	    term->wrapnext = FALSE;
 	    fix_cpos;
-	    if (!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. */
@@ -1298,7 +1341,7 @@ void term_out(Terminal *term)
 		if (term->ldisc) {
 		    char abuf[256], *s, *d;
 		    int state = 0;
-		    for (s = 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));
@@ -1341,7 +1384,7 @@ void term_out(Terminal *term)
 		     * t seconds ago.
 		     */
 		    while (term->beephead &&
-			   term->beephead->ticks < ticks - cfg.bellovl_t) {
+			   term->beephead->ticks < ticks - term->cfg->bellovl_t) {
 			struct beeptime *tmp = term->beephead;
 			term->beephead = tmp->next;
 			sfree(tmp);
@@ -1350,16 +1393,16 @@ void term_out(Terminal *term)
 			term->nbeeps--;
 		    }
 
-		    if (cfg.bellovl && term->beep_overloaded &&
-			ticks - term->lastbeep >= (unsigned)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 (cfg.bellovl && !term->beep_overloaded &&
-			       term->nbeeps >= 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
@@ -1372,9 +1415,9 @@ void term_out(Terminal *term)
 		    /*
 		     * Perform an actual beep if we're not overloaded.
 		     */
-		    if (!cfg.bellovl || !term->beep_overloaded) {
-			beep(term->frontend, cfg.beep);
-			if (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);
@@ -1413,7 +1456,7 @@ void term_out(Terminal *term)
 		    term->esc_query = FALSE;
 		}
 		break;
-	      case '\r':
+	      case '\015':
 		term->curs.x = 0;
 		term->wrapnext = FALSE;
 		fix_cpos;
@@ -1433,12 +1476,12 @@ void term_out(Terminal *term)
 		}
 	      case '\013':
 		compatibility(VT100);
-	      case '\n':
+	      case '\012':
 		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 (cfg.lfhascr)
+		if (term->cfg->lfhascr)
 		    term->curs.x = 0;
 		fix_cpos;
 		term->wrapnext = FALSE;
@@ -1638,7 +1681,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 (!cfg.no_remote_resize)
+			if (!term->cfg->no_remote_resize)
 			    request_resize(term->frontend, 80, term->rows);
 			term->reset_132 = 0;
 		    }
@@ -1703,55 +1746,55 @@ void term_out(Terminal *term)
 
 		  case ANSI('A', '('):
 		    compatibility(VT100);
-		    if (!cfg.no_remote_charset)
+		    if (!term->cfg->no_remote_charset)
 			term->cset_attr[0] = ATTR_GBCHR;
 		    break;
 		  case ANSI('B', '('):
 		    compatibility(VT100);
-		    if (!cfg.no_remote_charset)
+		    if (!term->cfg->no_remote_charset)
 			term->cset_attr[0] = ATTR_ASCII;
 		    break;
 		  case ANSI('0', '('):
 		    compatibility(VT100);
-		    if (!cfg.no_remote_charset)
+		    if (!term->cfg->no_remote_charset)
 			term->cset_attr[0] = ATTR_LINEDRW;
 		    break;
 		  case ANSI('U', '('): 
 		    compatibility(OTHER);
-		    if (!cfg.no_remote_charset)
+		    if (!term->cfg->no_remote_charset)
 			term->cset_attr[0] = ATTR_SCOACS; 
 		    break;
 
 		  case ANSI('A', ')'):
 		    compatibility(VT100);
-		    if (!cfg.no_remote_charset)
+		    if (!term->cfg->no_remote_charset)
 			term->cset_attr[1] = ATTR_GBCHR;
 		    break;
 		  case ANSI('B', ')'):
 		    compatibility(VT100);
-		    if (!cfg.no_remote_charset)
+		    if (!term->cfg->no_remote_charset)
 			term->cset_attr[1] = ATTR_ASCII;
 		    break;
 		  case ANSI('0', ')'):
 		    compatibility(VT100);
-		    if (!cfg.no_remote_charset)
+		    if (!term->cfg->no_remote_charset)
 			term->cset_attr[1] = ATTR_LINEDRW;
 		    break;
 		  case ANSI('U', ')'): 
 		    compatibility(OTHER);
-		    if (!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 (!cfg.no_remote_charset)
+		    if (!term->cfg->no_remote_charset)
 			term->utf = 1;
 		    break;
 		  case ANSI('@', '%'):
 		    compatibility(OTHER);
-		    if (!cfg.no_remote_charset)
+		    if (!term->cfg->no_remote_charset)
 			term->utf = 0;
 		    break;
 		}
@@ -1931,7 +1974,7 @@ void term_out(Terminal *term)
 			compatibility(VT100);
 			{
 			    if (term->esc_nargs != 1) break;
-			    if (term->esc_args[0] == 5 && *cfg.printer) {
+			    if (term->esc_args[0] == 5 && *term->cfg->printer) {
 				term->printing = TRUE;
 				term->only_printing = !term->esc_query;
 				term->print_state = 0;
@@ -2053,15 +2096,15 @@ void term_out(Terminal *term)
 				    break;
 				  case 10:      /* SCO acs off */
 				    compatibility(SCOANSI);
-				    if (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 (cfg.no_remote_charset) break;
+				    if (term->cfg->no_remote_charset) break;
 				    term->sco_acs = 1; break;
 				  case 12:      /* SCO acs on flipped */
 				    compatibility(SCOANSI);
-				    if (cfg.no_remote_charset) break;
+				    if (term->cfg->no_remote_charset) break;
 				    term->sco_acs = 2; break;
 				  case 22:	/* disable bold */
 				    compatibility2(OTHER, VT220);
@@ -2140,7 +2183,7 @@ void term_out(Terminal *term)
 			    && (term->esc_args[0] < 1 ||
 				term->esc_args[0] >= 24)) {
 			    compatibility(VT340TEXT);
-			    if (!cfg.no_remote_resize)
+			    if (!term->cfg->no_remote_resize)
 				request_resize(term->frontend, term->cols,
 					       def(term->esc_args[0], 24));
 			    deselect(term);
@@ -2160,7 +2203,7 @@ void term_out(Terminal *term)
 				break;
 			      case 3:
 				if (term->esc_nargs >= 3) {
-				    if (!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));
@@ -2185,10 +2228,10 @@ void term_out(Terminal *term)
 				break;
 			      case 8:
 				if (term->esc_nargs >= 3) {
-				    if (!cfg.no_remote_resize)
+				    if (!term->cfg->no_remote_resize)
 					request_resize(term->frontend,
-						       def(term->esc_args[2], cfg.width),
-						       def(term->esc_args[1], cfg.height));
+						       def(term->esc_args[2], term->cfg->width),
+						       def(term->esc_args[1], term->cfg->height));
 				}
 				break;
 			      case 9:
@@ -2286,10 +2329,10 @@ void term_out(Terminal *term)
 			 */
 			compatibility(VT420);
 			if (term->esc_nargs == 1 && term->esc_args[0] > 0) {
-			    if (!cfg.no_remote_resize)
+			    if (!term->cfg->no_remote_resize)
 				request_resize(term->frontend, term->cols,
 					       def(term->esc_args[0],
-						   cfg.height));
+						   term->cfg->height));
 			    deselect(term);
 			}
 			break;
@@ -2300,10 +2343,10 @@ void term_out(Terminal *term)
 			 */
 			compatibility(VT340TEXT);
 			if (term->esc_nargs <= 1) {
-			    if (!cfg.no_remote_resize)
+			    if (!term->cfg->no_remote_resize)
 				request_resize(term->frontend,
 					       def(term->esc_args[0],
-						   cfg.width), term->rows);
+						   term->cfg->width), term->rows);
 			    deselect(term);
 			}
 			break;
@@ -2435,7 +2478,7 @@ void term_out(Terminal *term)
 			 * Well we should do a soft reset at this point ...
 			 */
 			if (!has_compat(VT420) && has_compat(VT100)) {
-			    if (!cfg.no_remote_resize) {
+			    if (!term->cfg->no_remote_resize) {
 				if (term->reset_132)
 				    request_resize(132, 24);
 				else
@@ -2500,7 +2543,7 @@ void term_out(Terminal *term)
 		 *
 		 * -- RDB
 		 */
-		if (c == '\n' || c == '\r') {
+		if (c == '\012' || c == '\015') {
 		    term->termstate = TOPLEVEL;
 		} else if (c == 0234 || c == '\007') {
 		    /*
@@ -2671,7 +2714,7 @@ void term_out(Terminal *term)
 		     *     emulation.
 		     */
 		    term->vt52_mode = FALSE;
-		    term->blink_is_real = cfg.blinktext;
+		    term->blink_is_real = term->cfg->blinktext;
 		    break;
 #if 0
 		  case '^':
@@ -2884,7 +2927,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 || !cfg.blink_cur)
+	    if (term->blinker || !term->cfg->blink_cur)
 		cursor = TATTR_ACTCURS;
 	    else
 		cursor = 0;
@@ -2997,7 +3040,8 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 	    if ((term->disptext[idx] ^ tattr) & ATTR_WIDE)
 		dirty_line = TRUE;
 
-	    break_run = (tattr != attr || j - start >= sizeof(ch));
+	    break_run = (((tattr ^ attr) & term->attr_mask) ||
+		j - start >= sizeof(ch));
 
 	    /* Special hack for VT100 Linedraw glyphs */
 	    if ((attr & CSET_MASK) == 0x2300 && tchar >= 0xBA
@@ -3143,6 +3187,10 @@ void term_paint(Terminal *term, Context ctx,
 void term_scroll(Terminal *term, int rel, int where)
 {
     int sbtop = -count234(term->scrollback);
+#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)
@@ -3150,6 +3198,11 @@ void term_scroll(Terminal *term, int rel, int where)
     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);
 }
 
@@ -3224,7 +3277,7 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect)
 
 	    switch (uc & CSET_MASK) {
 	      case ATTR_LINEDRW:
-		if (!cfg.rawcnp) {
+		if (!term->cfg->rawcnp) {
 		    uc = unitab_xterm[uc & 0xFF];
 		    break;
 		}
@@ -3251,12 +3304,12 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect)
 
 	    if (DIRECT_FONT(uc)) {
 		if (c >= ' ' && c != 0x7F) {
-		    unsigned char buf[4];
+		    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];
+			buf[1] = (char) (0xFF & ldata[top.x + 1]);
 			rv = mb_to_wc(font_codepage, 0, buf, 2, wbuf, 4);
 			top.x++;
 		    } else {
@@ -3555,7 +3608,7 @@ void term_do_paste(Terminal *term)
 
             if (p <= data + len - sel_nl_sz &&
                 !memcmp(p, sel_nl, sizeof(sel_nl))) {
-                term->paste_buffer[term->paste_len++] = '\r';
+                term->paste_buffer[term->paste_len++] = '\015';
                 p += sel_nl_sz;
             }
             q = p;
@@ -3580,8 +3633,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 &&
-		     !cfg.no_mouse_rep &&
-		     !(cfg.mouse_override && shift));
+		     !term->cfg->no_mouse_rep &&
+		     !(term->cfg->mouse_override && shift));
     int default_seltype;
 
     if (y < 0) {
@@ -3670,7 +3723,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 ^ !cfg.rect_select)
+    if (!alt ^ !term->cfg->rect_select)
 	default_seltype = RECTANGULAR;
     else
 	default_seltype = LEXICOGRAPHIC;
@@ -3814,7 +3867,7 @@ void term_paste(Terminal *term)
     while (term->paste_pos < term->paste_len) {
 	int n = 0;
 	while (n + term->paste_pos < term->paste_len) {
-	    if (term->paste_buffer[term->paste_pos + n++] == '\r')
+	    if (term->paste_buffer[term->paste_pos + n++] == '\015')
 		break;
 	}
 	if (term->ldisc)