From a48d4e44a24191f5495e17d7616771c20ae3e3c1 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 8 Dec 2021 22:13:38 +0000 Subject: patch 8.2.3761: focus change is not passed on to a terminal window Problem: Focus change is not passed on to a terminal window. Solution: If the current window is a terminal and focus events are enabled send a focus event escape sequence to the terminal. --- src/terminal.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) (limited to 'src/terminal.c') diff --git a/src/terminal.c b/src/terminal.c index 4a95a3e3d..c3ce11644 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -1127,6 +1127,21 @@ get_tty_part(term_T *term UNUSED) return PART_IN; } +/* + * Read any vterm output and send it on the channel. + */ + static void +term_forward_output(term_T *term) +{ + VTerm *vterm = term->tl_vterm; + char buf[KEY_BUF_LEN]; + size_t curlen = vterm_output_read(vterm, buf, KEY_BUF_LEN); + + if (curlen > 0) + channel_send(term->tl_job->jv_channel, get_tty_part(term), + (char_u *)buf, (int)curlen, NULL); +} + /* * Write job output "msg[len]" to the vterm. */ @@ -1154,14 +1169,7 @@ term_write_job_output(term_T *term, char_u *msg_arg, size_t len_arg) // flush vterm buffer when vterm responded to control sequence if (prevlen != vterm_output_get_buffer_current(vterm)) - { - char buf[KEY_BUF_LEN]; - size_t curlen = vterm_output_read(vterm, buf, KEY_BUF_LEN); - - if (curlen > 0) - channel_send(term->tl_job->jv_channel, get_tty_part(term), - (char_u *)buf, (int)curlen, NULL); - } + term_forward_output(term); // this invokes the damage callbacks vterm_screen_flush_damage(vterm_obtain_screen(vterm)); @@ -2490,6 +2498,23 @@ term_win_entered() } } + void +term_focus_change(int in_focus) +{ + term_T *term = curbuf->b_term; + + if (term != NULL && term->tl_vterm != NULL) + { + VTermState *state = vterm_obtain_state(term->tl_vterm); + + if (in_focus) + vterm_state_focus_in(state); + else + vterm_state_focus_out(state); + term_forward_output(term); + } +} + /* * vgetc() may not include CTRL in the key when modify_other_keys is set. * Return the Ctrl-key value in that case. -- cgit v1.2.1