Mercurial > sdl-ios-xcode
comparison src/video/x11/SDL_x11sym.h @ 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 | c546353b1ad4 |
children | 5368d56af4da |
comparison
equal
deleted
inserted
replaced
3977:722db1bd733c | 3978:b966761fef6c |
---|---|
141 SDL_X11_SYM(int,Xutf8LookupString,(XIC a,XKeyPressedEvent* b,char* c,int d,KeySym* e,Status* f),(a,b,c,d,e,f),return) | 141 SDL_X11_SYM(int,Xutf8LookupString,(XIC a,XKeyPressedEvent* b,char* c,int d,KeySym* e,Status* f),(a,b,c,d,e,f),return) |
142 /*SDL_X11_SYM(XIC,XCreateIC,(XIM, ...),return) !!! ARGH! */ | 142 /*SDL_X11_SYM(XIC,XCreateIC,(XIM, ...),return) !!! ARGH! */ |
143 SDL_X11_SYM(void,XDestroyIC,(XIC a),(a),) | 143 SDL_X11_SYM(void,XDestroyIC,(XIC a),(a),) |
144 SDL_X11_SYM(void,XSetICFocus,(XIC a),(a),) | 144 SDL_X11_SYM(void,XSetICFocus,(XIC a),(a),) |
145 SDL_X11_SYM(void,XUnsetICFocus,(XIC a),(a),) | 145 SDL_X11_SYM(void,XUnsetICFocus,(XIC a),(a),) |
146 /*SDL_X11_SYM(char*,XGetICValues,(XIC a, ...),return)*/ | |
146 SDL_X11_SYM(XIM,XOpenIM,(Display* a,struct _XrmHashBucketRec* b,char* c,char* d),(a,b,c,d),return) | 147 SDL_X11_SYM(XIM,XOpenIM,(Display* a,struct _XrmHashBucketRec* b,char* c,char* d),(a,b,c,d),return) |
147 SDL_X11_SYM(Status,XCloseIM,(XIM a),(a),return) | 148 SDL_X11_SYM(Status,XCloseIM,(XIM a),(a),return) |
149 SDL_X11_SYM(char*,XSetLocaleModifiers,(_Xconst char* a),(a),return) | |
148 #endif | 150 #endif |
149 | 151 |
150 #ifndef NO_SHARED_MEMORY | 152 #ifndef NO_SHARED_MEMORY |
151 SDL_X11_MODULE(SHM) | 153 SDL_X11_MODULE(SHM) |
152 SDL_X11_SYM(Status,XShmAttach,(Display* a,XShmSegmentInfo* b),(a,b),return) | 154 SDL_X11_SYM(Status,XShmAttach,(Display* a,XShmSegmentInfo* b),(a,b),return) |