Mercurial > sdl-ios-xcode
annotate include/SDL_config_macosx.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 | a1b03ba2fcd0 |
children | 892623cfee40 |
rev | line source |
---|---|
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
1 /* |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
2 SDL - Simple DirectMedia Layer |
4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
4 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
5 This library is free software; you can redistribute it and/or |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
7 License as published by the Free Software Foundation; either |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
9 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
10 This library is distributed in the hope that it will be useful, |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
11 but WITHOUT ANY WARRANTY; without even the implied warranty of |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
13 Lesser General Public License for more details. |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
14 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
18 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
19 Sam Lantinga |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
20 slouken@libsdl.org |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
21 */ |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
22 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
23 #ifndef _SDL_config_macosx_h |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
24 #define _SDL_config_macosx_h |
1608
d951a5afaf07
A less rude way of doing the same thing...
Sam Lantinga <slouken@libsdl.org>
parents:
1607
diff
changeset
|
25 |
d951a5afaf07
A less rude way of doing the same thing...
Sam Lantinga <slouken@libsdl.org>
parents:
1607
diff
changeset
|
26 #include "SDL_platform.h" |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
27 |
3925
78ff7d10dbb5
From: Laurence Passmore
Ryan C. Gordon <icculus@icculus.org>
parents:
1804
diff
changeset
|
28 /* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */ |
78ff7d10dbb5
From: Laurence Passmore
Ryan C. Gordon <icculus@icculus.org>
parents:
1804
diff
changeset
|
29 #include <AvailabilityMacros.h> |
78ff7d10dbb5
From: Laurence Passmore
Ryan C. Gordon <icculus@icculus.org>
parents:
1804
diff
changeset
|
30 |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
31 /* This is a set of defines to configure the SDL features */ |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
32 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
33 #define SDL_HAS_64BIT_TYPE 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
34 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
35 /* Useful headers */ |
1749
18e44c267283
We want to wrap HAVE_ALLOCA_H, not HAVE_ALLOCA. :)
Sam Lantinga <slouken@libsdl.org>
parents:
1741
diff
changeset
|
36 /* If we specified an SDK or have a post-PowerPC chip, then alloca.h exists. */ |
18e44c267283
We want to wrap HAVE_ALLOCA_H, not HAVE_ALLOCA. :)
Sam Lantinga <slouken@libsdl.org>
parents:
1741
diff
changeset
|
37 #if ( (MAC_OS_X_VERSION_MIN_REQUIRED >= 1030) || (!defined(__POWERPC__)) ) |
1479 | 38 #define HAVE_ALLOCA_H 1 |
1749
18e44c267283
We want to wrap HAVE_ALLOCA_H, not HAVE_ALLOCA. :)
Sam Lantinga <slouken@libsdl.org>
parents:
1741
diff
changeset
|
39 #endif |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
40 #define HAVE_SYS_TYPES_H 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
41 #define HAVE_STDIO_H 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
42 #define STDC_HEADERS 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
43 #define HAVE_STRING_H 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
44 #define HAVE_INTTYPES_H 1 |
1479 | 45 #define HAVE_STDINT_H 1 |
46 #define HAVE_CTYPE_H 1 | |
47 #define HAVE_MATH_H 1 | |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
48 #define HAVE_SIGNAL_H 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
49 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
50 /* C library functions */ |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
51 #define HAVE_MALLOC 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
52 #define HAVE_CALLOC 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
53 #define HAVE_REALLOC 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
54 #define HAVE_FREE 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
55 #define HAVE_ALLOCA 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
56 #define HAVE_GETENV 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
57 #define HAVE_PUTENV 1 |
1479 | 58 #define HAVE_UNSETENV 1 |
59 #define HAVE_QSORT 1 | |
60 #define HAVE_ABS 1 | |
61 #define HAVE_BCOPY 1 | |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
62 #define HAVE_MEMSET 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
63 #define HAVE_MEMCPY 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
64 #define HAVE_MEMMOVE 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
65 #define HAVE_MEMCMP 1 |
1479 | 66 #define HAVE_STRLEN 1 |
67 #define HAVE_STRLCPY 1 | |
68 #define HAVE_STRLCAT 1 | |
69 #define HAVE_STRDUP 1 | |
70 #define HAVE_STRCHR 1 | |
71 #define HAVE_STRRCHR 1 | |
72 #define HAVE_STRSTR 1 | |
73 #define HAVE_STRTOL 1 | |
74 #define HAVE_STRTOUL 1 | |
75 #define HAVE_STRTOLL 1 | |
76 #define HAVE_STRTOULL 1 | |
77 #define HAVE_STRTOD 1 | |
78 #define HAVE_ATOI 1 | |
79 #define HAVE_ATOF 1 | |
80 #define HAVE_STRCMP 1 | |
81 #define HAVE_STRNCMP 1 | |
82 #define HAVE_STRCASECMP 1 | |
1517
39f6ad4693a5
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1492
diff
changeset
|
83 #define HAVE_STRNCASECMP 1 |
1479 | 84 #define HAVE_SSCANF 1 |
85 #define HAVE_SNPRINTF 1 | |
86 #define HAVE_VSNPRINTF 1 | |
87 #define HAVE_SIGACTION 1 | |
88 #define HAVE_SETJMP 1 | |
89 #define HAVE_NANOSLEEP 1 | |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
90 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
91 /* Enable various audio drivers */ |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
92 #define SDL_AUDIO_DRIVER_COREAUDIO 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
93 #define SDL_AUDIO_DRIVER_SNDMGR 1 |
1532
30f189cdd82b
Implemented dummy audio driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1517
diff
changeset
|
94 #define SDL_AUDIO_DRIVER_DISK 1 |
30f189cdd82b
Implemented dummy audio driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1517
diff
changeset
|
95 #define SDL_AUDIO_DRIVER_DUMMY 1 |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
96 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
97 /* Enable various cdrom drivers */ |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
98 #define SDL_CDROM_MACOSX 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
99 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
100 /* Enable various input drivers */ |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
101 #define SDL_JOYSTICK_IOKIT 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
102 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
103 /* Enable various shared object loading systems */ |
1638
ebd1aedb1292
Miscellaneous Mac OS X fixes
Sam Lantinga <slouken@libsdl.org>
parents:
1608
diff
changeset
|
104 #ifdef __ppc__ |
ebd1aedb1292
Miscellaneous Mac OS X fixes
Sam Lantinga <slouken@libsdl.org>
parents:
1608
diff
changeset
|
105 /* For Mac OS X 10.2 compatibility */ |
ebd1aedb1292
Miscellaneous Mac OS X fixes
Sam Lantinga <slouken@libsdl.org>
parents:
1608
diff
changeset
|
106 #define SDL_LOADSO_DLCOMPAT 1 |
ebd1aedb1292
Miscellaneous Mac OS X fixes
Sam Lantinga <slouken@libsdl.org>
parents:
1608
diff
changeset
|
107 #else |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
108 #define SDL_LOADSO_DLOPEN 1 |
1638
ebd1aedb1292
Miscellaneous Mac OS X fixes
Sam Lantinga <slouken@libsdl.org>
parents:
1608
diff
changeset
|
109 #endif |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
110 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
111 /* Enable various threading systems */ |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
112 #define SDL_THREAD_PTHREAD 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
113 #define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
114 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
115 /* Enable various timer systems */ |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
116 #define SDL_TIMER_UNIX 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
117 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
118 /* Enable various video drivers */ |
1489 | 119 #define SDL_VIDEO_DRIVER_DUMMY 1 |
3926
9785a5be718e
Fixed Mac OS X config header when compiling with -Wundef.
Ryan C. Gordon <icculus@icculus.org>
parents:
3925
diff
changeset
|
120 #if ((defined TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON)) |
1804 | 121 #define SDL_VIDEO_DRIVER_TOOLBOX 1 |
122 #else | |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
123 #define SDL_VIDEO_DRIVER_QUARTZ 1 |
1804 | 124 #endif |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
125 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
126 /* Enable OpenGL support */ |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
127 #define SDL_VIDEO_OPENGL 1 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
128 |
4139
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
3926
diff
changeset
|
129 /* Disable screensaver */ |
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
3926
diff
changeset
|
130 #define SDL_VIDEO_DISABLE_SCREENSAVER 1 |
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
3926
diff
changeset
|
131 |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
132 /* Enable assembly routines */ |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
133 #define SDL_ASSEMBLY_ROUTINES 1 |
1478
fc308f08b5f7
Only use Altivec on PowerPC architecture
Sam Lantinga <slouken@libsdl.org>
parents:
1424
diff
changeset
|
134 #ifdef __ppc__ |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
135 #define SDL_ALTIVEC_BLITTERS 1 |
1478
fc308f08b5f7
Only use Altivec on PowerPC architecture
Sam Lantinga <slouken@libsdl.org>
parents:
1424
diff
changeset
|
136 #endif |
1422
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
137 |
d2ee8da60262
Added pre-configured versions of SDL_config.h for various platforms
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
138 #endif /* _SDL_config_macosx_h */ |