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

patch 8.0.1234: MS-Windows: composing chars are not shown properly

Browse Source 
Problem:    MS-Windows: composing characters are not shown properly.
Solution:   Pass base character and composing characters to the renderer at
            once. (Ken Takata, closes #2206)
This commit is contained in:
Bram Moolenaar
2017-10-28 19:23:11 +02:00
parent b9fce6cbf7
commit a6ce1ccf5c
3 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui_w32.c
View File

@@ -6295,8 +6295,8 @@ gui_mch_draw_string(
if (enc_utf8 && n < len && unicodebuf != NULL)
{
/* Output UTF-8 characters. Caller has already separated
* composing characters. */
/* Output UTF-8 characters. Composing characters should be
* handled here. */
int i;
int wlen; /* string length in words */
int clen; /* string length in characters */
@@ -6320,9 +6320,16 @@ gui_mch_draw_string(
{
unicodebuf[wlen++] = c;
}
cw = utf_char2cells(c);
if (cw > 2) /* don't use 4 for unprintable char */
cw = 1;
if (utf_iscomposing(c))
cw = 0;
else
{
cw = utf_char2cells(c);
if (cw > 2) /* don't use 4 for unprintable char */
cw = 1;
}
if (unicodepdy != NULL)
{
/* Use unicodepdy to make characters fit as we expect, even
@@ -6337,7 +6344,7 @@ gui_mch_draw_string(
unicodepdy[wlen - 1] = cw * gui.char_width;
}
cells += cw;
i += utfc_ptr2len_len(text + i, len - i);
i += utf_ptr2len_len(text + i, len - i);
++clen;
}
#if defined(FEAT_DIRECTX)