Mercurial > sdl-ios-xcode

comparison src/events/SDL_events.c @ 2678:3895761db26a gsoc2008_nds

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed old touchscreen system, starting to implement mouse-based touchscreen. Also, more work on a non-software-rendering video driver
author Darren Alton <dalton@stevens.edu>
date Thu, 10 Jul 2008 23:35:01 +0000
parents f1d07ba2e275
children e1da92da346c
comparison
equal deleted inserted replaced
2677:6386764eb222 2678:3895761db26a
28 #include "SDL_sysevents.h" 28 #include "SDL_sysevents.h"
29 #include "SDL_events_c.h" 29 #include "SDL_events_c.h"
30 #include "../timer/SDL_timer_c.h" 30 #include "../timer/SDL_timer_c.h"
31 #if !SDL_JOYSTICK_DISABLED 31 #if !SDL_JOYSTICK_DISABLED
32 #include "../joystick/SDL_joystick_c.h" 32 #include "../joystick/SDL_joystick_c.h"
33 #endif
34 #if !SDL_TOUCHSCREEN_DISABLED
35 #include "../touchscreen/SDL_touchscreen_c.h"
36 #endif 33 #endif
37 34
38 /* Public data -- the event filter */ 35 /* Public data -- the event filter */
39 SDL_EventFilter SDL_EventOK = NULL; 36 SDL_EventFilter SDL_EventOK = NULL;
40 void *SDL_EventOKParam; 37 void *SDL_EventOKParam;
116 } 113 }
117 #if !SDL_JOYSTICK_DISABLED 114 #if !SDL_JOYSTICK_DISABLED
118 /* Check for joystick state change */ 115 /* Check for joystick state change */
119 if (SDL_numjoysticks && (SDL_eventstate & SDL_JOYEVENTMASK)) { 116 if (SDL_numjoysticks && (SDL_eventstate & SDL_JOYEVENTMASK)) {
120 SDL_JoystickUpdate(); 117 SDL_JoystickUpdate();
121 }
122 #endif
123 #if !SDL_TOUCHSCREEN_DISABLED
124 /* Similarly, check for touchscreen state change */
125 if (SDL_numtouchscreens && (SDL_eventstate & SDL_TOUCHEVENTMASK)) {
126 SDL_TouchscreenUpdate();
127 } 118 }
128 #endif 119 #endif
129 120
130 /* Give up the CPU for the rest of our timeslice */ 121 /* Give up the CPU for the rest of our timeslice */
131 SDL_EventLock.safe = 1; 122 SDL_EventLock.safe = 1;
395 /* Check for joystick state change */ 386 /* Check for joystick state change */
396 if (SDL_numjoysticks && (SDL_eventstate & SDL_JOYEVENTMASK)) { 387 if (SDL_numjoysticks && (SDL_eventstate & SDL_JOYEVENTMASK)) {
397 SDL_JoystickUpdate(); 388 SDL_JoystickUpdate();
398 } 389 }
399 #endif 390 #endif
400 #if !SDL_TOUCHSCREEN_DISABLED
401 /* Check for touchscreen state change */
402 if (SDL_numtouchscreens && (SDL_eventstate & SDL_TOUCHEVENTMASK)) {
403 SDL_TouchscreenUpdate();
404 }
405 #endif
406 } 391 }
407 } 392 }
408 393
409 /* Public functions */ 394 /* Public functions */
410 395