Mercurial > sdl-ios-xcode
annotate src/timer/beos/SDL_systimer.c @ 983:7f08bd66f1ca
Date: Fri, 19 Nov 2004 06:23:53 -0800 (PST)
From: Eric Wing
Subject: OS X Mouse inversion problem fix (again)
Here's yet another patch for the OS X mouse inversion
problem. This should fix the problem once and for all.
I know I've said this before, but *This time for
sure!* :)
If you recall, my last patch broke the non-OpenGL
windowed code and caused the inversion to occur there
instead. Max submitted a patch that partially reverted
the changes back which included the os version hack
which is currently the most recent CVS.
Aaron Sullivan identified and reported to the mailing
list the other day, that the last partial regression
of the code broke OS X 10.2. Looking over the results,
I'm thinking that I was slightly more successful than
I thought at unifying the code. I think I was trying
to unify the code base for OpenGL and non-OpenGL
windowed modes for all versions of the OS. It looks
like I failed at at unifying the OpenGL and non-OpenGL
code, but I did succeed at unifying the OS versions.
Thus, we no longer need the hack for the OS version
checks. The partial regression still included an OS
check which is what broke things for < 10.3.
Attached is the patch for SDL_QuartzWM.m. It basically
is a half-line change that removes one of the two
checks that decides if the mouse coordinates need to
be inverted, i.e:
if (system_version >= 0x1030 &&
(SDL_VideoSurface->flags & SDL_OPENGL) )
becomes this:
if(SDL_VideoSurface->flags & SDL_OPENGL)
With Aaron's outstanding help, we have collectively
tested:
windowed OpenGL
windowed non-OpenGL
fullscreen OpenGL
fullscreen non-OpenGL
under OS X 10.2 (Jaguar), 10.3 (Panther), and 10.4
(Tiger).
We don't have access to 10.0 or 10.1, but since the
original problem didn't materialize until 10.3, I'm
hopeful that testing 10.2 is sufficient. And now that
the code is uniform, I'm also hoping we'll be safe
moving forward to deal with future revisions of the OS
with this issue.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 21 Nov 2004 00:57:47 +0000 |
| parents | b8d311d90021 |
| children | c9b51268668f |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
3 Copyright (C) 1997-2004 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 | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 #include <be/kernel/OS.h> | |
| 29 | |
| 30 #include "SDL_thread.h" | |
| 31 #include "SDL_timer.h" | |
| 32 #include "SDL_error.h" | |
| 33 #include "SDL_timer_c.h" | |
| 34 | |
| 35 static bigtime_t start; | |
| 36 | |
| 37 void SDL_StartTicks(void) | |
| 38 { | |
| 39 /* Set first ticks value */ | |
| 40 start = system_time(); | |
| 41 } | |
| 42 | |
| 43 Uint32 SDL_GetTicks(void) | |
| 44 { | |
| 45 return((system_time()-start)/1000); | |
| 46 } | |
| 47 | |
| 48 void SDL_Delay(Uint32 ms) | |
| 49 { | |
| 50 snooze(ms*1000); | |
| 51 } | |
| 52 | |
| 53 /* Data to handle a single periodic alarm */ | |
| 54 static int timer_alive = 0; | |
| 55 static SDL_Thread *timer = NULL; | |
| 56 | |
| 57 static int RunTimer(void *unused) | |
| 58 { | |
| 59 while ( timer_alive ) { | |
| 60 if ( SDL_timer_running ) { | |
| 61 SDL_ThreadedTimerCheck(); | |
| 62 } | |
| 63 SDL_Delay(10); | |
| 64 } | |
| 65 return(0); | |
| 66 } | |
| 67 | |
| 68 /* This is only called if the event thread is not running */ | |
| 69 int SDL_SYS_TimerInit(void) | |
| 70 { | |
| 71 timer_alive = 1; | |
| 72 timer = SDL_CreateThread(RunTimer, NULL); | |
| 73 if ( timer == NULL ) | |
| 74 return(-1); | |
| 75 return(SDL_SetTimerThreaded(1)); | |
| 76 } | |
| 77 | |
| 78 void SDL_SYS_TimerQuit(void) | |
| 79 { | |
| 80 timer_alive = 0; | |
| 81 if ( timer ) { | |
| 82 SDL_WaitThread(timer, NULL); | |
| 83 timer = NULL; | |
| 84 } | |
| 85 } | |
| 86 | |
| 87 int SDL_SYS_StartTimer(void) | |
| 88 { | |
| 89 SDL_SetError("Internal logic error: BeOS uses threaded timer"); | |
| 90 return(-1); | |
| 91 } | |
| 92 | |
| 93 void SDL_SYS_StopTimer(void) | |
| 94 { | |
| 95 return; | |
| 96 } |