Mercurial > sdl-ios-xcode
view src/thread/nds/SDL_syssem.c @ 4425:a3e71b957215
Fixed bug #961
Kalle Olavi Niemitalo 2010-02-28 09:15:50 PST
It seems the SDLK_LMETA and SDLK_RMETA constants have been removed from SDL
1.3. I grepped for them in the SDL source tree and these were the only hits:
./include/SDL_compat.h:230:#define SDLK_LSUPER SDLK_LMETA
./include/SDL_compat.h:231:#define SDLK_RSUPER SDLK_RMETA
./src/video/bwindow/SDL_BWin.h:194: keymap[0x66] = SDLK_LMETA;
./src/video/bwindow/SDL_BWin.h:195: keymap[0x67] = SDLK_RMETA;
I don't know how compatible SDL 1.3 is supposed to be with applications
designed for SDL 1.2. However, as you can see, SDL itself is still trying to
use the removed constants, and that is clearly a bug.
Because SDL_compat.h defines KMOD_LMETA as KMOD_LGUI, I suppose it should also
define SDLK_LMETA as SDLK_LGUI, and SDLK_RMETA likewise.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Tue, 09 Mar 2010 06:07:48 +0000 |
parents | f7b03b6838cb |
children | b530ef003506 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2010 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id: SDL_syssem.c,v 1.2 2001/04/26 16:50:18 hercules Exp $"; #endif /* An implementation of semaphores using mutexes and condition variables */ #include <stdlib.h> #include "SDL_error.h" #include "SDL_timer.h" #include "SDL_thread.h" #include "SDL_systhread_c.h" #ifdef DISABLE_THREADS SDL_sem * SDL_CreateSemaphore(Uint32 initial_value) { SDL_SetError("SDL not configured with thread support"); return (SDL_sem *) 0; } void SDL_DestroySemaphore(SDL_sem * sem) { return; } int SDL_SemTryWait(SDL_sem * sem) { SDL_SetError("SDL not configured with thread support"); return -1; } int SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout) { SDL_SetError("SDL not configured with thread support"); return -1; } int SDL_SemWait(SDL_sem * sem) { SDL_SetError("SDL not configured with thread support"); return -1; } Uint32 SDL_SemValue(SDL_sem * sem) { return 0; } int SDL_SemPost(SDL_sem * sem) { SDL_SetError("SDL not configured with thread support"); return -1; } #else struct SDL_semaphore { Uint32 count; Uint32 waiters_count; SDL_mutex *count_lock; SDL_cond *count_nonzero; }; SDL_sem * SDL_CreateSemaphore(Uint32 initial_value) { SDL_sem *sem; sem = (SDL_sem *) malloc(sizeof(*sem)); if (!sem) { SDL_OutOfMemory(); return (0); } sem->count = initial_value; sem->waiters_count = 0; sem->count_lock = SDL_CreateMutex(); sem->count_nonzero = SDL_CreateCond(); if (!sem->count_lock || !sem->count_nonzero) { SDL_DestroySemaphore(sem); return (0); } return (sem); } /* WARNING: You cannot call this function when another thread is using the semaphore. */ void SDL_DestroySemaphore(SDL_sem * sem) { if (sem) { sem->count = 0xFFFFFFFF; while (sem->waiters_count > 0) { SDL_CondSignal(sem->count_nonzero); SDL_Delay(10); } SDL_DestroyCond(sem->count_nonzero); SDL_mutexP(sem->count_lock); SDL_mutexV(sem->count_lock); SDL_DestroyMutex(sem->count_lock); free(sem); } } int SDL_SemTryWait(SDL_sem * sem) { int retval; if (!sem) { SDL_SetError("Passed a NULL semaphore"); return -1; } retval = SDL_MUTEX_TIMEDOUT; SDL_LockMutex(sem->count_lock); if (sem->count > 0) { --sem->count; retval = 0; } SDL_UnlockMutex(sem->count_lock); return retval; } int SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout) { int retval; if (!sem) { SDL_SetError("Passed a NULL semaphore"); return -1; } /* A timeout of 0 is an easy case */ if (timeout == 0) { return SDL_SemTryWait(sem); } SDL_LockMutex(sem->count_lock); ++sem->waiters_count; retval = 0; while ((sem->count == 0) && (retval != SDL_MUTEX_TIMEDOUT)) { retval = SDL_CondWaitTimeout(sem->count_nonzero, sem->count_lock, timeout); } --sem->waiters_count; --sem->count; SDL_UnlockMutex(sem->count_lock); return retval; } int SDL_SemWait(SDL_sem * sem) { return SDL_SemWaitTimeout(sem, SDL_MUTEX_MAXWAIT); } Uint32 SDL_SemValue(SDL_sem * sem) { Uint32 value; value = 0; if (sem) { SDL_LockMutex(sem->count_lock); value = sem->count; SDL_UnlockMutex(sem->count_lock); } return value; } int SDL_SemPost(SDL_sem * sem) { if (!sem) { SDL_SetError("Passed a NULL semaphore"); return -1; } SDL_LockMutex(sem->count_lock); if (sem->waiters_count > 0) { SDL_CondSignal(sem->count_nonzero); } ++sem->count; SDL_UnlockMutex(sem->count_lock); return 0; } #endif /* DISABLE_THREADS */