patch 8.0.0771: cursor in terminal window not always updated in GUI

Problem:    Cursor in a terminal window not always updated in the GUI.
Solution:   Call gui_update_cursor(). (Yasuhiro Matsumoto, closes #1868)

diff --git a/src/terminal.c b/src/terminal.c
index 93715d51a59b172e71f6576973049b7d5d6df86d..f75ac38c3fae6999fea973473970c29b90088aa4 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -33,7 +33,8 @@
  * while, if the terminal window is visible, the screen contents is drawn.
  *
  * TODO:
- * - do not store terminal buffer in viminfo
+ * - include functions from #1871
+ * - do not store terminal buffer in viminfo.  Or prefix term:// ?
  * - Add a scrollback buffer (contains lines to scroll off the top).
  *   Can use the buf_T lines, store attributes somewhere else?
  * - When the job ends:
@@ -314,6 +315,18 @@ term_write_job_output(term_T *term, char_u *msg, size_t len)
     vterm_screen_flush_damage(vterm_obtain_screen(vterm));
 }
 
+    static void
+update_cursor()
+{
+    /* TODO: this should not always be needed */
+    setcursor();
+    out_flush();
+#ifdef FEAT_GUI
+    if (gui.in_use)
+       gui_update_cursor(FALSE, FALSE);
+#endif
+}
+
 /*
  * Invoked when "msg" output from a job was received.  Write it to the terminal
  * of "buffer".
@@ -329,8 +342,7 @@ write_to_term(buf_T *buffer, char_u *msg, channel_T *channel)
 
     /* TODO: only update once in a while. */
     update_screen(0);
-    setcursor();
-    out_flush();
+    update_cursor();
 }
 
 /*
@@ -461,8 +473,7 @@ terminal_loop(void)
     {
        /* TODO: skip screen update when handling a sequence of keys. */
        update_screen(0);
-       setcursor();
-       out_flush();
+       update_cursor();
        ++no_mapping;
        ++allow_keys;
        got_int = FALSE;
@@ -550,8 +561,7 @@ term_job_ended(job_T *job)
     if (did_one)
     {
        redraw_statuslines();
-       setcursor();
-       out_flush();
+       update_cursor();
     }
     if (curbuf->b_term != NULL && curbuf->b_term->tl_job == job)
        maketitle();
@@ -616,10 +626,7 @@ handle_movecursor(
     }
 
     if (is_current)
-    {
-       setcursor();
-       out_flush();
-    }
+       update_cursor();
 
     return 1;
 }

diff --git a/src/version.c b/src/version.c
index 44e4404c11c18898b15fc0e1b63d45c348d420c6..10189f4897454c4042b7ab182821522447f579c2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    771,
 /**/
     770,
 /**/