Patch 8.0.1203
Problem: Terminal window mistreats composing characters.
Solution: Count composing characters with the base character. (Ozaki Kiichi,
closes #2195)
Files: src/mbyte.c, src/terminal.c, src/testdir/test_terminal.vim
*** ../vim-8.0.1202/src/mbyte.c 2017-09-26 19:10:33.494859477 +0200
--- src/mbyte.c 2017-10-15 22:48:06.434995752 +0200
***************
*** 1402,1407 ****
--- 1402,1409 ----
int
utf_uint2cells(UINT32_T c)
{
+ if (c >= 0x100 && utf_iscomposing((int)c))
+ return 0;
return utf_char2cells((int)c);
}
#endif
*** ../vim-8.0.1202/src/terminal.c 2017-10-15 13:21:57.534747399 +0200
--- src/terminal.c 2017-10-15 22:55:48.019817937 +0200
***************
*** 40,51 ****
* TODO:
* - in GUI vertical split causes problems. Cursor is flickering. (Hirohito
* Higashi, 2017 Sep 19)
- * - patch to handle composing characters. (Ozaki Kiichi, #2195)
* - double click in Window toolbar starts Visual mode (but not always?).
* - Shift-Tab does not work.
* - after resizing windows overlap. (Boris Staletic, #2164)
- * - :wall gives an error message. (Marius Gedminas, #2190)
- * patch suggested by Yasuhiro Matsumoto, Oct 10
* - Redirecting output does not work on MS-Windows,
Test_terminal_redir_file()
* is disabled.
* - cursor blinks in terminal on widows with a timer. (xtal8, #2142)
--- 40,48 ----
***************
*** 2299,2305 ****
if (vterm_screen_get_cell(screen, pos, &cell) == 0)
vim_memset(&cell, 0, sizeof(cell));
- /* TODO: composing chars */
c = cell.chars[0];
if (c == NUL)
{
--- 2296,2301 ----
***************
*** 2311,2317 ****
{
if (enc_utf8)
{
! if (c >= 0x80)
{
ScreenLines[off] = ' ';
ScreenLinesUC[off] = c;
--- 2307,2324 ----
{
if (enc_utf8)
{
! int i;
!
! /* composing chars */
! for (i = 0; i < Screen_mco
! && i + 1 < VTERM_MAX_CHARS_PER_CELL; ++i)
! {
! ScreenLinesC[i][off] = cell.chars[i + 1];
! if (cell.chars[i + 1] == 0)
! break;
! }
! if (c >= 0x80 || (Screen_mco > 0
! && ScreenLinesC[0][off] != 0))
{
ScreenLines[off] = ' ';
ScreenLinesUC[off] = c;
***************
*** 3157,3163 ****
while (*msg != NUL)
{
send_keys_to_term(term, PTR2CHAR(msg), FALSE);
! msg += MB_PTR2LEN(msg);
}
}
--- 3164,3170 ----
while (*msg != NUL)
{
send_keys_to_term(term, PTR2CHAR(msg), FALSE);
! msg += MB_CPTR2LEN(msg);
}
}
*** ../vim-8.0.1202/src/testdir/test_terminal.vim 2017-10-15
22:42:19.025389152 +0200
--- src/testdir/test_terminal.vim 2017-10-15 22:46:17.159748422 +0200
***************
*** 685,687 ****
--- 685,744 ----
exe buf . 'bwipe'
unlet g:job
endfunc
+
+ func Test_terminal_composing_unicode()
+ let save_enc = &encoding
+ set encoding=utf-8
+
+ if has('win32')
+ let cmd = "cmd /K chcp 65001"
+ let lnum = [3, 6, 9]
+ else
+ let cmd = &shell
+ let lnum = [1, 3, 5]
+ endif
+
+ enew
+ let buf = term_start(cmd, {'curwin': bufnr('')})
+ let job = term_getjob(buf)
+ call term_wait(buf, 50)
+
+ " ascii + composing
+ let txt = "a\u0308bc"
+ call term_sendkeys(buf, "echo " . txt . "\r")
+ call term_wait(buf, 50)
+ call assert_match("echo " . txt, term_getline(buf, lnum[0]))
+ call assert_equal(txt, term_getline(buf, lnum[0] + 1))
+ let l = term_scrape(buf, lnum[0] + 1)
+ call assert_equal("a\u0308", l[0].chars)
+ call assert_equal("b", l[1].chars)
+ call assert_equal("c", l[2].chars)
+
+ " multibyte + composing
+ let txt = "\u304b\u3099\u304e\u304f\u3099\u3052\u3053\u3099"
+ call term_sendkeys(buf, "echo " . txt . "\r")
+ call term_wait(buf, 50)
+ call assert_match("echo " . txt, term_getline(buf, lnum[1]))
+ call assert_equal(txt, term_getline(buf, lnum[1] + 1))
+ let l = term_scrape(buf, lnum[1] + 1)
+ call assert_equal("\u304b\u3099", l[0].chars)
+ call assert_equal("\u304e", l[1].chars)
+ call assert_equal("\u304f\u3099", l[2].chars)
+ call assert_equal("\u3052", l[3].chars)
+ call assert_equal("\u3053\u3099", l[4].chars)
+
+ " \u00a0 + composing
+ let txt = "abc\u00a0\u0308"
+ call term_sendkeys(buf, "echo " . txt . "\r")
+ call term_wait(buf, 50)
+ call assert_match("echo " . txt, term_getline(buf, lnum[2]))
+ call assert_equal(txt, term_getline(buf, lnum[2] + 1))
+ let l = term_scrape(buf, lnum[2] + 1)
+ call assert_equal("\u00a0\u0308", l[3].chars)
+
+ call term_sendkeys(buf, "exit\r")
+ call WaitFor('job_status(job) == "dead"')
+ call assert_equal('dead', job_status(job))
+ bwipe!
+ let &encoding = save_enc
+ endfunc
*** ../vim-8.0.1202/src/version.c 2017-10-15 22:42:19.025389152 +0200
--- src/version.c 2017-10-15 22:55:58.311747103 +0200
***************
*** 763,764 ****
--- 763,766 ----
{ /* Add new patch number below this line */
+ /**/
+ 1203,
/**/
--
Proverb: A nightingale that forgets the lyrics is a hummingbird.
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
