patch 7.4.1429
Problem: On MS-Windows, when not use renderoptions=type:directx, drawing
emoji will be broken.
Solution: Fix usage of unicodepdy. (Yasuhiro Matsumoto)
diff --git a/src/gui_w32.c b/src/gui_w32.c
index edfe24e..aff0ba2 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -6658,7 +6658,13 @@
/* Use unicodepdy to make characters fit as we expect, even
* when the font uses different widths (e.g., bold character
* is wider). */
- unicodepdy[clen] = cw * gui.char_width;
+ if (c >= 0x10000)
+ {
+ unicodepdy[wlen - 2] = cw * gui.char_width;
+ unicodepdy[wlen - 1] = 0;
+ }
+ else
+ unicodepdy[wlen - 1] = cw * gui.char_width;
}
cells += cw;
i += utfc_ptr2len_len(text + i, len - i);
diff --git a/src/version.c b/src/version.c
index 68ccf92..4fde2fe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1429,
+/**/
1428,
/**/
1427,