Mercurial > sdl-ios-xcode
annotate src/timer/macos/SDL_systimer.c @ 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 |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
2 SDL - Simple DirectMedia Layer |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
5 This library is free software; you can redistribute it and/or |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
7 License as published by the Free Software Foundation; either |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
10 This library is distributed in the hope that it will be useful, |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
11 but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
19 Sam Lantinga |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
20 slouken@libsdl.org |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
|
1635
92947e3a18db
Make sure code is only compiled if the appropriate subsystem is enabled
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
24 #ifdef SDL_TIMER_MACOS |
|
92947e3a18db
Make sure code is only compiled if the appropriate subsystem is enabled
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
25 |
| 0 | 26 #include <Types.h> |
| 27 #include <Timer.h> | |
| 28 #include <OSUtils.h> | |
| 29 #include <Gestalt.h> | |
| 30 #include <Processes.h> | |
| 31 | |
| 32 #include <LowMem.h> | |
| 33 | |
| 34 #include "SDL_timer.h" | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
35 #include "../SDL_timer_c.h" |
| 0 | 36 |
| 37 #include "FastTimes.h" | |
| 38 | |
|
1814
1834c192d89f
Fixed MacOS Classic build
Sam Lantinga <slouken@libsdl.org>
parents:
1810
diff
changeset
|
39 #if TARGET_API_MAC_CARBON |
| 1810 | 40 #define NewTimerProc NewTimerUPP |
| 41 #endif | |
| 42 | |
| 0 | 43 #define MS_PER_TICK (1000.0/60.0) /* MacOS tick = 1/60 second */ |
| 44 | |
| 45 | |
| 46 #define kTwoPower32 (4294967296.0) /* 2^32 */ | |
| 47 | |
| 48 static double start_tick; | |
| 49 static int is_fast_inited = 0; | |
| 50 | |
| 51 void SDL_StartTicks(void) | |
| 52 { | |
| 53 if ( ! is_fast_inited ) // important to check or FastTime may hang machine! | |
| 54 SDL_SYS_TimerInit(); | |
| 55 | |
| 56 start_tick = FastMicroseconds(); | |
| 57 } | |
| 58 | |
| 59 Uint32 SDL_GetTicks(void) | |
| 60 { | |
| 61 | |
| 62 if ( ! is_fast_inited ) | |
| 63 SDL_SYS_TimerInit(); | |
| 64 | |
| 65 return FastMilliseconds(); | |
| 66 } | |
| 67 | |
| 68 void SDL_Delay(Uint32 ms) | |
| 69 { | |
| 70 Uint32 stop, now; | |
| 71 | |
| 72 stop = SDL_GetTicks() + ms; | |
| 73 do { | |
|
1814
1834c192d89f
Fixed MacOS Classic build
Sam Lantinga <slouken@libsdl.org>
parents:
1810
diff
changeset
|
74 #if TARGET_API_MAC_CARBON |
| 1810 | 75 MPYield(); |
| 76 #else | |
| 0 | 77 SystemTask(); |
| 1810 | 78 #endif |
| 0 | 79 |
| 80 now = SDL_GetTicks(); | |
| 81 | |
| 82 } while ( stop > now ); | |
| 83 } | |
| 84 | |
| 85 /* | |
| 86 void SDL_StartTicks(void) | |
| 87 { | |
| 88 // FIXME: Should we implement a wrapping algorithm, like Win32? | |
| 89 } | |
| 90 | |
| 91 Uint32 SDL_GetTicks(void) | |
| 92 { | |
| 93 UnsignedWide ms; | |
| 94 | |
| 95 Microseconds (&ms); | |
| 96 | |
| 97 return ( ms.lo / 1000 ); | |
| 98 } | |
| 99 | |
| 100 void SDL_Delay(Uint32 ms) | |
| 101 { | |
| 102 | |
| 103 UnsignedWide microsecs; | |
| 104 UInt32 stop; | |
| 105 | |
| 106 Microseconds (µsecs); | |
| 107 | |
| 108 stop = microsecs.lo + (ms * 1000); | |
| 109 | |
| 110 while ( stop > microsecs.lo ) { | |
| 111 | |
| 112 SystemTask (); | |
| 113 | |
| 114 Microseconds (µsecs); | |
| 115 } | |
| 116 | |
| 117 }*/ | |
| 118 | |
| 119 /* Data to handle a single periodic alarm */ | |
| 120 typedef struct _ExtendedTimerRec | |
| 121 { | |
| 122 TMTask tmTask; | |
| 123 ProcessSerialNumber taskPSN; | |
| 124 } ExtendedTimerRec, *ExtendedTimerPtr; | |
| 125 | |
| 126 static ExtendedTimerRec gExtendedTimerRec; | |
| 127 | |
| 128 | |
| 129 int SDL_SYS_TimerInit(void) | |
| 130 { | |
| 131 FastInitialize (); | |
| 132 is_fast_inited = 1; | |
| 133 | |
| 134 return(0); | |
| 135 } | |
| 136 | |
| 137 void SDL_SYS_TimerQuit(void) | |
| 138 { | |
| 139 /* We don't need a cleanup? */ | |
| 140 return; | |
| 141 } | |
| 142 | |
| 143 /* Our Stub routine to set up and then call the real routine. */ | |
| 144 pascal void TimerCallbackProc(TMTaskPtr tmTaskPtr) | |
| 145 { | |
| 146 Uint32 ms; | |
| 147 | |
| 148 WakeUpProcess(&((ExtendedTimerPtr) tmTaskPtr)->taskPSN); | |
| 149 | |
| 150 ms = SDL_alarm_callback(SDL_alarm_interval); | |
| 151 if ( ms ) { | |
| 152 SDL_alarm_interval = ROUND_RESOLUTION(ms); | |
| 153 PrimeTime((QElemPtr)&gExtendedTimerRec.tmTask, | |
| 154 SDL_alarm_interval); | |
| 155 } else { | |
| 156 SDL_alarm_interval = 0; | |
| 157 } | |
| 158 } | |
| 159 | |
| 160 int SDL_SYS_StartTimer(void) | |
| 161 { | |
| 162 /* | |
| 163 * Configure the global structure that stores the timing information. | |
| 164 */ | |
| 165 gExtendedTimerRec.tmTask.qLink = NULL; | |
| 166 gExtendedTimerRec.tmTask.qType = 0; | |
| 167 gExtendedTimerRec.tmTask.tmAddr = NewTimerProc(TimerCallbackProc); | |
| 168 gExtendedTimerRec.tmTask.tmCount = 0; | |
| 169 gExtendedTimerRec.tmTask.tmWakeUp = 0; | |
| 170 gExtendedTimerRec.tmTask.tmReserved = 0; | |
| 171 GetCurrentProcess(&gExtendedTimerRec.taskPSN); | |
| 172 | |
| 173 /* Install the task record */ | |
| 174 InsXTime((QElemPtr)&gExtendedTimerRec.tmTask); | |
| 175 | |
| 176 /* Go! */ | |
| 177 PrimeTime((QElemPtr)&gExtendedTimerRec.tmTask, SDL_alarm_interval); | |
| 178 return(0); | |
| 179 } | |
| 180 | |
| 181 void SDL_SYS_StopTimer(void) | |
| 182 { | |
| 183 RmvTime((QElemPtr)&gExtendedTimerRec.tmTask); | |
| 184 } | |
|
1635
92947e3a18db
Make sure code is only compiled if the appropriate subsystem is enabled
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
185 |
|
92947e3a18db
Make sure code is only compiled if the appropriate subsystem is enabled
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
186 #endif /* SDL_TIMER_MACOS */ |