mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Unbreak display of characters on MS-Windows

Browse Source 
* src/w32font.c (w32font_draw): Convert the glyph_string's
char2b array to 16-bit WCHAR data that ExtTextOutW needs.
This commit is contained in:
Eli Zaretskii 2019-05-23 08:26:32 +03:00
parent 627fa5a0cb
commit 38564f8a66
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/w32font.c
View File

@ -704,11 +704,23 @@ w32font_draw (struct glyph_string *s, int from, int to,
int i;
for (i = 0; i < len; i++)
ExtTextOutW (s->hdc, x + i, y, options, NULL,
s->char2b + from + i, 1, NULL);
{
WCHAR c = s->char2b[from + i] & 0xFFFF;
ExtTextOutW (s->hdc, x + i, y, options, NULL, &c, 1, NULL);
}
}
else
ExtTextOutW (s->hdc, x, y, options, NULL, s->char2b + from, len, NULL);
{
/* The number of glyphs in a glyph_string cannot be larger than
the maximum value of the 'used' member of a glyph_row, so we
are OK using alloca here. */
eassert (len <= SHRT_MAX);
WCHAR *chars = alloca (len * sizeof (WCHAR));
int j;
for (j = 0; j < len; j++)
chars[j] = s->char2b[from + j] & 0xFFFF;
ExtTextOutW (s->hdc, x, y, options, NULL, chars, len, NULL);
}
/* Restore clip region. */
if (s->num_clips > 0)