aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 9.0.1498: in a terminal window the cursor may jump around

Browse Source 
Problem:    In a terminal window the cursor may jump around. (Kenny Stauffer)
Solution:   Do not move the cursor to the position for terminal-normal mode.
            (closes #12312)
This commit is contained in:
Bram Moolenaar
2023-04-29 14:26:02 +01:00
parent 971cd2b8bc
commit 58806c1553
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/terminal.c
View File

@@ -1208,6 +1208,24 @@ term_write_job_output(term_T *term, char_u *msg_arg, size_t len_arg)
vterm_screen_flush_damage(vterm_obtain_screen(vterm)); vterm_screen_flush_damage(vterm_obtain_screen(vterm));
} }
static void
position_cursor(win_T *wp, VTermPos *pos)
{
wp->w_wrow = MIN(pos->row, MAX(0, wp->w_height - 1));
wp->w_wcol = MIN(pos->col, MAX(0, wp->w_width - 1));
#ifdef FEAT_PROP_POPUP
if (popup_is_popup(wp))
{
wp->w_wrow += popup_top_extra(wp);
wp->w_wcol += popup_left_extra(wp);
wp->w_flags |= WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED;
}
else
wp->w_flags &= ~(WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED);
#endif
wp->w_valid |= (VALID_WCOL|VALID_WROW);
}
static void static void
update_cursor(term_T *term, int redraw) update_cursor(term_T *term, int redraw)
{ {
@@ -1219,7 +1237,16 @@ update_cursor(term_T *term, int redraw)
term->tl_cursor_pos.col); term->tl_cursor_pos.col);
else else
#endif #endif
if (!term_job_running(term))
// avoid the cursor positioned below the last used line
setcursor(); setcursor();
else
{
// do not use the window cursor position
position_cursor(curwin, &curbuf->b_term->tl_cursor_pos);
windgoto(W_WINROW(curwin) + curwin->w_wrow,
curwin->w_wincol + curwin->w_wcol);
}
if (redraw) if (redraw)
{ {
aco_save_T aco; aco_save_T aco;
@@ -2358,24 +2385,6 @@ send_keys_to_term(term_T *term, int c, int modmask, int typed)
return OK; return OK;
} }
static void
position_cursor(win_T *wp, VTermPos *pos)
{
wp->w_wrow = MIN(pos->row, MAX(0, wp->w_height - 1));
wp->w_wcol = MIN(pos->col, MAX(0, wp->w_width - 1));
#ifdef FEAT_PROP_POPUP
if (popup_is_popup(wp))
{
wp->w_wrow += popup_top_extra(wp);
wp->w_wcol += popup_left_extra(wp);
wp->w_flags |= WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED;
}
else
wp->w_flags &= ~(WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED);
#endif
wp->w_valid |= (VALID_WCOL|VALID_WROW);
}
/* /*
* Handle CTRL-W "": send register contents to the job. * Handle CTRL-W "": send register contents to the job.
*/ */

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1498,
/**/ /**/
1497, 1497,
/**/ /**/