Mercurial > sdl-ios-xcode
view src/cdrom/macosx/SDLOSXCAGuard.c @ 4391:07b330419439 SDL-1.2
Fixed bug #849 some more:
Tim Angus 2009-11-26 14:41:04 PST
Fix to the cursor not being responsive when the app doesn't have
SDL_APPINPUTFOCUS
The problems with the directx driver are similar to the ones I introduced in
the windib driver with r4478. Basically if the application did not have focus,
the mouse position is not updated. It's not really that the mouse cursor was
invisible, it's that it is stuck underneath another window where you can't see
it. This behaviour predates my r4478 changes and is the reason I unwittingly
broke the windib driver as I had been replicating the way the directx driver
deals with focus. Prior to r4478 the directx driver could not be used in
windowed mode, so the broken focusing would not have actually been observable.
Anyway, the attached patch makes the directx driver behaves like the windib
driver in terms of focus.
Time for 1.2.15? ;)
I've added an additional change of moving the calls to WIN_GrabInput that are
made on WM_ACTIVATE messages so that they only occur when the state is
SDL_APPINPUTFOCUS. When a fullscreen application is minimised using alt-tab, it
still receives WM_ACTIVATE messages when other applications are selected. If
WIN_GrabInput is called when the SDL application doesn't have input focus, bad
things happen; it shouldn't be being called at all.
I've also added a line to make sure that SDL_APPMOUSEFOCUS state is dropped
when the application is minimised following an alt-tab.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 11 Dec 2009 15:24:53 +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); } }