X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/199b03d856ef0d9a3baf04da072f6765ee655f1c..811453cbc32f1f0f14cfef25f54eabf2e3b28bd9:/terminal.c

diff --git a/terminal.c b/terminal.c
index 2a9470ba..82a90deb 100644
--- a/terminal.c
+++ b/terminal.c
@@ -99,7 +99,7 @@ static unsigned long *resizeline(unsigned long *line, int cols)
 	 */
 	oldlen = line[0];
 	lineattrs = line[oldlen + 1];
-	line = srealloc(line, TSIZE * (2 + cols));
+	line = sresize(line, 2 + cols, TTYPE);
 	line[0] = cols;
 	for (i = oldlen; i < cols; i++)
 	    line[i + 1] = ERASE_CHAR;
@@ -321,8 +321,15 @@ void term_reconfig(Terminal *term, Config *cfg)
 	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)
+    if (reset_bce) {
 	term->use_bce = term->cfg.bce;
+	if (term->use_bce)
+	    term->erase_char = (' ' | ATTR_ASCII |
+				(term->curr_attr &
+				 (ATTR_FGMASK | ATTR_BGMASK)));
+	else
+	    term->erase_char = ERASE_CHAR;
+    }
     if (reset_blink)
 	term->blink_is_real = term->cfg.blinktext;
     if (reset_charclass)
