Mercurial > sdl-ios-xcode
annotate include/begin_code.h @ 4170:092c0bc69155 SDL-1.2
Fixed bug #618
Description From Tim Angus 2008-08-30 12:23:56 (-) [reply]
As we all know SDL 1.2 doesn't handle dead keys well since one key press
potentially equals two (or more) characters. For example, on many layouts,
keying <backquote>,<space> results in <no character>,<backquote><space>. Since
the unicode member of the SDL_keysym struct only has room for one character,
only one can be returned.
On Linux, the first character is returned. On Windows however, unless the exact
number of characters generated by the keypress is 1, nothing is returned. The
following patch addresses this inconsistency.
Updated patch which includes a further fix to the handling of the numpad when
numlock is on. This further fix is courtesy Amanieu d'Antras.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 13 Apr 2009 08:42:09 +0000 |
| parents | 7a4c511c980a |
| children | 430e6690c4cd |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
251
b8688cfdc232
Updated the headers with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
195
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 /* This file sets things up for C dynamic library function definitions, | |
| 24 static inlined functions, and structures aligned at 4-byte alignment. | |
| 25 If you don't like ugly C preprocessor code, don't look at this file. :) | |
| 26 */ | |
| 27 | |
| 28 /* This shouldn't be nested -- included it around code only. */ | |
| 29 #ifdef _begin_code_h | |
| 30 #error Nested inclusion of begin_code.h | |
| 31 #endif | |
| 32 #define _begin_code_h | |
| 33 | |
| 34 /* Some compilers use a special export keyword */ | |
| 35 #ifndef DECLSPEC | |
|
4164
7a4c511c980a
Date: Fri, 6 Mar 2009 12:41:17 -0800
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
36 # if defined(__BEOS__) || defined(__HAIKU__) |
| 0 | 37 # if defined(__GNUC__) |
| 38 # define DECLSPEC __declspec(dllexport) | |
| 39 # else | |
| 40 # define DECLSPEC __declspec(export) | |
| 41 # endif | |
|
1574
0fd72308659e
Default to use the visibility attribute, on gcc (is this okay?)
Sam Lantinga <slouken@libsdl.org>
parents:
1573
diff
changeset
|
42 # elif defined(__WIN32__) |
|
274
051b991765ba
David Snopek added Borland compiler support
Sam Lantinga <slouken@libsdl.org>
parents:
251
diff
changeset
|
43 # ifdef __BORLANDC__ |
|
051b991765ba
David Snopek added Borland compiler support
Sam Lantinga <slouken@libsdl.org>
parents:
251
diff
changeset
|
44 # ifdef BUILD_SDL |
|
636
d9c2ab142f2f
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
346
diff
changeset
|
45 # define DECLSPEC |
|
274
051b991765ba
David Snopek added Borland compiler support
Sam Lantinga <slouken@libsdl.org>
parents:
251
diff
changeset
|
46 # else |
|
1574
0fd72308659e
Default to use the visibility attribute, on gcc (is this okay?)
Sam Lantinga <slouken@libsdl.org>
parents:
1573
diff
changeset
|
47 # define DECLSPEC __declspec(dllimport) |
|
274
051b991765ba
David Snopek added Borland compiler support
Sam Lantinga <slouken@libsdl.org>
parents:
251
diff
changeset
|
48 # endif |
|
051b991765ba
David Snopek added Borland compiler support
Sam Lantinga <slouken@libsdl.org>
parents:
251
diff
changeset
|
49 # else |
|
051b991765ba
David Snopek added Borland compiler support
Sam Lantinga <slouken@libsdl.org>
parents:
251
diff
changeset
|
50 # define DECLSPEC __declspec(dllexport) |
|
051b991765ba
David Snopek added Borland compiler support
Sam Lantinga <slouken@libsdl.org>
parents:
251
diff
changeset
|
51 # endif |
|
1574
0fd72308659e
Default to use the visibility attribute, on gcc (is this okay?)
Sam Lantinga <slouken@libsdl.org>
parents:
1573
diff
changeset
|
52 # elif defined(__OS2__) |
| 1190 | 53 # ifdef __WATCOMC__ |
| 54 # ifdef BUILD_SDL | |
|
1574
0fd72308659e
Default to use the visibility attribute, on gcc (is this okay?)
Sam Lantinga <slouken@libsdl.org>
parents:
1573
diff
changeset
|
55 # define DECLSPEC __declspec(dllexport) |
| 1190 | 56 # else |
|
1574
0fd72308659e
Default to use the visibility attribute, on gcc (is this okay?)
Sam Lantinga <slouken@libsdl.org>
parents:
1573
diff
changeset
|
57 # define DECLSPEC |
|
0fd72308659e
Default to use the visibility attribute, on gcc (is this okay?)
Sam Lantinga <slouken@libsdl.org>
parents:
1573
diff
changeset
|
58 # endif |
| 1190 | 59 # else |
| 60 # define DECLSPEC | |
| 61 # endif | |
| 62 # else | |
|
1595
4aa7df2476e7
Only use the visibility attribute in gcc 4.0 or newer
Sam Lantinga <slouken@libsdl.org>
parents:
1574
diff
changeset
|
63 # if defined(__GNUC__) && __GNUC__ >= 4 |
|
1574
0fd72308659e
Default to use the visibility attribute, on gcc (is this okay?)
Sam Lantinga <slouken@libsdl.org>
parents:
1573
diff
changeset
|
64 # define DECLSPEC __attribute__ ((visibility("default"))) |
|
0fd72308659e
Default to use the visibility attribute, on gcc (is this okay?)
Sam Lantinga <slouken@libsdl.org>
parents:
1573
diff
changeset
|
65 # else |
|
0fd72308659e
Default to use the visibility attribute, on gcc (is this okay?)
Sam Lantinga <slouken@libsdl.org>
parents:
1573
diff
changeset
|
66 # define DECLSPEC |
|
0fd72308659e
Default to use the visibility attribute, on gcc (is this okay?)
Sam Lantinga <slouken@libsdl.org>
parents:
1573
diff
changeset
|
67 # endif |
| 0 | 68 # endif |
| 69 #endif | |
| 70 | |
|
337
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
71 /* By default SDL uses the C calling convention */ |
|
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
72 #ifndef SDLCALL |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1190
diff
changeset
|
73 #if defined(__WIN32__) && !defined(__GNUC__) |
|
337
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
74 #define SDLCALL __cdecl |
|
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
75 #else |
| 1190 | 76 #ifdef __OS2__ |
| 77 /* But on OS/2, we use the _System calling convention */ | |
| 78 /* to be compatible with every compiler */ | |
| 79 #define SDLCALL _System | |
| 80 #else | |
|
337
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
81 #define SDLCALL |
|
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
82 #endif |
| 1190 | 83 #endif |
|
337
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
84 #endif /* SDLCALL */ |
|
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
85 |
|
173
83018110dce8
Added initial support for EPOC/Symbian OS (thanks Hannu!)
Sam Lantinga <slouken@libsdl.org>
parents:
85
diff
changeset
|
86 #ifdef __SYMBIAN32__ |
| 3975 | 87 #ifndef EKA2 |
|
173
83018110dce8
Added initial support for EPOC/Symbian OS (thanks Hannu!)
Sam Lantinga <slouken@libsdl.org>
parents:
85
diff
changeset
|
88 #undef DECLSPEC |
|
83018110dce8
Added initial support for EPOC/Symbian OS (thanks Hannu!)
Sam Lantinga <slouken@libsdl.org>
parents:
85
diff
changeset
|
89 #define DECLSPEC |
| 3975 | 90 #elif !defined(__WINS__) |
| 91 #undef DECLSPEC | |
| 92 #define DECLSPEC __declspec(dllexport) | |
|
4091
98b219f9ff17
Removed some C++ style comments from the public headers.
Ryan C. Gordon <icculus@icculus.org>
parents:
3975
diff
changeset
|
93 #endif /* !EKA2 */ |
|
98b219f9ff17
Removed some C++ style comments from the public headers.
Ryan C. Gordon <icculus@icculus.org>
parents:
3975
diff
changeset
|
94 #endif /* __SYMBIAN32__ */ |
|
173
83018110dce8
Added initial support for EPOC/Symbian OS (thanks Hannu!)
Sam Lantinga <slouken@libsdl.org>
parents:
85
diff
changeset
|
95 |
| 0 | 96 /* Force structure packing at 4 byte alignment. |
| 97 This is necessary if the header is included in code which has structure | |
| 98 packing set to an alternate value, say for loading structures from disk. | |
| 99 The packing is reset to the previous value in close_code.h | |
| 100 */ | |
|
288
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
101 #if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__) |
| 0 | 102 #ifdef _MSC_VER |
| 103 #pragma warning(disable: 4103) | |
| 104 #endif | |
| 105 #ifdef __BORLANDC__ | |
| 106 #pragma nopackwarning | |
| 107 #endif | |
|
195
3669d47b07d3
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
189
diff
changeset
|
108 #pragma pack(push,4) |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1190
diff
changeset
|
109 #elif (defined(__MWERKS__) && defined(__MACOS__)) |
|
189
175917167aac
Date: Thu, 13 Sep 2001 14:14:42 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
187
diff
changeset
|
110 #pragma options align=mac68k4byte |
|
175917167aac
Date: Thu, 13 Sep 2001 14:14:42 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
187
diff
changeset
|
111 #pragma enumsalwaysint on |
| 0 | 112 #endif /* Compiler needs structure packing set */ |
| 113 | |
| 114 /* Set up compiler-specific options for inlining functions */ | |
| 115 #ifndef SDL_INLINE_OKAY | |
| 116 #ifdef __GNUC__ | |
| 117 #define SDL_INLINE_OKAY | |
| 118 #else | |
| 119 /* Add any special compiler-specific cases here */ | |
|
288
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
120 #if defined(_MSC_VER) || defined(__BORLANDC__) || \ |
|
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
121 defined(__DMC__) || defined(__SC__) || \ |
|
1019
e3b3130f3af8
Date: Fri, 31 Dec 2004 04:14:09 +0900
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
122 defined(__WATCOMC__) || defined(__LCC__) || \ |
| 3975 | 123 defined(__DECC) || defined(__EABI__) |
|
288
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
124 #ifndef __inline__ |
|
85
60c7960354e0
Added support for Visual C++ inline keyword
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
125 #define __inline__ __inline |
|
288
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
126 #endif |
|
85
60c7960354e0
Added support for Visual C++ inline keyword
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
127 #define SDL_INLINE_OKAY |
|
60c7960354e0
Added support for Visual C++ inline keyword
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
128 #else |
|
60c7960354e0
Added support for Visual C++ inline keyword
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
129 #if !defined(__MRC__) && !defined(_SGI_SOURCE) |
|
3965
19d708301fab
Make sure __inline__ isn't defined before #defining it, since some compilers
Ryan C. Gordon <icculus@icculus.org>
parents:
1621
diff
changeset
|
130 #ifndef __inline__ |
| 0 | 131 #define __inline__ inline |
|
3965
19d708301fab
Make sure __inline__ isn't defined before #defining it, since some compilers
Ryan C. Gordon <icculus@icculus.org>
parents:
1621
diff
changeset
|
132 #endif |
| 0 | 133 #define SDL_INLINE_OKAY |
| 134 #endif /* Not a funky compiler */ | |
|
85
60c7960354e0
Added support for Visual C++ inline keyword
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
135 #endif /* Visual C++ */ |
| 0 | 136 #endif /* GNU C */ |
| 137 #endif /* SDL_INLINE_OKAY */ | |
| 138 | |
| 139 /* If inlining isn't supported, remove "__inline__", turning static | |
| 140 inlined functions into static functions (resulting in code bloat | |
| 141 in all files which include the offending header files) | |
| 142 */ | |
| 143 #ifndef SDL_INLINE_OKAY | |
| 144 #define __inline__ | |
| 145 #endif | |
| 146 | |
|
288
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
147 /* Apparently this is needed by several Windows compilers */ |
|
346
a18ea34d9efe
Fixed precompiled headers on MacOS X
Sam Lantinga <slouken@libsdl.org>
parents:
337
diff
changeset
|
148 #if !defined(__MACH__) |
|
288
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
149 #ifndef NULL |
|
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
150 #ifdef __cplusplus |
|
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
151 #define NULL 0 |
|
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
152 #else |
|
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
153 #define NULL ((void *)0) |
|
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
154 #endif |
|
2f5a6062db86
Updated for Watcom C++ and LCC compilers
Sam Lantinga <slouken@libsdl.org>
parents:
274
diff
changeset
|
155 #endif /* NULL */ |
| 1621 | 156 #endif /* ! Mac OS X - breaks precompiled headers */ |