X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/4f892125d8842ae40448e7ecdd994fb6d26313a7..42856df411d7491a1e40c4d21c985b03a6206e22:/terminal.c?ds=sidebyside

diff --git a/terminal.c b/terminal.c
index 5245cdb7..a65d7157 100644
--- a/terminal.c
+++ b/terminal.c
@@ -86,6 +86,7 @@ typedef struct {
 #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 bufchain inbuf;		       /* terminal input buffer */
 static pos curs;		       /* cursor */
 static pos savecurs;		       /* saved cursor position */
 static int marg_t, marg_b;	       /* scroll margins */
@@ -291,7 +292,7 @@ static void power_on(void)
     big_cursor = 0;
     save_attr = curr_attr = ATTR_DEFAULT;
     term_editing = term_echoing = FALSE;
-    ldisc_send(NULL, 0);	       /* cause ldisc to notice changes */
+    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;
@@ -901,7 +902,7 @@ static void toggle_mode(int mode, int query, int state)
 	    break;
 	  case 10:		       /* set local edit mode */
 	    term_editing = state;
-	    ldisc_send(NULL, 0);       /* cause ldisc to notice changes */
+	    ldisc_send(NULL, 0, 0);    /* cause ldisc to notice changes */
 	    break;
 	  case 25:		       /* enable/disable cursor */
 	    compatibility2(OTHER, VT220);
@@ -930,7 +931,7 @@ static void toggle_mode(int mode, int query, int state)
 	    break;
 	  case 12:		       /* set echo mode */
 	    term_echoing = !state;
-	    ldisc_send(NULL, 0);       /* cause ldisc to notice changes */
+	    ldisc_send(NULL, 0, 0);    /* cause ldisc to notice changes */
 	    break;
 	  case 20:		       /* Return sends ... */
 	    cr_lf_return = state;
@@ -973,20 +974,38 @@ static void do_osc(void)
  */
 void term_out(void)
 {
-    int c, inbuf_reap;
+    int c, unget;
+    unsigned char localbuf[256], *chars;
+    int nchars = 0;
+
+    unget = -1;
+
+    while (nchars > 0 || bufchain_size(&inbuf) > 0) {
+	if (unget == -1) {
+	    if (nchars == 0) {
+		void *ret;
+		bufchain_prefix(&inbuf, &ret, &nchars);
+		if (nchars > sizeof(localbuf))
+		    nchars = sizeof(localbuf);
+		memcpy(localbuf, ret, nchars);
+		bufchain_consume(&inbuf, nchars);
+		chars = localbuf;
+		assert(chars != NULL);
+	    }
+	    c = *chars++;
+	    nchars--;
 
-    /*
-     * Optionally log the session traffic to a file. Useful for
-     * debugging and possibly also useful for actual logging.
-     */
-    if (cfg.logtype == LGTYP_DEBUG)
-	for (inbuf_reap = 0; inbuf_reap < inbuf_head; inbuf_reap++) {
-	    logtraffic((unsigned char) inbuf[inbuf_reap], LGTYP_DEBUG);
+	    /*
+	     * 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);
+	} else {
+	    c = unget;
+	    unget = -1;
 	}
 
-    for (inbuf_reap = 0; inbuf_reap < inbuf_head; inbuf_reap++) {
-	c = inbuf[inbuf_reap];
-
 	/* Note only VT220+ are 8-bit VT102 is seven bit, it shouldn't even
 	 * be able to display 8-bit characters, but I'll let that go 'cause
 	 * of i18n.
@@ -1029,7 +1048,7 @@ void term_out(void)
 		  case 4:
 		  case 5:
 		    if ((c & 0xC0) != 0x80) {
-			inbuf_reap--;
+			unget = c;
 			c = UCSERR;
 			utf_state = 0;
 			break;
@@ -1169,7 +1188,7 @@ void term_out(void)
 			} else
 			    *d++ = *s;
 		    }
-		    lpage_send(CP_ACP, abuf, d - abuf);
+		    lpage_send(CP_ACP, abuf, d - abuf, 0);
 		}
 		break;
 	      case '\007':
@@ -1475,7 +1494,7 @@ void term_out(void)
 		    break;
 		  case 'Z':	       /* terminal type query */
 		    compatibility(VT100);
-		    ldisc_send(id_string, strlen(id_string));
+		    ldisc_send(id_string, strlen(id_string), 0);
 		    break;
 		  case 'c':	       /* restore power-on settings */
 		    compatibility(VT100);
@@ -1627,7 +1646,7 @@ void term_out(void)
 			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);
+			ldisc_send("\033[>0;136;0c", 11, 0);
 			break;
 		      case 'a':       /* move right N cols */
 			compatibility(ANSI);
@@ -1723,16 +1742,16 @@ void term_out(void)
 		      case 'c':       /* terminal type query */
 			compatibility(VT100);
 			/* This is the response for a VT102 */
-			ldisc_send(id_string, strlen(id_string));
+			ldisc_send(id_string, strlen(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));
+			    ldisc_send(buf, strlen(buf), 0);
 			} else if (esc_args[0] == 5) {
-			    ldisc_send("\033[0n", 4);
+			    ldisc_send("\033[0n", 4, 0);
 			}
 			break;
 		      case 'h':       /* toggle modes to high */
@@ -1992,7 +2011,7 @@ void term_out(void)
 			    if (i == 0 || i == 1) {
 				strcpy(buf, "\033[2;1;1;112;112;1;0x");
 				buf[2] += i;
-				ldisc_send(buf, 20);
+				ldisc_send(buf, 20, 0);
 			    }
 			}
 			break;
@@ -2309,7 +2328,7 @@ void term_out(void)
 		    termstate = VT52_Y1;
 		    break;
 		  case 'Z':
-		    ldisc_send("\033/Z", 3);
+		    ldisc_send("\033/Z", 3, 0);
 		    break;
 		  case '=':
 		    app_keypad_keys = TRUE;
@@ -2480,7 +2499,6 @@ void term_out(void)
 	    check_selection(curs, cursplus);
 	}
     }
