thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0800

Browse Source 
Problem:    Terminal window scrollback contents is wrong.
Solution:   Fix handling of multi-byte characters (Yasuhiro Matsumoto) Handle
            empty lines correctly. (closes #1891)
This commit is contained in:
Bram Moolenaar
2017-07-29 14:52:43 +02:00
parent dcbfa33fa1
commit 696d00f488
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/terminal.c
View File

@@ -765,26 +765,26 @@ handle_pushline(int cols, const VTermScreenCell *cells, void *user)
/* TODO: put the text in the buffer. */ /* TODO: put the text in the buffer. */
if (ga_grow(&term->tl_scrollback, 1) == OK) if (ga_grow(&term->tl_scrollback, 1) == OK)
{ {
VTermScreenCell *p; VTermScreenCell *p = NULL;
int len; int len = 0;
int i; int i;
sb_line_T *line;
/* do not store empty cells at the end */ /* do not store empty cells at the end */
for (i = 0; i < cols; ++i) for (i = 0; i < cols; ++i)
if (cells[i].chars[0] != 0) if (cells[i].chars[0] != 0)
len = i + 1; len = i + 1;
p = (VTermScreenCell *)alloc((int)sizeof(VTermScreenCell) * len); if (len > 0)
p = (VTermScreenCell *)alloc((int)sizeof(VTermScreenCell) * len);
if (p != NULL) if (p != NULL)
{
sb_line_T *line = (sb_line_T *)term->tl_scrollback.ga_data
+ term->tl_scrollback.ga_len;
mch_memmove(p, cells, sizeof(VTermScreenCell) * len); mch_memmove(p, cells, sizeof(VTermScreenCell) * len);
line->sb_cols = len;
line->sb_cells = p; line = (sb_line_T *)term->tl_scrollback.ga_data
++term->tl_scrollback.ga_len; + term->tl_scrollback.ga_len;
} line->sb_cols = len;
line->sb_cells = p;
++term->tl_scrollback.ga_len;
} }
return 0; /* ignored */ return 0; /* ignored */
} }
@@ -818,7 +818,9 @@ move_scrollback_to_buffer(term_T *term)
&& cell.chars[0] != NUL) && cell.chars[0] != NUL)
len = pos.col + 1; len = pos.col + 1;
if (len > 0) if (len == 0)
++lines_skipped;
else
{ {
while (lines_skipped > 0) while (lines_skipped > 0)
{ {
@@ -865,13 +867,15 @@ move_scrollback_to_buffer(term_T *term)
ga.ga_len = 0; ga.ga_len = 0;
for (col = 0; col < line->sb_cols; ++col) for (col = 0; col < line->sb_cols; ++col)
for (i = 0; (c = line->sb_cells[col].chars[i]) != 0 || i == 0; ++i) {
{ if (ga_grow(&ga, MB_MAXBYTES) == FAIL)
if (ga_grow(&ga, MB_MAXBYTES) == FAIL) goto failed;
goto failed; for (i = 0; (c = line->sb_cells[col].chars[i]) > 0 || i == 0; ++i)
ga.ga_len += mb_char2bytes(c == NUL ? ' ' : c, ga.ga_len += mb_char2bytes(c == NUL ? ' ' : c,
(char_u *)ga.ga_data + ga.ga_len); (char_u *)ga.ga_data + ga.ga_len);
} }
if (ga_grow(&ga, 1) == FAIL)
goto failed;
*((char_u *)ga.ga_data + ga.ga_len) = NUL; *((char_u *)ga.ga_data + ga.ga_len) = NUL;
ml_append_buf(term->tl_buffer, lnum, ga.ga_data, ga.ga_len + 1, FALSE); ml_append_buf(term->tl_buffer, lnum, ga.ga_data, ga.ga_len + 1, FALSE);
} }

2
src/version.c
View File

@@ -769,6 +769,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 */
/**/
800,
/**/ /**/
799, 799,
/**/ /**/