aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.0.0854: no redraw after terminal was closed

Browse Source 
Problem:    No redraw after terminal was closed.
Solution:   Set typebuf_was_filled. (Yasuhiro Matsumoto, closes #1925, closes
            #1924)  Add function to check for messages even when input is
            available.
This commit is contained in:
Bram Moolenaar
2017-08-03 20:44:48 +02:00
parent b4a6721a28
commit e9c21aed62
7 changed files with 76 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/terminal.c
View File

@@ -1305,6 +1305,7 @@ term_channel_closed(channel_T *ch)
/* Need to break out of vgetc(). */
ins_char_typebuf(K_IGNORE);
typebuf_was_filled = TRUE;
term = curbuf->b_term;
if (term != NULL)
@@ -2140,31 +2141,36 @@ f_term_wait(typval_T *argvars, typval_T *rettv UNUSED)
ch_log(NULL, "term_wait(): invalid argument");
return;
}
if (buf->b_term->tl_job == NULL)
{
ch_log(NULL, "term_wait(): no job to wait for");
return;
}
/* Get the job status, this will detect a job that finished. */
if (buf->b_term->tl_job == NULL
|| STRCMP(job_status(buf->b_term->tl_job), "dead") == 0)
if (STRCMP(job_status(buf->b_term->tl_job), "dead") == 0)
{
/* The job is dead, keep reading channel I/O until the channel is
* closed. */
ch_log(NULL, "term_wait(): waiting for channel to close");
while (buf->b_term != NULL && !buf->b_term->tl_channel_closed)
{
mch_char_avail();
mch_check_messages();
parse_queued_messages();
ui_delay(10L, FALSE);
}
mch_char_avail();
mch_check_messages();
parse_queued_messages();
}
else
{
mch_char_avail();
mch_check_messages();
parse_queued_messages();
/* Wait for 10 msec for any channel I/O. */
/* TODO: use delay from optional argument */
ui_delay(10L, TRUE);
mch_char_avail();
mch_check_messages();
/* Flushing messages on channels is hopefully sufficient.
* TODO: is there a better way? */