vim: src/terminal.c comparison

comparison src/terminal.c @ 15826:1f2edc01e7ed v8.1.0920

patch 8.1.0920: in Terminal-Normal mode job output messes up the window commit https://github.com/vim/vim/commit/29ae223ddcfcbbce46c7e1f4e8fa71b8f2674271 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Feb 14 21:22:01 2019 +0100 patch 8.1.0920: in Terminal-Normal mode job output messes up the window Problem: In Terminal-Normal mode job output messes up the window. Solution: Postpone scrolling and updating the buffer when in Terminal-Normal mode.

author	Bram Moolenaar <Bram@vim.org>
date	Thu, 14 Feb 2019 21:30:05 +0100
parents	5523665fdf80
children	8f112782a2e9

comparison

equal deleted inserted replaced

-:c2cac058bb49
+:1f2edc01e7ed
 VTermColor		fg;
 VTermColor		bg;
 } cellattr_T;
 typedef struct sb_line_S {
-int		sb_cols;	/* can differ per line */
+int		sb_cols;	// can differ per line
-cellattr_T	*sb_cells;	/* allocated */
+cellattr_T	*sb_cells;	// allocated
-cellattr_T	sb_fill_attr;	/* for short line */
+cellattr_T	sb_fill_attr;	// for short line
+char_u	*sb_text;	// for tl_scrollback_postponed
 } sb_line_T;
 #ifdef WIN3264
 # ifndef HPCON
 #  define HPCON VOID*
 #endif
 int		tl_postponed_scroll;	/* to be scrolled up */
 garray_T	tl_scrollback;
 int		tl_scrollback_scrolled;
+garray_T	tl_scrollback_postponed;
 cellattr_T	tl_default_color;
 linenr_T	tl_top_diff_rows;   /* rows of top diff file or zero */
 linenr_T	tl_bot_diff_rows;   /* rows of bottom diff file */
 static void term_report_winsize(term_T *term, int rows, int cols);
 static void term_free_vterm(term_T *term);
 #ifdef FEAT_GUI
 static void update_system_term(term_T *term);
 #endif
+static void handle_postponed_scrollback(term_T *term);
 /* The character that we know (or assume) that the terminal expects for the
 * backspace key. */
 static int term_backspace_char = BS;
 term->tl_finish = opt->jo_term_finish;
 #ifdef FEAT_GUI
 term->tl_system = (flags & TERM_START_SYSTEM);
 #endif
 ga_init2(&term->tl_scrollback, sizeof(sb_line_T), 300);
+ga_init2(&term->tl_scrollback_postponed, sizeof(sb_line_T), 300);
 vim_memset(&split_ea, 0, sizeof(split_ea));
 if (opt->jo_curwin)
 {
 	/* Create a new buffer in the current window. */
 int i;
 for (i = 0; i < term->tl_scrollback.ga_len; ++i)
 	vim_free(((sb_line_T *)term->tl_scrollback.ga_data + i)->sb_cells);
 ga_clear(&term->tl_scrollback);
+for (i = 0; i < term->tl_scrollback_postponed.ga_len; ++i)
+	vim_free(((sb_line_T *)term->tl_scrollback_postponed.ga_data + i)->sb_cells);
+ga_clear(&term->tl_scrollback_postponed);
 }
 // Terminals that need to be freed soon.
 term_T	*terminals_to_free = NULL;
 return next_due;
 }
 #endif
