Skip to content

Commit

Permalink
Significantly improved XIM support.
Browse files Browse the repository at this point in the history
   Fixes Bugzilla #429.


Selected notes from the patch's README:

= FIXES =

This patch fixes the above issues as follows.

== X11 events ==

Moved XFilterEvent just after XNextEvent so that all events are passed
to it.  Also, XFilterEvent will receive masks indicated by IM through
XNFilterEvents IC value as well as masks surpplied by SDL.

X11_KeyRepeat is called between XNextEvent and XFilterEvent, after
testing an event is a KeyRelease.  I'm not 100% comfortable to do so,
but I couldn't find a better timing to call it, and use of the
function is inevitable.

== Xutf8LookupString ==

Used a longer buffer to receive UTF-8 string.  If it is insufficient,
a dynamic storage of the requested size will be allocated.  The
initial size of the buffer is set to 32, because the Japanese text
converted from the most widely used benchmark key sequence for
Japanese IM, "WATASHINONAMAEHANAKANODESU." has ten Japanese characters
in it, that occupies 30 bytes when encoded in UTF-8.

== SDL_keysym.unicode ==

On Windows version of SDL implementation, SDL_keysym.unicode stores
UTF-16 encoded unicode characters, one UTF-16 encoding unit per an SDL
event.  A Unicode supplementary characters are sent to an application
as two events.  (One with a high surrogate and another with a low
surrogate.)  The behavior seems reasonable since it is upward
compatible with existing handling of BMP characters.

I wrote a UTF-8 to UTF-16 conversion function for the purpose.  It is
designed with the execution speed in mind, having a minimum set of
features that my patch requires.
  • Loading branch information
icculus committed Jun 25, 2007
1 parent f169feb commit 1e911c3
Show file tree
Hide file tree
Showing 5 changed files with 423 additions and 37 deletions.
4 changes: 4 additions & 0 deletions src/video/x11/SDL_x11dyn.c
Expand Up @@ -98,6 +98,7 @@ static void X11_GetSym(const char *fnname, int *rc, void **fn)
/* Annoying varargs entry point... */
#ifdef X_HAVE_UTF8_STRING
XIC (*pXCreateIC)(XIM,...) = NULL;
char *(*pXGetICValues)(XIC, ...) = NULL;
#endif

/* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */
Expand Down Expand Up @@ -127,6 +128,7 @@ void SDL_X11_UnloadSymbols(void)

#ifdef X_HAVE_UTF8_STRING
pXCreateIC = NULL;
pXGetICValues = NULL;
#endif

for (i = 0; i < SDL_TABLESIZE(x11libs); i++) {
Expand Down Expand Up @@ -163,6 +165,7 @@ int SDL_X11_LoadSymbols(void)

#ifdef X_HAVE_UTF8_STRING
X11_GetSym("XCreateIC",&SDL_X11_HAVE_UTF8,(void **)&pXCreateIC);
X11_GetSym("XGetICValues",&SDL_X11_HAVE_UTF8,(void **)&pXGetICValues);
#endif

if (SDL_X11_HAVE_BASEXLIB) { /* all required symbols loaded. */
Expand All @@ -178,6 +181,7 @@ int SDL_X11_LoadSymbols(void)
#endif
#ifdef X_HAVE_UTF8_STRING
pXCreateIC = XCreateIC;
pXGetICValues = XGetICValues;
#endif
#endif

Expand Down
1 change: 1 addition & 0 deletions src/video/x11/SDL_x11dyn.h
Expand Up @@ -68,6 +68,7 @@ void SDL_X11_UnloadSymbols(void);
/* That's really annoying...make this a function pointer no matter what. */
#ifdef X_HAVE_UTF8_STRING
extern XIC (*pXCreateIC)(XIM,...);
extern char *(*pXGetICValues)(XIC, ...);
#endif

/* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */
Expand Down

0 comments on commit 1e911c3

Please sign in to comment.