changeset 11888:4db6c74df788 v8.0.0824

patch 8.0.0824: in Terminal mode the cursor and screen gets redrawn commit https://github.com/vim/vim/commit/392d1bfa5e14b9534af322003723ebd57cedcc64 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jul 31 21:18:58 2017 +0200 patch 8.0.0824: in Terminal mode the cursor and screen gets redrawn Problem: In Terminal mode the cursor and screen gets redrawn when the job produces output. Solution: Check for tl_terminal_mode. (partly by Yasuhiro Matsumoto, closes #1904)
author Christian Brabandt <cb@256bit.org>
date Mon, 31 Jul 2017 21:30:05 +0200
parents 030a9cde3116
children 0af9c5c882d3
files src/terminal.c src/version.c
diffstat 2 files changed, 21 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -36,6 +36,9 @@
  * that buffer, attributes come from the scrollback buffer tl_scrollback.
  *
  * TODO:
+ * - Use "." for current line instead of optional.
+ * - make row and cols one-based instead of zero-based in term_ functions.
+ * - Add StatusLineTerm highlighting
  * - in bash mouse clicks are inserting characters.
  * - mouse scroll: when over other window, scroll that window.
  * - For the scrollback buffer store lines in the buffer, only attributes in
@@ -351,6 +354,8 @@ term_write_job_output(term_T *term, char
     static void
 update_cursor(term_T *term, int redraw)
 {
+    if (term->tl_terminal_mode)
+	return;
     setcursor();
     if (redraw && term->tl_buffer == curbuf)
     {
@@ -382,9 +387,12 @@ write_to_term(buf_T *buffer, char_u *msg
     ch_logn(channel, "writing %d bytes to terminal", (int)len);
     term_write_job_output(term, msg, len);
 
-    /* TODO: only update once in a while. */
-    update_screen(0);
-    update_cursor(term, TRUE);
+    if (!term->tl_terminal_mode)
+    {
+	/* TODO: only update once in a while. */
+	update_screen(0);
+	update_cursor(term, TRUE);
+    }
 }
 
 /*
@@ -1081,7 +1089,7 @@ handle_movecursor(
 	if (wp->w_buffer == term->tl_buffer)
 	    position_cursor(wp, &pos);
     }
-    if (term->tl_buffer == curbuf)
+    if (term->tl_buffer == curbuf && !term->tl_terminal_mode)
     {
 	may_toggle_cursor(term);
 	update_cursor(term, term->tl_cursor_visible);
@@ -2009,10 +2017,13 @@ f_term_sendkeys(typval_T *argvars, typva
 	msg += MB_PTR2LEN(msg);
     }
 
-    /* TODO: only update once in a while. */
-    update_screen(0);
-    if (buf == curbuf)
-	update_cursor(term, TRUE);
+    if (!term->tl_terminal_mode)
+    {
+	/* TODO: only update once in a while. */
+	update_screen(0);
+	if (buf == curbuf)
+	    update_cursor(term, TRUE);
+    }
 }
 
 /*
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    824,
+/**/
     823,
 /**/
     822,