sdl-ios-xcode: src/cdrom/macosx/SDLOSXCAGuard.c annotate

annotate src/cdrom/macosx/SDLOSXCAGuard.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
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	1 /*
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
4159 a1b03ba2fcd0 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 1487 diff changeset	3 Copyright (C) 1997-2009 Sam Lantinga
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	4
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	6 modify it under the terms of the GNU Library General Public
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	8 version 2 of the License, or (at your option) any later version.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	9
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	13 Library General Public License for more details.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	14
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	15 You should have received a copy of the GNU Library General Public
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	16 License along with this library; if not, write to the Free
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	18
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	19 Sam Lantinga
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	20 slouken@libsdl.org
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	21 */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	22 #include "SDL_config.h"
d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	23
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	24 /*
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	25 Note: This file hasn't been modified so technically we have to keep the disclaimer :-(
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	26
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	27 Copyright: � Copyright 2002 Apple Computer, Inc. All rights reserved.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	28
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	29 Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	30 ("Apple") in consideration of your agreement to the following terms, and your
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	31 use, installation, modification or redistribution of this Apple software
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	32 constitutes acceptance of these terms. If you do not agree with these terms,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	33 please do not use, install, modify or redistribute this Apple software.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	34
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	35 In consideration of your agreement to abide by the following terms, and subject
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	36 to these terms, Apple grants you a personal, non-exclusive license, under Apple�s
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	37 copyrights in this original Apple software (the "Apple Software"), to use,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	38 reproduce, modify and redistribute the Apple Software, with or without
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	39 modifications, in source and/or binary forms; provided that if you redistribute
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	40 the Apple Software in its entirety and without modifications, you must retain
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	41 this notice and the following text and disclaimers in all such redistributions of
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	42 the Apple Software. Neither the name, trademarks, service marks or logos of
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	43 Apple Computer, Inc. may be used to endorse or promote products derived from the
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	44 Apple Software without specific prior written permission from Apple. Except as
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	45 expressly stated in this notice, no other rights or licenses, express or implied,
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	46 are granted by Apple herein, including but not limited to any patent rights that
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	47 may be infringed by your derivative works or by other works in which the Apple
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	48 Software may be incorporated.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	49
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	50 The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	51 WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	52 WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	53 PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	54 COMBINATION WITH YOUR PRODUCTS.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	55
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	56 IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	57 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	58 GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	59 ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	60 OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	61 (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	62 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	63 */
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	64 /*=============================================================================
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	65 CAGuard.cp
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	66
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	67 =============================================================================*/
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	68
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	69 /*=============================================================================
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	70 Includes
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	71 =============================================================================*/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	72
1338 604d73db6802 Removed uses of stdlib.h and string.h Sam Lantinga <slouken@libsdl.org> parents: 1336 diff changeset	73 /*
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	74 #include <stdio.h>
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	75 #include <stdlib.h>
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	76 #include <string.h>
1338 604d73db6802 Removed uses of stdlib.h and string.h Sam Lantinga <slouken@libsdl.org> parents: 1336 diff changeset	77 */
1358 c71e05b4dc2e More header massaging... works great on Windows. ;-) Sam Lantinga <slouken@libsdl.org> parents: 1338 diff changeset	78 #include "SDL_stdinc.h"
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	79
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	80 /#define NDEBUG 1/
1338 604d73db6802 Removed uses of stdlib.h and string.h Sam Lantinga <slouken@libsdl.org> parents: 1336 diff changeset	81 /*
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	82 #include <assert.h>
1338 604d73db6802 Removed uses of stdlib.h and string.h Sam Lantinga <slouken@libsdl.org> parents: 1336 diff changeset	83 */
604d73db6802 Removed uses of stdlib.h and string.h Sam Lantinga <slouken@libsdl.org> parents: 1336 diff changeset	84 #define assert(X)
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	85
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	86
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	87 #include "SDLOSXCAGuard.h"
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	88
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	89 /#warning Need a try-based Locker too/
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	90 /*=============================================================================
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	91 SDLOSXCAGuard
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	92 =============================================================================*/
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	93
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	94 static int SDLOSXCAGuard_Lock(SDLOSXCAGuard *cag)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	95 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	96 int theAnswer = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	97
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	98 if(pthread_self() != cag->mOwner)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	99 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	100 OSStatus theError = pthread_mutex_lock(&cag->mMutex);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	101 (void)theError;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	102 assert(theError == 0);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	103 cag->mOwner = pthread_self();
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	104 theAnswer = 1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	105 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	106
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	107 return theAnswer;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	108 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	109
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	110 static void SDLOSXCAGuard_Unlock(SDLOSXCAGuard *cag)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	111 {
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	112 OSStatus theError;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	113 assert(pthread_self() == cag->mOwner);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	114
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	115 cag->mOwner = 0;
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	116 theError = pthread_mutex_unlock(&cag->mMutex);
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	117 (void)theError;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	118 assert(theError == 0);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	119 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	120
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	121 static int SDLOSXCAGuard_Try (SDLOSXCAGuard cag, int outWasLocked)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	122 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	123 int theAnswer = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	124 *outWasLocked = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	125
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	126 if (pthread_self() == cag->mOwner) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	127 theAnswer = 1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	128 *outWasLocked = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	129 } else {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	130 OSStatus theError = pthread_mutex_trylock(&cag->mMutex);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	131 if (theError == 0) {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	132 cag->mOwner = pthread_self();
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	133 theAnswer = 1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	134 *outWasLocked = 1;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	135 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	136 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	137
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	138 return theAnswer;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	139 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	140
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	141 static void SDLOSXCAGuard_Wait(SDLOSXCAGuard *cag)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	142 {
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	143 OSStatus theError;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	144 assert(pthread_self() == cag->mOwner);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	145
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	146 cag->mOwner = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	147
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	148 theError = pthread_cond_wait(&cag->mCondVar, &cag->mMutex);
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	149 (void)theError;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	150 assert(theError == 0);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	151 cag->mOwner = pthread_self();
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	152 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	153
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	154 static void SDLOSXCAGuard_Notify(SDLOSXCAGuard *cag)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	155 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	156 OSStatus theError = pthread_cond_signal(&cag->mCondVar);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	157 (void)theError;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	158 assert(theError == 0);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	159 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	160
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	161
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	162 SDLOSXCAGuard *new_SDLOSXCAGuard(void)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	163 {
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	164 OSStatus theError;
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1143 diff changeset	165 SDLOSXCAGuard cag = (SDLOSXCAGuard ) SDL_malloc(sizeof (SDLOSXCAGuard));
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	166 if (cag == NULL)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	167 return NULL;
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1143 diff changeset	168 SDL_memset(cag, '\0', sizeof (*cag));
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	169
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	170 #define SET_SDLOSXCAGUARD_METHOD(m) cag->m = SDLOSXCAGuard_##m
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	171 SET_SDLOSXCAGUARD_METHOD(Lock);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	172 SET_SDLOSXCAGUARD_METHOD(Unlock);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	173 SET_SDLOSXCAGUARD_METHOD(Try);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	174 SET_SDLOSXCAGUARD_METHOD(Wait);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	175 SET_SDLOSXCAGUARD_METHOD(Notify);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	176 #undef SET_SDLOSXCAGUARD_METHOD
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	177
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	178 theError = pthread_mutex_init(&cag->mMutex, NULL);
dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	179 (void)theError;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	180 assert(theError == 0);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	181
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	182 theError = pthread_cond_init(&cag->mCondVar, NULL);
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	183 (void)theError;
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	184 assert(theError == 0);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	185
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	186 cag->mOwner = 0;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	187 return cag;
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	188 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	189
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	190 void delete_SDLOSXCAGuard(SDLOSXCAGuard *cag)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	191 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	192 if (cag != NULL)
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	193 {
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	194 pthread_mutex_destroy(&cag->mMutex);
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	195 pthread_cond_destroy(&cag->mCondVar);
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1143 diff changeset	196 SDL_free(cag);
1143 71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	197 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	198 }
71a2648acc75 Replaced Mac OS X's C++ cdrom code with almost-direct translation to C. Sam Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	199

Mercurial > sdl-ios-xcode

annotate src/cdrom/macosx/SDLOSXCAGuard.c @ 4170:092c0bc69155 SDL-1.2