Mercurial > sdl-ios-xcode
view src/video/ggi/SDL_ggikeys.h @ 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 | 74212992fb08 |
children | 782fd950bd46 |
line wrap: on
line source
#define SCANCODE_ESCAPE 1 #define SCANCODE_1 2 #define SCANCODE_2 3 #define SCANCODE_3 4 #define SCANCODE_4 5 #define SCANCODE_5 6 #define SCANCODE_6 7 #define SCANCODE_7 8 #define SCANCODE_8 9 #define SCANCODE_9 10 #define SCANCODE_0 11 #define SCANCODE_MINUS 12 #define SCANCODE_EQUAL 13 #define SCANCODE_BACKSPACE 14 #define SCANCODE_TAB 15 #define SCANCODE_Q 16 #define SCANCODE_W 17 #define SCANCODE_E 18 #define SCANCODE_R 19 #define SCANCODE_T 20 #define SCANCODE_Y 21 #define SCANCODE_U 22 #define SCANCODE_I 23 #define SCANCODE_O 24 #define SCANCODE_P 25 #define SCANCODE_BRACKET_LEFT 26 #define SCANCODE_BRACKET_RIGHT 27 #define SCANCODE_ENTER 28 #define SCANCODE_LEFTCONTROL 29 #define SCANCODE_A 30 #define SCANCODE_S 31 #define SCANCODE_D 32 #define SCANCODE_F 33 #define SCANCODE_G 34 #define SCANCODE_H 35 #define SCANCODE_J 36 #define SCANCODE_K 37 #define SCANCODE_L 38 #define SCANCODE_SEMICOLON 39 #define SCANCODE_APOSTROPHE 40 #define SCANCODE_GRAVE 41 #define SCANCODE_LEFTSHIFT 42 #define SCANCODE_BACKSLASH 43 #define SCANCODE_Z 44 #define SCANCODE_X 45 #define SCANCODE_C 46 #define SCANCODE_V 47 #define SCANCODE_B 48 #define SCANCODE_N 49 #define SCANCODE_M 50 #define SCANCODE_COMMA 51 #define SCANCODE_PERIOD 52 #define SCANCODE_SLASH 53 #define SCANCODE_RIGHTSHIFT 54 #define SCANCODE_KEYPADMULTIPLY 55 #define SCANCODE_LEFTALT 56 #define SCANCODE_SPACE 57 #define SCANCODE_CAPSLOCK 58 #define SCANCODE_F1 59 #define SCANCODE_F2 60 #define SCANCODE_F3 61 #define SCANCODE_F4 62 #define SCANCODE_F5 63 #define SCANCODE_F6 64 #define SCANCODE_F7 65 #define SCANCODE_F8 66 #define SCANCODE_F9 67 #define SCANCODE_F10 68 #define SCANCODE_NUMLOCK 69 #define SCANCODE_SCROLLLOCK 70 #define SCANCODE_KEYPAD7 71 #define SCANCODE_CURSORUPLEFT 71 #define SCANCODE_KEYPAD8 72 #define SCANCODE_CURSORUP 72 #define SCANCODE_KEYPAD9 73 #define SCANCODE_CURSORUPRIGHT 73 #define SCANCODE_KEYPADMINUS 74 #define SCANCODE_KEYPAD4 75 #define SCANCODE_CURSORLEFT 75 #define SCANCODE_KEYPAD5 76 #define SCANCODE_KEYPAD6 77 #define SCANCODE_CURSORRIGHT 77 #define SCANCODE_KEYPADPLUS 78 #define SCANCODE_KEYPAD1 79 #define SCANCODE_CURSORDOWNLEFT 79 #define SCANCODE_KEYPAD2 80 #define SCANCODE_CURSORDOWN 80 #define SCANCODE_KEYPAD3 81 #define SCANCODE_CURSORDOWNRIGHT 81 #define SCANCODE_KEYPAD0 82 #define SCANCODE_KEYPADPERIOD 83 #define SCANCODE_LESS 86 #define SCANCODE_F11 87 #define SCANCODE_F12 88 #define SCANCODE_KEYPADENTER 96 #define SCANCODE_RIGHTCONTROL 97 #define SCANCODE_CONTROL 97 #define SCANCODE_KEYPADDIVIDE 98 #define SCANCODE_PRINTSCREEN 99 #define SCANCODE_RIGHTALT 100 #define SCANCODE_BREAK 101 /* Beware: is 119 */ #define SCANCODE_BREAK_ALTERNATIVE 119 /* on some keyboards! */ #define SCANCODE_HOME 102 #define SCANCODE_CURSORBLOCKUP 90 /* Cursor key block */ #define SCANCODE_PAGEUP 104 #define SCANCODE_CURSORBLOCKLEFT 92 /* Cursor key block */ #define SCANCODE_CURSORBLOCKRIGHT 94 /* Cursor key block */ #define SCANCODE_END 107 #define SCANCODE_CURSORBLOCKDOWN 108 /* Cursor key block */ #define SCANCODE_PAGEDOWN 109 #define SCANCODE_INSERT 110 #define SCANCODE_REMOVE 111 #define SCANCODE_RIGHTWIN 126 #define SCANCODE_LEFTWIN 125