Mercurial > sdl-ios-xcode
view src/cdrom/macosx/SDLOSXCAGuard.c @ 4167:a6f635e5eaa6 SDL-1.2
Fixed bug #611
From Tim Angus 2008-08-12 11:18:06
I'm one of the maintainers of ioquake3.org, an updated version of the
Quake 3 engine. Relatively recently, we moved ioq3 to use SDL as a
replacement for 95% of the platform specific code that was there. On the
whole it's doing a great job but unfortunately since the move we've been
getting complaints about the quality of the mouse input on the Windows
platform to the point where for many the game is unplayable. Put in
other terms, the current stable SDL 1.2 is basically not fit for purpose
if you need high quality mouse input as you do in a first person shooter.
Over the weekend I decided to pull my finger out and actually figure out
what's going on. There are basically two major problems. Firstly, when
using the "windib" driver, mouse input is gathered via the WM_MOUSEMOVE
message. Googling for this indicates that often this is known to result
in "spurious" and/or "missing" mouse movement events; this is the
primary cause of the poor mouse input. The second problem is that the
"directx" driver does not work at all in combination with OpenGL meaning
that you can't use DirectInput if your application also uses OpenGL. In
other words you're locked into using the "windib" driver and its poor
mouse input.
In order to address these problems I've done the following:
* Remove WM_MOUSEMOVE based motion event generation and replace with
calls to GetCursorPos which seems much more reliable. In order to
achieve this I've moved mouse motion out into a separate function that
is called once per DIB_PumpEvents.
* Remove the restriction on the "directx" driver being inoperable in
combination with OpenGL. There is a bug for this issues that I've
hijacked to a certain extent
(http://bugzilla.libsdl.org/show_bug.cgi?id=265). I'm the first to admit
I don't really understand why this restriction is there in the first
place. The commit message for the bug fix that introduced this
restriction (r581) isn't very elaborate and I couldn't see any other bug
tracking the issue. If anyone has more information on the bug that was
avoided by r581 it would be helpful as I/someone could then look into
addressing the problem without disabling the "directx" driver.
* I've also removed the restriction on not being allowed to use
DirectInput in windowed mode. I couldn't see any reason for this, at
least not from our perspective. I have my suspicions that it'll be
something like matching up the cursor with the mouse coordinates...
* I bumped up the DirectInput API used to version 7 in order to get
access to mouse buttons 4-7. I've had to inject a little bit of the DX7
headers into SDL there as the MinGW ones aren't up to date in this respect.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Thu, 02 Apr 2009 04:43:36 +0000 |
parents | a1b03ba2fcd0 |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* Note: This file hasn't been modified so technically we have to keep the disclaimer :-( Copyright: © Copyright 2002 Apple Computer, Inc. All rights reserved. Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in consideration of your agreement to the following terms, and your use, installation, modification or redistribution of this Apple software constitutes acceptance of these terms. If you do not agree with these terms, please do not use, install, modify or redistribute this Apple software. In consideration of your agreement to abide by the following terms, and subject to these terms, Apple grants you a personal, non-exclusive license, under AppleÕs copyrights in this original Apple software (the "Apple Software"), to use, reproduce, modify and redistribute the Apple Software, with or without modifications, in source and/or binary forms; provided that if you redistribute the Apple Software in its entirety and without modifications, you must retain this notice and the following text and disclaimers in all such redistributions of the Apple Software. Neither the name, trademarks, service marks or logos of Apple Computer, Inc. may be used to endorse or promote products derived from the Apple Software without specific prior written permission from Apple. Except as expressly stated in this notice, no other rights or licenses, express or implied, are granted by Apple herein, including but not limited to any patent rights that may be infringed by your derivative works or by other works in which the Apple Software may be incorporated. The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS. IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /*============================================================================= CAGuard.cp =============================================================================*/ /*============================================================================= Includes =============================================================================*/ /* #include <stdio.h> #include <stdlib.h> #include <string.h> */ #include "SDL_stdinc.h" /*#define NDEBUG 1*/ /* #include <assert.h> */ #define assert(X) #include "SDLOSXCAGuard.h" /*#warning Need a try-based Locker too*/ /*============================================================================= SDLOSXCAGuard =============================================================================*/ static int SDLOSXCAGuard_Lock(SDLOSXCAGuard *cag) { int theAnswer = 0; if(pthread_self() != cag->mOwner) { OSStatus theError = pthread_mutex_lock(&cag->mMutex); (void)theError; assert(theError == 0); cag->mOwner = pthread_self(); theAnswer = 1; } return theAnswer; } static void SDLOSXCAGuard_Unlock(SDLOSXCAGuard *cag) { OSStatus theError; assert(pthread_self() == cag->mOwner); cag->mOwner = 0; theError = pthread_mutex_unlock(&cag->mMutex); (void)theError; assert(theError == 0); } static int SDLOSXCAGuard_Try (SDLOSXCAGuard *cag, int *outWasLocked) { int theAnswer = 0; *outWasLocked = 0; if (pthread_self() == cag->mOwner) { theAnswer = 1; *outWasLocked = 0; } else { OSStatus theError = pthread_mutex_trylock(&cag->mMutex); if (theError == 0) { cag->mOwner = pthread_self(); theAnswer = 1; *outWasLocked = 1; } } return theAnswer; } static void SDLOSXCAGuard_Wait(SDLOSXCAGuard *cag) { OSStatus theError; assert(pthread_self() == cag->mOwner); cag->mOwner = 0; theError = pthread_cond_wait(&cag->mCondVar, &cag->mMutex); (void)theError; assert(theError == 0); cag->mOwner = pthread_self(); } static void SDLOSXCAGuard_Notify(SDLOSXCAGuard *cag) { OSStatus theError = pthread_cond_signal(&cag->mCondVar); (void)theError; assert(theError == 0); } SDLOSXCAGuard *new_SDLOSXCAGuard(void) { OSStatus theError; SDLOSXCAGuard *cag = (SDLOSXCAGuard *) SDL_malloc(sizeof (SDLOSXCAGuard)); if (cag == NULL) return NULL; SDL_memset(cag, '\0', sizeof (*cag)); #define SET_SDLOSXCAGUARD_METHOD(m) cag->m = SDLOSXCAGuard_##m SET_SDLOSXCAGUARD_METHOD(Lock); SET_SDLOSXCAGUARD_METHOD(Unlock); SET_SDLOSXCAGUARD_METHOD(Try); SET_SDLOSXCAGUARD_METHOD(Wait); SET_SDLOSXCAGUARD_METHOD(Notify); #undef SET_SDLOSXCAGUARD_METHOD theError = pthread_mutex_init(&cag->mMutex, NULL); (void)theError; assert(theError == 0); theError = pthread_cond_init(&cag->mCondVar, NULL); (void)theError; assert(theError == 0); cag->mOwner = 0; return cag; } void delete_SDLOSXCAGuard(SDLOSXCAGuard *cag) { if (cag != NULL) { pthread_mutex_destroy(&cag->mMutex); pthread_cond_destroy(&cag->mCondVar); SDL_free(cag); } }