@@ -372,7 +379,7 @@ Terminal *term_init(Config *mycfg, struct unicode_data *ucsdata,
      * Allocate a new Terminal structure and initialise the fields
      * that need it.
      */
-    term = smalloc(sizeof(Terminal));
+    term = snew(Terminal);
     term->frontend = frontend;
     term->ucsdata = ucsdata;
     term->cfg = *mycfg;		       /* STRUCTURE COPY */
@@ -418,6 +425,7 @@ Terminal *term_init(Config *mycfg, struct unicode_data *ucsdata,
     term->attr_mask = 0xffffffff;
     term->resize_fn = NULL;
     term->resize_ctx = NULL;
+    term->in_term_out = FALSE;
 
     return term;
 }
@@ -511,7 +519,7 @@ void term_size(Terminal *term, int newrows, int newcols, int newsavelines)
 	    term->savecurs.y += 1;
 	} else {
 	    /* Add a new blank line at the bottom of the screen. */
-	    line = smalloc(TSIZE * (newcols + 2));
+	    line = snewn(newcols + 2, TTYPE);
 	    line[0] = newcols;
 	    for (j = 0; j < newcols; j++)
 		line[j + 1] = ERASE_CHAR;
@@ -551,7 +559,7 @@ void term_size(Terminal *term, int newrows, int newcols, int newsavelines)
     term->disptop = 0;
 
     /* Make a new displayed text buffer. */
-    newdisp = smalloc(newrows * (newcols + 1) * TSIZE);
+    newdisp = snewn(newrows * (newcols + 1), TTYPE);
     for (i = 0; i < newrows * (newcols + 1); i++)
 	newdisp[i] = ATTR_INVALID;
     sfree(term->disptext);
@@ -561,7 +569,7 @@ void term_size(Terminal *term, int newrows, int newcols, int newsavelines)
     /* Make a new alternate screen. */
     newalt = newtree234(NULL);
     for (i = 0; i < newrows; i++) {
-	line = smalloc(TSIZE * (newcols + 2));
+	line = snewn(newcols + 2, TTYPE);
 	line[0] = newcols;
 	for (j = 0; j < newcols; j++)
 	    line[j + 1] = term->erase_char;
@@ -576,7 +584,7 @@ void term_size(Terminal *term, int newrows, int newcols, int newsavelines)
     term->alt_screen = newalt;
     term->alt_sblines = 0;
 
-    term->tabs = srealloc(term->tabs, newcols * sizeof(*term->tabs));
+    term->tabs = sresize(term->tabs, newcols, unsigned char);
     {
 	int i;
 	for (i = (term->cols > 0 ? term->cols : 0); i < newcols; i++)
@@ -769,14 +777,14 @@ static void scroll(Terminal *term, int topline, int botline, int lines, int sb)
 	    if (term->selstart.y >= topline && term->selstart.y <= botline) {
 		term->selstart.y++;
 		if (term->selstart.y > botline) {
-		    term->selstart.y = botline;
+		    term->selstart.y = botline + 1;
 		    term->selstart.x = 0;
 		}
 	    }
 	    if (term->selend.y >= topline && term->selend.y <= botline) {
 		term->selend.y++;
 		if (term->selend.y > botline) {
-		    term->selend.y = botline;
+		    term->selend.y = botline + 1;
 		    term->selend.x = 0;
 		}
 	    }
@@ -797,7 +805,7 @@ static void scroll(Terminal *term, int topline, int botline, int lines, int sb)
 		if (sblen == term->savelines) {
 		    sblen--, line2 = delpos234(term->scrollback, 0);
 		} else {
-		    line2 = smalloc(TSIZE * (term->cols + 2));
+		    line2 = snewn(term->cols + 2, TTYPE);
 		    line2[0] = term->cols;
 		    term->tempsblines += 1;
 		}
@@ -889,7 +897,7 @@ static void save_scroll(Terminal *term, int topline, int botline, int lines)
 	term->scrolltail->botline == botline) {
 	term->scrolltail->lines += lines;
     } else {
-	newscroll = smalloc(sizeof(struct scrollregion));
+	newscroll = snew(struct scrollregion);
 	newscroll->topline = topline;
 	newscroll->botline = botline;
 	newscroll->lines = lines;
@@ -1181,6 +1189,10 @@ static void toggle_mode(Terminal *term, int mode, int query, int state)
 	    if (!term->cfg.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 */
 	    /*
@@ -1627,7 +1639,7 @@ void term_out(Terminal *term)
 		    ticks = GETTICKCOUNT();
 
 		    if (!term->beep_overloaded) {
-			newbeep = smalloc(sizeof(struct beeptime));
+			newbeep = snew(struct beeptime);
 			newbeep->ticks = ticks;
 			newbeep->next = NULL;
 			if (!term->beephead)
@@ -2599,7 +2611,8 @@ void term_out(Terminal *term)
 				 */
 				break;
 			      case 20:
-				if (term->ldisc) {
+				if (term->ldisc &&
+				    !term->cfg.no_remote_qtitle) {
 				    p = get_window_title(term->frontend, TRUE);
 				    len = strlen(p);
 				    ldisc_send(term->ldisc, "\033]L", 3, 0);
@@ -2608,7 +2621,8 @@ void term_out(Terminal *term)
 				}
 				break;
 			      case 21:
-				if (term->ldisc) {
+				if (term->ldisc &&
+				    !term->cfg.no_remote_qtitle) {
 				    p = get_window_title(term->frontend,FALSE);
 				    len = strlen(p);
 				    ldisc_send(term->ldisc, "\033]l", 3, 0);
@@ -3550,7 +3564,7 @@ void term_scroll(Terminal *term, int rel, int where)
     term_update(term);
 }
 
-static void clipme(Terminal *term, 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 */
@@ -3559,7 +3573,7 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect)
     int buflen;			       /* amount of memory allocated to workbuf */
 
     buflen = 5120;		       /* Default size */
-    workbuf = smalloc(buflen * sizeof(wchar_t));
+    workbuf = snewn(buflen, wchar_t);
     wbptr = workbuf;		       /* start filling here */
     old_top_x = top.x;		       /* needed for rect==1 */
 
@@ -3675,9 +3689,8 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect)
 	    for (p = cbuf; *p; p++) {
 		/* Enough overhead for trailing NL and nul */
 		if (wblen >= buflen - 16) {
-		    workbuf =
-			srealloc(workbuf,
-				 sizeof(wchar_t) * (buflen += 100));
+		    buflen += 100;
+		    workbuf = sresize(workbuf, buflen, wchar_t);
 		    wbptr = workbuf + wblen;
 		}
 		wblen++;
@@ -3699,7 +3712,7 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect)
     wblen++;
     *wbptr++ = 0;
 #endif
-    write_clip(term->frontend, workbuf, wblen, FALSE); /* transfer to clipbd */
+    write_clip(term->frontend, workbuf, wblen, desel); /* transfer to clipbd */
     if (buflen > 0)		       /* indicates we allocated this buffer */
 	sfree(workbuf);
 }
@@ -3709,7 +3722,7 @@ void term_copyall(Terminal *term)
     pos top;
     top.y = -sblines(term);
     top.x = 0;
-    clipme(term, top, term->curs, 0);
+    clipme(term, top, term->curs, 0, TRUE);
 }
 
 /*
@@ -3946,7 +3959,7 @@ void term_do_paste(Terminal *term)
         if (term->paste_buffer)
             sfree(term->paste_buffer);
         term->paste_pos = term->paste_hold = term->paste_len = 0;
-        term->paste_buffer = smalloc(len * sizeof(wchar_t));
+        term->paste_buffer = snewn(len, wchar_t);
 
         p = q = data;
         while (p < data + len) {
@@ -4174,7 +4187,7 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked,
 	     * data to the clipboard.
 	     */
 	    clipme(term, term->selstart, term->selend,
-		   (term->seltype == RECTANGULAR));
+		   (term->seltype == RECTANGULAR), FALSE);
 	    term->selstate = SELECTED;
 	} else
 	    term->selstate = NO_SELECTION;
@@ -4507,7 +4520,7 @@ void term_key(Terminal *term, Key_Sym keysym, wchar_t *text, size_t tlen,
 	      case PK_END:      xkey = 'E'; break;
 	      case PK_PAGEUP:   xkey = 'I'; break;
 	      case PK_PAGEDOWN: xkey = 'G'; break;
-	      default: break; /* else gcc warns `enum value not used' */
+	      default: xkey=0; break; /* else gcc warns `enum value not used'*/
 	    }
 	    p += sprintf((char *) p, "\x1B%c", xkey);
 	    goto done;
@@ -4520,7 +4533,7 @@ void term_key(Terminal *term, Key_Sym keysym, wchar_t *text, size_t tlen,
 	  case PK_END:      code = 4; break;
 	  case PK_PAGEUP:   code = 5; break;
 	  case PK_PAGEDOWN: code = 6; break;
-	  default: break; /* else gcc warns `enum value not used' */
+	  default: code = 0; break; /* else gcc warns `enum value not used' */
 	}
 	p += sprintf((char *) p, "\x1B[%d~", code);
 	goto done;
@@ -4701,17 +4714,19 @@ int term_ldisc(Terminal *term, int option)
     return FALSE;
 }
 
-/*
- * from_backend(), to get data from the backend for the terminal.
- */
-int from_backend(void *vterm, int is_stderr, const char *data, int len)
+int term_data(Terminal *term, int is_stderr, const char *data, int len)
 {
-    Terminal *term = (Terminal *)vterm;
-
     assert(len > 0);
 
     bufchain_add(&term->inbuf, data, len);
 
+    if (!term->in_term_out) {
+	term->in_term_out = TRUE;
+	term_blink(term, 1);
+	term_out(term);
+	term->in_term_out = FALSE;
+    }
+
     /*
      * term_out() always completely empties inbuf. Therefore,
      * there's no reason at all to return anything other than zero