X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/dcfa5de155ccd04921b36826cd705fb16af74248..ca2d59436752b1d46a12d4d4fabd366fac81b0ca:/terminal.c

diff --git a/terminal.c b/terminal.c
index 7d3c60ca..c1fef2a1 100644
--- a/terminal.c
+++ b/terminal.c
@@ -212,9 +212,10 @@ void term_update(void) {
     ctx = get_ctx();
     if (ctx) {
         if ( (seen_key_event && (cfg.scroll_on_key)) ||
-	     (seen_disp_event && (!cfg.scroll_on_key)) ) {
+	     (seen_disp_event && (cfg.scroll_on_disp)) ) {
 	    disptop = scrtop;
 	    seen_disp_event = seen_key_event = 0;
+	    update_sbar();
 	}
 	do_paint (ctx, TRUE);
         sys_cursor(curs_x, curs_y + (scrtop - disptop) / (cols+1));
@@ -2187,3 +2188,14 @@ void term_deselect (void) {
     deselect();
     term_update();
 }
+
+/*
+ * from_backend(), to get data from the backend for the terminal.
+ */
+void from_backend(int is_stderr, char *data, int len) {
+    while (len--) {
+	if (inbuf_head >= INBUF_SIZE)
+	    term_out();
+	inbuf[inbuf_head++] = *data++;
+    }
+}