view src/cdrom/macosx/SDLOSXCAGuard.c @ 2268:4baee598306d

Date: Thu, 05 Jul 2007 14:02:33 -0700 From: Sam Lantinga Subject: SDL 1.3 keyboard plan After lots of discussion with Christian, this is what we came up with: > So, to sum up... > SDLK_* become the physical keys, starting at > (1<<21) > We create a macro SDLK_INDEX(X) > We have two functions SDL_GetLayoutKey(SDLKey) and SDL_GetKeyName() > SDL_GetLayoutKey maps to UCS4 for printable characters, and SDLK* for non-printable characters > and does so based on the OS's current keyboard layout > SDL_GetKeyName() handles both SDLK_* and UCS4, converting UCS4 to UTF-8 and converting SDLK_* into our names, which are UTF-8 for printable characters. > WASD folks use SDLK_*, and 'I' folks use SDL_GetLayoutKey(SDLK_*) Here is the patch he came up with, and his e-mail about it: Date: Fri, 17 Aug 2007 19:50:28 +0200 From: Christian Walther Subject: Re: SDL 1.3 keyboard plan > Sounds great, go ahead and send me a patch. Here goes! Thanks for having a look. Don't hesitate to comment if anything does not conform to your ideas. One caveat: Committing this now may break compilability of some video drivers - specifically, if they use any of the SDLK_* codes that were obsoleted and moved into SDL_compat.h. I only tried Cocoa (which did break, but is already fixed) and X11 (which didn't, but then its key handling is #iffed out). If that's a problem, it may need to go into a branch. -Christian
author Sam Lantinga <slouken@libsdl.org>
date Sun, 19 Aug 2007 14:52:52 +0000
parents c121d94672cb
children 99210400e8b9
line wrap: on
line source

/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002  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);
    }
}

/* vi: set ts=4 sw=4 expandtab: */