-    inbuf_head = 0;
 }
 
 #if 0
@@ -3132,7 +3150,7 @@ void term_do_paste(void)
 
         /* Assume a small paste will be OK in one go. */
         if (paste_len < 256) {
-            luni_send(paste_buffer, paste_len);
+            luni_send(paste_buffer, paste_len, 0);
             if (paste_buffer)
                 sfree(paste_buffer);
             paste_buffer = 0;
@@ -3223,7 +3241,7 @@ void term_mouse(Mouse_Button b, Mouse_Action a, int x, int y,
 	c = x + 33;
 
 	sprintf(abuf, "\033[M%c%c%c", encstate, c, r);
-	ldisc_send(abuf, 6);
+	ldisc_send(abuf, 6, 0);
 	return;
     }
 
@@ -3319,7 +3337,7 @@ void term_paste()
 	    if (paste_buffer[paste_pos + n++] == '\r')
 		break;
 	}
-	luni_send(paste_buffer + paste_pos, n);
+	luni_send(paste_buffer + paste_pos, n, 0);
 	paste_pos += n;
 
 	if (paste_pos < paste_len) {
@@ -3358,18 +3376,15 @@ int term_ldisc(int option)
  */
 int from_backend(int is_stderr, char *data, int len)
 {
-    while (len--) {
-	if (inbuf_head >= INBUF_SIZE)
-	    term_out();
-	inbuf[inbuf_head++] = *data++;
-    }
+    bufchain_add(&inbuf, data, len);
 
     /*
-     * We process all stdout/stderr data immediately we receive it,
-     * and don't return until it's all gone. Therefore, there's no
-     * reason at all to return anything other than zero from this
-     * function.
-     * 
+     * term_out() always completely empties inbuf. Therefore,
+     * there's no reason at all to return anything other than zero
+     * from this function, because there _can't_ be a question of
+     * the remote side needing to wait until term_out() has cleared
+     * a backlog.
+     *
      * This is a slightly suboptimal way to deal with SSH2 - in
      * principle, the window mechanism would allow us to continue
      * to accept data on forwarded ports and X connections even
@@ -3379,7 +3394,7 @@ int from_backend(int is_stderr, char *data, int len)
      * portability. So we manage stdout buffering the old SSH1 way:
      * if the terminal processing goes slowly, the whole SSH
      * connection stops accepting data until it's ready.
-     * 
+     *
      * In practice, I can't imagine this causing serious trouble.
      */
     return 0;