+/*
+* When "normal_mode" is TRUE set the terminal to Terminal-Normal mode,
+* otherwise end it.
+*/
 static void
 set_terminal_mode(term_T *term, int normal_mode)
 {
+ch_log(NULL, "set_terminal_mode(): %d", normal_mode);
 term->tl_normal_mode = normal_mode;
+if (!normal_mode)
+	handle_postponed_scrollback(term);
 VIM_CLEAR(term->tl_status_text);
 if (term->tl_buffer == curbuf)
 	maketitle();
 }
 * Move the vterm contents into the scrollback buffer and free the vterm.
 */
 static void
 cleanup_vterm(term_T *term)
 {
+set_terminal_mode(term, FALSE);
 if (term->tl_finish != TL_FINISH_CLOSE)
 	may_move_terminal_to_buffer(term, TRUE);
 term_free_vterm(term);
-set_terminal_mode(term, FALSE);
 }
 /*
 * Switch from Terminal-Job mode to Terminal-Normal mode.
 * Suspends updating the terminal window.
 }
 return 1;
 }
 /*
+* If the number of lines that are stored goes over 'termscrollback' then
+* delete the first 10%.
+* "gap" points to tl_scrollback or tl_scrollback_postponed.
+* "update_buffer" is TRUE when the buffer should be updated.
+*/
+static void
+limit_scrollback(term_T *term, garray_T *gap, int update_buffer)
+{
+if (gap->ga_len >= term->tl_buffer->b_p_twsl)
+{
+	int	todo = term->tl_buffer->b_p_twsl / 10;
+	int	i;
+	curbuf = term->tl_buffer;
+	for (i = 0; i < todo; ++i)
+	{
+	    vim_free(((sb_line_T *)gap->ga_data + i)->sb_cells);
+	    if (update_buffer)
+		ml_delete(1, FALSE);
+	}
+	curbuf = curwin->w_buffer;
+	gap->ga_len -= todo;
+	mch_memmove(gap->ga_data,
+		    (sb_line_T *)gap->ga_data + todo,
+		    sizeof(sb_line_T) * gap->ga_len);
+	if (update_buffer)
+	    term->tl_scrollback_scrolled -= todo;
+}
+}
+/*
 * Handle a line that is pushed off the top of the screen.
 */
 static int
 handle_pushline(int cols, const VTermScreenCell *cells, void *user)
 {
 term_T	*term = (term_T *)user;
+garray_T	*gap;
-/* First remove the lines that were appended before, the pushed line goes
+int		update_buffer;
-* above it. */
-cleanup_scrollback(term);
+if (term->tl_normal_mode)
+{
-/* If the number of lines that are stored goes over 'termscrollback' then
+	// In Terminal-Normal mode the user interacts with the buffer, thus we
-* delete the first 10%. */
+	// must not change it. Postpone adding the scrollback lines.
-if (term->tl_scrollback.ga_len >= term->tl_buffer->b_p_twsl)
+	gap = &term->tl_scrollback_postponed;
-{
+	update_buffer = FALSE;
-	int	todo = term->tl_buffer->b_p_twsl / 10;
+ch_log(NULL, "handle_pushline(): add to postponed");
-	int	i;
+}
+else
-	curbuf = term->tl_buffer;
+{
-	for (i = 0; i < todo; ++i)
+	// First remove the lines that were appended before, the pushed line
-	{
+	// goes above it.
-	    vim_free(((sb_line_T *)term->tl_scrollback.ga_data + i)->sb_cells);
+	cleanup_scrollback(term);
-	    ml_delete(1, FALSE);
+	gap = &term->tl_scrollback;
-	}
+	update_buffer = TRUE;
-	curbuf = curwin->w_buffer;
+ch_log(NULL, "handle_pushline(): add to window");
+}
-	term->tl_scrollback.ga_len -= todo;
-	mch_memmove(term->tl_scrollback.ga_data,
+limit_scrollback(term, gap, update_buffer);
-	    (sb_line_T *)term->tl_scrollback.ga_data + todo,
-	    sizeof(sb_line_T) * term->tl_scrollback.ga_len);
+if (ga_grow(gap, 1) == OK)
-	term->tl_scrollback_scrolled -= todo;
-}
-if (ga_grow(&term->tl_scrollback, 1) == OK)
 {
 	cellattr_T	*p = NULL;
 	int		len = 0;
 	int		i;
 	int		c;
 	int		col;
+	int		text_len;
+	char_u		*text;
 	sb_line_T	*line;
 	garray_T	ga;
 	cellattr_T	fill_attr = term->tl_default_color;
-	/* do not store empty cells at the end */
+	// do not store empty cells at the end
 	for (i = 0; i < cols; ++i)
 	    if (cells[i].chars[0] != 0)
 		len = i + 1;
 	    else
 		cell2cellattr(&cells[i], &fill_attr);
 					     (char_u *)ga.ga_data + ga.ga_len);
 		cell2cellattr(&cells[col], &p[col]);
 	    }
 	}
 	if (ga_grow(&ga, 1) == FAIL)
