Mercurial > sdl-ios-xcode
view src/video/nds/SDL_ndsevents.c @ 4388:1524d3237820 SDL-1.2
Fixed bug #896
John Popplewell 2009-12-08 23:05:50 PST
Originally reported by AKFoerster on the mailing list.
Error decoding UTF8 Russian text to UTF-16LE on Windows, but specifically on
platforms without iconv support (the default on Windows).
Valid UTF8 characters are flagged as being overlong and then substituted by the
UNKNOWN_UNICODE character.
After studying the testiconv.c example program, reading the RFCs and putting
some printf statements in SDL_iconv.c the problem is in a test for 'Maximum
overlong sequences', specifically 4.2.1, which is carried out by the following
code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xCE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
Here is the 2-byte encoding of a character in range 00000080 - 000007FF
110xxxxx 10xxxxxx
The line in question is supposed to be checking for an overlong sequence which
would be less than
11000001 10111111
which should be represented as a single byte.
BUT, the mask value (0xCE) is wrong, it isn't checking the top-most bit:
11000001 value
11001110 mask (incorrect)
^
and should be (0xDE):
11000001 value
11011110 mask (correct)
making the above code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xDE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
I can supply a test program and/or a patch if required,
best regards,
John Popplewell
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Fri, 11 Dec 2009 08:00:57 +0000 |
| parents | a1b03ba2fcd0 |
| children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* Being a nds driver, there's no event stream. We just define stubs for most of the API. */ #include <nds.h> #include "SDL.h" #include "../../events/SDL_sysevents.h" #include "../../events/SDL_events_c.h" #include "SDL_ndsvideo.h" #include "SDL_ndsevents_c.h" static SDLKey keymap[NDS_NUMKEYS]; char keymem[NDS_NUMKEYS]; /* memorize states of buttons */ void NDS_PumpEvents(_THIS) { scanKeys(); int i; SDL_keysym keysym; keysym.mod=KMOD_NONE; for(i=0;i<NDS_NUMKEYS;i++) { keysym.scancode=i; keysym.sym=keymap[i]; if(keysHeld()&(1<<i) && !keymem[i]) { keymem[i]=1; //printf("key released %d\n",i); SDL_PrivateKeyboard(SDL_RELEASED, &keysym); } if(!(keysHeld()&(1<<i)) && keymem[i]) { keymem[i]=0; //printf("key pressed %d\n",i); SDL_PrivateKeyboard(SDL_PRESSED, &keysym); } } //touchPosition touch; //touch=touchReadXY(); //if (touch.px!=0 || touch.py!=0) // SDL_PrivateMouseMotion(SDL_PRESSED, 0, touch.px, touch.py); } void NDS_InitOSKeymap(_THIS) { SDL_memset(keymem,1,NDS_NUMKEYS); keymap[KEY_A]=SDLK_a; keymap[KEY_B]=SDLK_s; keymap[KEY_X]=SDLK_w; keymap[KEY_Y]=SDLK_d; keymap[KEY_L]=SDLK_q; keymap[KEY_R]=SDLK_e; keymap[KEY_UP]=SDLK_UP; keymap[KEY_DOWN]=SDLK_DOWN; keymap[KEY_LEFT]=SDLK_LEFT; keymap[KEY_RIGHT]=SDLK_RIGHT; keymap[KEY_SELECT]=SDLK_SPACE; keymap[KEY_START]=SDLK_RETURN; } /* end of SDL_gbaevents.c ... */