mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-08-27 17:11:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't bother re-encoding Latin1 characters in the ASCII range

Browse Source 
(cherry picked from commit 6150b5b3cb)
This commit is contained in:
Sam Lantinga
2023-06-04 05:37:06 -07:00
parent 2660da6f5c
commit 4700fbcbdf
3 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/video/x11/SDL_x11events.c
View File

@@ -740,10 +740,22 @@ static Bool isReparentNotify(Display *display, XEvent *ev, XPointer arg)
ev->xreparent.serial == unmap->serial;
}
static SDL_bool IsHighLatin1(const char *string, int length)
{
while (length-- > 0) {
Uint8 ch = (Uint8)*string;
if (ch >= 0x80) {
return SDL_TRUE;
}
++string;
}
return SDL_FALSE;
}
static int XLookupStringAsUTF8(XKeyEvent *event_struct, char *buffer_return, int bytes_buffer, KeySym *keysym_return, XComposeStatus *status_in_out)
{
int result = X11_XLookupString(event_struct, buffer_return, bytes_buffer, keysym_return, status_in_out);
if (result > 0 && !SDL_utf8valid(buffer_return, (size_t)result)) {
if (IsHighLatin1(buffer_return, result)) {
char *utf8_text = SDL_iconv_string("UTF-8", "ISO-8859-1", buffer_return, result);
if (utf8_text) {
SDL_strlcpy(buffer_return, utf8_text, bytes_buffer);