comparison src/video/x11/SDL_x11dyn.c @ 3978:b966761fef6c SDL-1.2

Significantly improved XIM support. 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.
author Ryan C. Gordon <icculus@icculus.org>
date Mon, 25 Jun 2007 19:58:32 +0000
parents 85b6fb6a5e3c
children a1b03ba2fcd0
comparison
equal deleted inserted replaced
3977:722db1bd733c 3978:b966761fef6c
96 #endif /* SDL_VIDEO_DRIVER_X11_DYNAMIC */ 96 #endif /* SDL_VIDEO_DRIVER_X11_DYNAMIC */
97 97
98 /* Annoying varargs entry point... */ 98 /* Annoying varargs entry point... */
99 #ifdef X_HAVE_UTF8_STRING 99 #ifdef X_HAVE_UTF8_STRING
100 XIC (*pXCreateIC)(XIM,...) = NULL; 100 XIC (*pXCreateIC)(XIM,...) = NULL;
101 char *(*pXGetICValues)(XIC, ...) = NULL;
101 #endif 102 #endif
102 103
103 /* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */ 104 /* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */
104 #define SDL_X11_MODULE(modname) int SDL_X11_HAVE_##modname = 1; 105 #define SDL_X11_MODULE(modname) int SDL_X11_HAVE_##modname = 1;
105 #define SDL_X11_SYM(rc,fn,params,args,ret) 106 #define SDL_X11_SYM(rc,fn,params,args,ret)
125 #undef SDL_X11_MODULE 126 #undef SDL_X11_MODULE
126 #undef SDL_X11_SYM 127 #undef SDL_X11_SYM
127 128
128 #ifdef X_HAVE_UTF8_STRING 129 #ifdef X_HAVE_UTF8_STRING
129 pXCreateIC = NULL; 130 pXCreateIC = NULL;
131 pXGetICValues = NULL;
130 #endif 132 #endif
131 133
132 for (i = 0; i < SDL_TABLESIZE(x11libs); i++) { 134 for (i = 0; i < SDL_TABLESIZE(x11libs); i++) {
133 if (x11libs[i].lib != NULL) { 135 if (x11libs[i].lib != NULL) {
134 SDL_UnloadObject(x11libs[i].lib); 136 SDL_UnloadObject(x11libs[i].lib);
161 #undef SDL_X11_MODULE 163 #undef SDL_X11_MODULE
162 #undef SDL_X11_SYM 164 #undef SDL_X11_SYM
163 165
164 #ifdef X_HAVE_UTF8_STRING 166 #ifdef X_HAVE_UTF8_STRING
165 X11_GetSym("XCreateIC",&SDL_X11_HAVE_UTF8,(void **)&pXCreateIC); 167 X11_GetSym("XCreateIC",&SDL_X11_HAVE_UTF8,(void **)&pXCreateIC);
168 X11_GetSym("XGetICValues",&SDL_X11_HAVE_UTF8,(void **)&pXGetICValues);
166 #endif 169 #endif
167 170
168 if (SDL_X11_HAVE_BASEXLIB) { /* all required symbols loaded. */ 171 if (SDL_X11_HAVE_BASEXLIB) { /* all required symbols loaded. */
169 SDL_ClearError(); 172 SDL_ClearError();
170 } else { 173 } else {
176 #if DEBUG_DYNAMIC_X11 179 #if DEBUG_DYNAMIC_X11
177 printf("X11: No dynamic X11 support in this build of SDL.\n"); 180 printf("X11: No dynamic X11 support in this build of SDL.\n");
178 #endif 181 #endif
179 #ifdef X_HAVE_UTF8_STRING 182 #ifdef X_HAVE_UTF8_STRING
180 pXCreateIC = XCreateIC; 183 pXCreateIC = XCreateIC;
184 pXGetICValues = XGetICValues;
181 #endif 185 #endif
182 #endif 186 #endif
183 187
184 return rc; 188 return rc;
185 } 189 }