Mercurial > sdl-ios-xcode
view src/events/SDL_events.c @ 4426:1bceff8f008f
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.)
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64
uses msvcrt version of _aligned_malloc and _aligned_free and
they are defined in intrin.h (similar to VC). Adding proper
ifdefs fixes it. (Notes about macros to check: __MINGW32__ is
defined for both mingw.org and for mingw-w64 for both win32 and
win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__
can't be used to detect mingw-w64: including _mingw.h and then
checking for __MINGW64_VERSION_MAJOR does the trick.)
SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition
and location in order to avoid multiple redefinition warnings.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:02:58 +0000 |
parents | f7b03b6838cb |
children | faa9fc8e7f67 |
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 */ #include "SDL_config.h" /* General event handling code for SDL */ #include "SDL.h" #include "SDL_events.h" #include "SDL_syswm.h" #include "SDL_thread.h" #include "SDL_sysevents.h" #include "SDL_events_c.h" #include "../timer/SDL_timer_c.h" #if !SDL_JOYSTICK_DISABLED #include "../joystick/SDL_joystick_c.h" #endif /* Public data -- the event filter */ SDL_EventFilter SDL_EventOK = NULL; void *SDL_EventOKParam; Uint8 SDL_ProcessEvents[SDL_NUMEVENTS]; static Uint32 SDL_eventstate = 0; /* Private data -- event queue */ #define MAXEVENTS 128 static struct { SDL_mutex *lock; int active; int head; int tail; SDL_Event event[MAXEVENTS]; int wmmsg_next; struct SDL_SysWMmsg wmmsg[MAXEVENTS]; } SDL_EventQ; /* Private data -- event locking structure */ static struct { SDL_mutex *lock; int safe; } SDL_EventLock; /* Thread functions */ static SDL_Thread *SDL_EventThread = NULL; /* Thread handle */ static SDL_threadID event_thread; /* The event thread id */ void SDL_Lock_EventThread(void) { if (SDL_EventThread && (SDL_ThreadID() != event_thread)) { /* Grab lock and spin until we're sure event thread stopped */ SDL_mutexP(SDL_EventLock.lock); while (!SDL_EventLock.safe) { SDL_Delay(1); } } } void SDL_Unlock_EventThread(void) { if (SDL_EventThread && (SDL_ThreadID() != event_thread)) { SDL_mutexV(SDL_EventLock.lock); } } static int SDLCALL SDL_GobbleEvents(void *unused) { event_thread = SDL_ThreadID(); while (SDL_EventQ.active) { SDL_VideoDevice *_this = SDL_GetVideoDevice(); /* Get events from the video subsystem */ if (_this) { _this->PumpEvents(_this); } #if !SDL_JOYSTICK_DISABLED /* Check for joystick state change */ if (SDL_numjoysticks && (SDL_eventstate & SDL_JOYEVENTMASK)) { SDL_JoystickUpdate(); } #endif /* Give up the CPU for the rest of our timeslice */ SDL_EventLock.safe = 1; if (SDL_timer_running) { SDL_ThreadedTimerCheck(); } SDL_Delay(1); /* Check for event locking. On the P of the lock mutex, if the lock is held, this thread will wait until the lock is released before continuing. The safe flag will be set, meaning that the other thread can go about it's business. The safe flag is reset before the V, so as soon as the mutex is free, other threads can see that it's not safe to interfere with the event thread. */ SDL_mutexP(SDL_EventLock.lock); SDL_EventLock.safe = 0; SDL_mutexV(SDL_EventLock.lock); } SDL_SetTimerThreaded(0); event_thread = 0; return (0); } static int SDL_StartEventThread(Uint32 flags) { /* Reset everything to zero */ SDL_EventThread = NULL; SDL_memset(&SDL_EventLock, 0, sizeof(SDL_EventLock)); /* Create the lock and set ourselves active */ #if !SDL_THREADS_DISABLED SDL_EventQ.lock = SDL_CreateMutex(); if (SDL_EventQ.lock == NULL) { return (-1); } #endif /* !SDL_THREADS_DISABLED */ SDL_EventQ.active = 1; if ((flags & SDL_INIT_EVENTTHREAD) == SDL_INIT_EVENTTHREAD) { SDL_EventLock.lock = SDL_CreateMutex(); if (SDL_EventLock.lock == NULL) { return (-1); } SDL_EventLock.safe = 0; /* The event thread will handle timers too */ SDL_SetTimerThreaded(2); #if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) #undef SDL_CreateThread SDL_EventThread = SDL_CreateThread(SDL_GobbleEvents, NULL, NULL, NULL); #else SDL_EventThread = SDL_CreateThread(SDL_GobbleEvents, NULL); #endif if (SDL_EventThread == NULL) { return (-1); } } else { event_thread = 0; } return (0); } static void SDL_StopEventThread(void) { SDL_EventQ.active = 0; if (SDL_EventThread) { SDL_WaitThread(SDL_EventThread, NULL); SDL_EventThread = NULL; SDL_DestroyMutex(SDL_EventLock.lock); SDL_EventLock.lock = NULL; } if (SDL_EventQ.lock) { SDL_DestroyMutex(SDL_EventQ.lock); SDL_EventQ.lock = NULL; } } SDL_threadID SDL_EventThreadID(void) { return (event_thread); } /* Public functions */ void SDL_StopEventLoop(void) { /* Halt the event thread, if running */ SDL_StopEventThread(); /* Shutdown event handlers */ SDL_KeyboardQuit(); SDL_MouseQuit(); SDL_QuitQuit(); /* Clean out EventQ */ SDL_EventQ.head = 0; SDL_EventQ.tail = 0; SDL_EventQ.wmmsg_next = 0; } /* This function (and associated calls) may be called more than once */ int SDL_StartEventLoop(Uint32 flags) { int retcode; /* Clean out the event queue */ SDL_EventThread = NULL; SDL_EventQ.lock = NULL; SDL_StopEventLoop(); /* No filter to start with, process most event types */ SDL_EventOK = NULL; SDL_memset(SDL_ProcessEvents, SDL_ENABLE, sizeof(SDL_ProcessEvents)); SDL_eventstate = ~0; /* It's not save to call SDL_EventState() yet */ SDL_eventstate &= ~(0x00000001 << SDL_SYSWMEVENT); SDL_ProcessEvents[SDL_SYSWMEVENT] = SDL_IGNORE; /* Initialize event handlers */ retcode = 0; retcode += SDL_KeyboardInit(); retcode += SDL_MouseInit(); retcode += SDL_QuitInit(); if (retcode < 0) { /* We don't expect them to fail, but... */ return (-1); } /* Create the lock and event thread */ if (SDL_StartEventThread(flags) < 0) { SDL_StopEventLoop(); return (-1); } return (0); } /* Add an event to the event queue -- called with the queue locked */ static int SDL_AddEvent(SDL_Event * event) { int tail, added; tail = (SDL_EventQ.tail + 1) % MAXEVENTS; if (tail == SDL_EventQ.head) { /* Overflow, drop event */ added = 0; } else { SDL_EventQ.event[SDL_EventQ.tail] = *event; if (event->type == SDL_SYSWMEVENT) { /* Note that it's possible to lose an event */ int next = SDL_EventQ.wmmsg_next; SDL_EventQ.wmmsg[next] = *event->syswm.msg; SDL_EventQ.event[SDL_EventQ.tail].syswm.msg = &SDL_EventQ.wmmsg[next]; SDL_EventQ.wmmsg_next = (next + 1) % MAXEVENTS; } SDL_EventQ.tail = tail; added = 1; } return (added); } /* Cut an event, and return the next valid spot, or the tail */ /* -- called with the queue locked */ static int SDL_CutEvent(int spot) { if (spot == SDL_EventQ.head) { SDL_EventQ.head = (SDL_EventQ.head + 1) % MAXEVENTS; return (SDL_EventQ.head); } else if ((spot + 1) % MAXEVENTS == SDL_EventQ.tail) { SDL_EventQ.tail = spot; return (SDL_EventQ.tail); } else /* We cut the middle -- shift everything over */ { int here, next; /* This can probably be optimized with SDL_memcpy() -- careful! */ if (--SDL_EventQ.tail < 0) { SDL_EventQ.tail = MAXEVENTS - 1; } for (here = spot; here != SDL_EventQ.tail; here = next) { next = (here + 1) % MAXEVENTS; SDL_EventQ.event[here] = SDL_EventQ.event[next]; } return (spot); } /* NOTREACHED */ } /* Lock the event queue, take a peep at it, and unlock it */ int SDL_PeepEvents(SDL_Event * events, int numevents, SDL_eventaction action, Uint32 mask) { int i, used; /* Don't look after we've quit */ if (!SDL_EventQ.active) { return (-1); } /* Lock the event queue */ used = 0; if (SDL_mutexP(SDL_EventQ.lock) == 0) { if (action == SDL_ADDEVENT) { for (i = 0; i < numevents; ++i) { used += SDL_AddEvent(&events[i]); } } else { SDL_Event tmpevent; int spot; /* If 'events' is NULL, just see if they exist */ if (events == NULL) { action = SDL_PEEKEVENT; numevents = 1; events = &tmpevent; } spot = SDL_EventQ.head; while ((used < numevents) && (spot != SDL_EventQ.tail)) { if (mask & SDL_EVENTMASK(SDL_EventQ.event[spot].type)) { events[used++] = SDL_EventQ.event[spot]; if (action == SDL_GETEVENT) { spot = SDL_CutEvent(spot); } else { spot = (spot + 1) % MAXEVENTS; } } else { spot = (spot + 1) % MAXEVENTS; } } } SDL_mutexV(SDL_EventQ.lock); } else { SDL_SetError("Couldn't lock event queue"); used = -1; } return (used); } SDL_bool SDL_HasEvent(Uint32 mask) { return (SDL_PeepEvents(NULL, 0, SDL_PEEKEVENT, mask) > 0); } /* Run the system dependent event loops */ void SDL_PumpEvents(void) { if (!SDL_EventThread) { SDL_VideoDevice *_this = SDL_GetVideoDevice(); /* Get events from the video subsystem */ if (_this) { _this->PumpEvents(_this); } #if !SDL_JOYSTICK_DISABLED /* Check for joystick state change */ if (SDL_numjoysticks && (SDL_eventstate & SDL_JOYEVENTMASK)) { SDL_JoystickUpdate(); } #endif } } /* Public functions */ int SDL_PollEvent(SDL_Event * event) { return SDL_WaitEventTimeout(event, 0); } int SDL_WaitEvent(SDL_Event * event) { return SDL_WaitEventTimeout(event, -1); } int SDL_WaitEventTimeout(SDL_Event * event, int timeout) { Uint32 expiration = 0; if (timeout > 0) expiration = SDL_GetTicks() + timeout; for (;;) { SDL_PumpEvents(); switch (SDL_PeepEvents(event, 1, SDL_GETEVENT, SDL_ALLEVENTS)) { case -1: return 0; case 1: return 1; case 0: if (timeout == 0) { /* Polling and no events, just return */ return 0; } if (timeout > 0 && ((int) (SDL_GetTicks() - expiration) >= 0)) { /* Timeout expired and no events */ return 0; } SDL_Delay(10); break; } } } int SDL_PushEvent(SDL_Event * event) { if (SDL_EventOK && !SDL_EventOK(SDL_EventOKParam, event)) { return 0; } if (SDL_PeepEvents(event, 1, SDL_ADDEVENT, 0) <= 0) { return -1; } return 1; } void SDL_SetEventFilter(SDL_EventFilter filter, void *userdata) { SDL_Event bitbucket; /* Set filter and discard pending events */ SDL_EventOK = filter; SDL_EventOKParam = userdata; while (SDL_PollEvent(&bitbucket) > 0); } SDL_bool SDL_GetEventFilter(SDL_EventFilter * filter, void **userdata) { if (filter) { *filter = SDL_EventOK; } if (userdata) { *userdata = SDL_EventOKParam; } return SDL_EventOK ? SDL_TRUE : SDL_FALSE; } void SDL_FilterEvents(SDL_EventFilter filter, void *userdata) { if (SDL_mutexP(SDL_EventQ.lock) == 0) { int spot; spot = SDL_EventQ.head; while (spot != SDL_EventQ.tail) { if (filter(userdata, &SDL_EventQ.event[spot])) { spot = (spot + 1) % MAXEVENTS; } else { spot = SDL_CutEvent(spot); } } } SDL_mutexV(SDL_EventQ.lock); } Uint8 SDL_EventState(Uint8 type, int state) { SDL_Event bitbucket; Uint8 current_state; /* If SDL_ALLEVENTS was specified... */ if (type == 0xFF) { current_state = SDL_IGNORE; for (type = 0; type < SDL_NUMEVENTS; ++type) { if (SDL_ProcessEvents[type] != SDL_IGNORE) { current_state = SDL_ENABLE; } SDL_ProcessEvents[type] = state; if (state == SDL_ENABLE) { SDL_eventstate |= (0x00000001 << (type)); } else { SDL_eventstate &= ~(0x00000001 << (type)); } } while (SDL_PollEvent(&bitbucket) > 0); return (current_state); } /* Just set the state for one event type */ current_state = SDL_ProcessEvents[type]; switch (state) { case SDL_IGNORE: case SDL_ENABLE: /* Set state and discard pending events */ SDL_ProcessEvents[type] = state; if (state == SDL_ENABLE) { SDL_eventstate |= (0x00000001 << (type)); } else { SDL_eventstate &= ~(0x00000001 << (type)); } while (SDL_PollEvent(&bitbucket) > 0); break; default: /* Querying state? */ break; } return (current_state); } /* This is a generic event handler. */ int SDL_SendSysWMEvent(SDL_SysWMmsg * message) { int posted; posted = 0; if (SDL_ProcessEvents[SDL_SYSWMEVENT] == SDL_ENABLE) { SDL_Event event; SDL_memset(&event, 0, sizeof(event)); event.type = SDL_SYSWMEVENT; event.syswm.msg = message; posted = (SDL_PushEvent(&event) > 0); } /* Update internal event state */ return (posted); } /* vi: set ts=4 sw=4 expandtab: */