mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3469 from bparker06/utf8_fix2

Browse Source 
fix multibyte utf8 strings being cut off/corrupted in xmb/glui
This commit is contained in:
Twinaphex 2016-08-29 18:38:34 +02:00 committed by GitHub
commit 32729080ef
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/drivers_font/gl_raster_font.c
View File

@ -217,8 +217,13 @@ static int gl_get_message_width(void *data, const char *msg,
for (i = 0; i < msg_len; i++) for (i = 0; i < msg_len; i++)
{ {
const char *msg_tmp = &msg[i]; const char *msg_tmp = &msg[i];
unsigned code = utf8_walk(&msg_tmp);
unsigned skip = msg_tmp - &msg[i];
if (skip > 1) i += skip - 1;
const struct font_glyph *glyph = const struct font_glyph *glyph =
font->font_driver->get_glyph(font->font_data, utf8_walk(&msg_tmp)); font->font_driver->get_glyph(font->font_data, code);
if (!glyph) /* Do something smarter here ... */ if (!glyph) /* Do something smarter here ... */
glyph = font->font_driver->get_glyph(font->font_data, '?'); glyph = font->font_driver->get_glyph(font->font_data, '?');
@ -300,9 +305,13 @@ static void gl_raster_font_render_line(
{ {
int off_x, off_y, tex_x, tex_y, width, height; int off_x, off_y, tex_x, tex_y, width, height;
const char *msg_tmp = &msg[i]; const char *msg_tmp = &msg[i];
unsigned code = utf8_walk(&msg_tmp);
unsigned skip = msg_tmp - &msg[i];
if (skip > 1) i += skip - 1;
const struct font_glyph *glyph = const struct font_glyph *glyph =
font->font_driver->get_glyph(font->font_data, utf8_walk(&msg_tmp)); font->font_driver->get_glyph(font->font_data, code);
if (!glyph) /* Do something smarter here ... */ if (!glyph) /* Do something smarter here ... */
glyph = font->font_driver->get_glyph(font->font_data, '?'); glyph = font->font_driver->get_glyph(font->font_data, '?');
@ -364,7 +373,7 @@ static void gl_raster_font_render_message(
/* If the font height is not supported just draw as usual */ /* If the font height is not supported just draw as usual */
if (!font->font_driver->get_line_height) if (!font->font_driver->get_line_height)
{ {
gl_raster_font_render_line(font, msg, utf8len(msg), gl_raster_font_render_line(font, msg, strlen(msg),
scale, color, pos_x, pos_y, text_align); scale, color, pos_x, pos_y, text_align);
return; return;
} }
@ -388,7 +397,7 @@ static void gl_raster_font_render_message(
} }
else else
{ {
unsigned msg_len = utf8len(msg); unsigned msg_len = strlen(msg);
gl_raster_font_render_line(font, msg, msg_len, scale, color, pos_x, gl_raster_font_render_line(font, msg, msg_len, scale, color, pos_x,
pos_y - (float)lines*line_height, text_align); pos_y - (float)lines*line_height, text_align);
break; break;