Mercurial > sdl-ios-xcode

diff src/joystick/SDL_joystick.c @ 4429:faa9fc8e7f67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
General improvements for user custom event registration * Switched event type to enum (int32) * Switched polling by mask to polling by type range * Added SDL_RegisterEvents() to allow dynamic user event registration * Spread events out to allow inserting new related events without breaking binary compatibility * Added padding to event structures so they're the same size regardless of 32-bit compiler structure packing settings * Split SDL_HasEvent() to SDL_HasEvent() for a single event and SDL_HasEvents() for a range of events * Added SDL_GetEventState() as a shortcut for SDL_EventState(X, SDL_QUERY) * Added SDL_FlushEvent() and SDL_FlushEvents() to clear events from the event queue
author Sam Lantinga <slouken@libsdl.org>
date Thu, 25 Mar 2010 01:08:26 -0700
parents f7b03b6838cb
children dc0dfdd58f27
line wrap: on
line diff
--- a/src/joystick/SDL_joystick.c	Wed Mar 10 15:07:20 2010 +0000
+++ b/src/joystick/SDL_joystick.c	Thu Mar 25 01:08:26 2010 -0700
@@ -445,7 +445,7 @@
     /* Post the event, if desired */
     posted = 0;
 #if !SDL_EVENTS_DISABLED
-    if (SDL_ProcessEvents[SDL_JOYAXISMOTION] == SDL_ENABLE) {
+    if (SDL_GetEventState(SDL_JOYAXISMOTION) == SDL_ENABLE) {
         SDL_Event event;
         event.type = SDL_JOYAXISMOTION;
         event.jaxis.which = joystick->index;
@@ -472,7 +472,7 @@
     /* Post the event, if desired */
     posted = 0;
 #if !SDL_EVENTS_DISABLED
-    if (SDL_ProcessEvents[SDL_JOYHATMOTION] == SDL_ENABLE) {
+    if (SDL_GetEventState(SDL_JOYHATMOTION) == SDL_ENABLE) {
         SDL_Event event;
         event.jhat.type = SDL_JOYHATMOTION;
         event.jhat.which = joystick->index;
@@ -501,7 +501,7 @@
     /* Post the event, if desired */
     posted = 0;
 #if !SDL_EVENTS_DISABLED
-    if (SDL_ProcessEvents[SDL_JOYBALLMOTION] == SDL_ENABLE) {
+    if (SDL_GetEventState(SDL_JOYBALLMOTION) == SDL_ENABLE) {
         SDL_Event event;
         event.jball.type = SDL_JOYBALLMOTION;
         event.jball.which = joystick->index;
@@ -544,7 +544,7 @@
     /* Post the event, if desired */
     posted = 0;
 #if !SDL_EVENTS_DISABLED
-    if (SDL_ProcessEvents[event.type] == SDL_ENABLE) {
+    if (SDL_GetEventState(event.type) == SDL_ENABLE) {
         event.jbutton.which = joystick->index;
         event.jbutton.button = button;
         event.jbutton.state = state;
@@ -574,7 +574,7 @@
 #if SDL_EVENTS_DISABLED
     return SDL_IGNORE;
 #else
-    const Uint8 event_list[] = {
+    const Uint32 event_list[] = {
         SDL_JOYAXISMOTION, SDL_JOYBALLMOTION, SDL_JOYHATMOTION,
         SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP,
     };