Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-22 16:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix XBufferOverflow handling for XIM input

Browse Source
This commit is contained in:
Camilla Berglund
2015-10-09 13:37:44 +02:00
parent 87ad8c0561
commit 0d759c8c1a
2 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/x11_window.c
+45 -16
View File
@@ -921,31 +921,60 @@ static void processEvent(XEvent *event)
if (!filtered)
{
int count;
Status status;
#if defined(X_HAVE_UTF8_STRING)
Status status;
char buffer[96];
const char* c = buffer;
char* chars = buffer;
const int count = Xutf8LookupString(window->x11.ic,
&event->xkey,
buffer, sizeof(buffer),
NULL, &status);
count = Xutf8LookupString(window->x11.ic,
&event->xkey,
buffer, sizeof(buffer),
NULL, &status);
while (c - buffer < count)
_glfwInputChar(window, decodeUTF8(&c), mods, plain);
if (status == XBufferOverflow)
{
chars = calloc(count, 1);
count = Xutf8LookupString(window->x11.ic,
&event->xkey,
chars, count,
NULL, &status);
}
if (status == XLookupChars || status == XLookupBoth)
{
const char* c = chars;
while (c - chars < count)
_glfwInputChar(window, decodeUTF8(&c), mods, plain);
}
#else
int i;
Status status;
wchar_t buffer[16];
wchar_t* chars = buffer;
const int count = XwcLookupString(window->x11.ic,
&event->xkey,
buffer, sizeof(buffer),
NULL, &status);
count = XwcLookupString(window->x11.ic,
&event->xkey,
buffer, sizeof(buffer) / sizeof(wchar_t),
NULL, &status);
for (i = 0; i < count; i++)
_glfwInputChar(window, buffer[i], mods, plain);
if (status == XBufferOverflow)
{
chars = calloc(count, sizeof(wchar_t));
count = XwcLookupString(window->x11.ic,
&event->xkey,
chars, count,
NULL, &status);
}
if (status == XLookupChars || status == XLookupBoth)
{
int i;
for (i = 0; i < count; i++)
_glfwInputChar(window, chars[i], mods, plain);
}
#endif
if (chars != buffer)
free(chars);
}
}
else