-	    add_scrollback_line_to_buffer(term, (char_u *)"", 0);
+	{
+	    if (update_buffer)
+		text = (char_u *)"";
+	    else
+		text = vim_strsave((char_u *)"");
+	    text_len = 0;
+	}
 	else
 	{
-	    *((char_u *)ga.ga_data + ga.ga_len) = NUL;
+	    text = ga.ga_data;
-	    add_scrollback_line_to_buffer(term, ga.ga_data, ga.ga_len);
+	    text_len = ga.ga_len;
-	}
+	    *(text + text_len) = NUL;
-	ga_clear(&ga);
+	}
+	if (update_buffer)
-	line = (sb_line_T *)term->tl_scrollback.ga_data
+	    add_scrollback_line_to_buffer(term, text, text_len);
-						  + term->tl_scrollback.ga_len;
+	line = (sb_line_T *)gap->ga_data + gap->ga_len;
 	line->sb_cols = len;
 	line->sb_cells = p;
 	line->sb_fill_attr = fill_attr;
+	if (update_buffer)
+	{
+	    line->sb_text = NULL;
+	    ++term->tl_scrollback_scrolled;
+	    ga_clear(&ga);  // free the text
+	}
+	else
+	{
+	    line->sb_text = text;
+	    ga_init(&ga);  // text is kept in tl_scrollback_postponed
+	}
+	++gap->ga_len;
+}
+return 0; /* ignored */
+}
+/*
+* Called when leaving Terminal-Normal mode: deal with any scrollback that was
+* received and stored in tl_scrollback_postponed.
+*/
+static void
+handle_postponed_scrollback(term_T *term)
+{
+int i;
+ch_log(NULL, "Moving postponed scrollback to scrollback");
+// First remove the lines that were appended before, the pushed lines go
+// above it.
+cleanup_scrollback(term);
+for (i = 0; i < term->tl_scrollback_postponed.ga_len; ++i)
+{
+	char_u		*text;
+	sb_line_T	*pp_line;
+	sb_line_T	*line;
+	if (ga_grow(&term->tl_scrollback, 1) == FAIL)
+	    break;
+	pp_line = (sb_line_T *)term->tl_scrollback_postponed.ga_data + i;
+	text = pp_line->sb_text;
+	if (text == NULL)
+	    text = (char_u *)"";
+	add_scrollback_line_to_buffer(term, text, (int)STRLEN(text));
+	vim_free(pp_line->sb_text);
+	line = (sb_line_T *)term->tl_scrollback.ga_data
+						 + term->tl_scrollback.ga_len;
+	line->sb_cols = pp_line->sb_cols;
+	line->sb_cells = pp_line->sb_cells;
+	line->sb_fill_attr = pp_line->sb_fill_attr;
+	line->sb_text = NULL;
+	++term->tl_scrollback_scrolled;
 	++term->tl_scrollback.ga_len;
-	++term->tl_scrollback_scrolled;
+}
-}
-return 0; /* ignored */
+ga_clear(&term->tl_scrollback_postponed);
+limit_scrollback(term, &term->tl_scrollback, TRUE);
 }
 static VTermScreenCallbacks screen_callbacks = {
 handle_damage,	/* damage */
 handle_moverect,	/* moverect */

Mercurial > vim

comparison src/terminal.c @ 15826:1f2edc01e7ed v8.1.0920