comparison include/SDL_events.h @ 3763:81ea7d9a6624 gsoc2008_manymouse

Proximity events and evil-temporary makefile repair
author Szymon Wilczek <kazeuser@gmail.com>
date Wed, 02 Jul 2008 20:29:29 +0000
parents 64f346a83ed3
children ed9b7fe8f902
comparison
equal deleted inserted replaced
3762:f667489e7309 3763:81ea7d9a6624
70 SDL_JOYHATMOTION, /**< Joystick hat position change */ 70 SDL_JOYHATMOTION, /**< Joystick hat position change */
71 SDL_JOYBUTTONDOWN, /**< Joystick button pressed */ 71 SDL_JOYBUTTONDOWN, /**< Joystick button pressed */
72 SDL_JOYBUTTONUP, /**< Joystick button released */ 72 SDL_JOYBUTTONUP, /**< Joystick button released */
73 SDL_QUIT, /**< User-requested quit */ 73 SDL_QUIT, /**< User-requested quit */
74 SDL_SYSWMEVENT, /**< System specific event */ 74 SDL_SYSWMEVENT, /**< System specific event */
75 SDL_PROXIMITYIN, /**< Proximity In event */
76 SDL_PROXIMITYOUT, /**< Proximity Out event */
75 SDL_EVENT_RESERVED1, /**< Reserved for future use... */ 77 SDL_EVENT_RESERVED1, /**< Reserved for future use... */
76 SDL_EVENT_RESERVED2, /**< Reserved for future use... */ 78 SDL_EVENT_RESERVED2,
77 SDL_EVENT_RESERVED3, /**< Reserved for future use... */ 79 SDL_EVENT_RESERVED3,
78 /* Events SDL_USEREVENT through SDL_MAXEVENTS-1 are for your use */ 80 /* Events SDL_USEREVENT through SDL_MAXEVENTS-1 are for your use */
79 SDL_USEREVENT = 24, 81 SDL_USEREVENT = 24,
80 /* This last event is only for bounding internal arrays 82 /* This last event is only for bounding internal arrays
81 It is the number of bits in the event mask datatype -- Uint32 83 It is the number of bits in the event mask datatype -- Uint32
82 */ 84 */
110 SDL_JOYEVENTMASK = SDL_EVENTMASK(SDL_JOYAXISMOTION) | 112 SDL_JOYEVENTMASK = SDL_EVENTMASK(SDL_JOYAXISMOTION) |
111 SDL_EVENTMASK(SDL_JOYBALLMOTION) | 113 SDL_EVENTMASK(SDL_JOYBALLMOTION) |
112 SDL_EVENTMASK(SDL_JOYHATMOTION) | 114 SDL_EVENTMASK(SDL_JOYHATMOTION) |
113 SDL_EVENTMASK(SDL_JOYBUTTONDOWN) | SDL_EVENTMASK(SDL_JOYBUTTONUP), 115 SDL_EVENTMASK(SDL_JOYBUTTONDOWN) | SDL_EVENTMASK(SDL_JOYBUTTONUP),
114 SDL_QUITMASK = SDL_EVENTMASK(SDL_QUIT), 116 SDL_QUITMASK = SDL_EVENTMASK(SDL_QUIT),
115 SDL_SYSWMEVENTMASK = SDL_EVENTMASK(SDL_SYSWMEVENT) 117 SDL_SYSWMEVENTMASK = SDL_EVENTMASK(SDL_SYSWMEVENT),
118 SDL_PROXIMITYINMASK = SDL_EVENTMASK(SDL_PROXIMITYIN),
119 SDL_PROXIMITYOUTMASK = SDL_EVENTMASK(SDL_PROXIMITYOUT)
116 } SDL_EventMask; 120 } SDL_EventMask;
117 #define SDL_ALLEVENTS 0xFFFFFFFF 121 #define SDL_ALLEVENTS 0xFFFFFFFF
118 122
119 /** 123 /**
120 * \struct SDL_WindowEvent 124 * \struct SDL_WindowEvent
314 { 318 {
315 Uint8 type; 319 Uint8 type;
316 int w; 320 int w;
317 int h; 321 int h;
318 } SDL_ResizeEvent; 322 } SDL_ResizeEvent;
323
324 typedef struct SDL_ProximityEvent
325 {
326 Uint8 which;
327 Uint8 type;
328 int x;
329 int y;
330 } SDL_ProximityEvent;
319 331
320 /** 332 /**
321 * \union SDL_Event 333 * \union SDL_Event
322 * 334 *
323 * \brief General event structure 335 * \brief General event structure
336 SDL_JoyHatEvent jhat; /**< Joystick hat event data */ 348 SDL_JoyHatEvent jhat; /**< Joystick hat event data */
337 SDL_JoyButtonEvent jbutton; /**< Joystick button event data */ 349 SDL_JoyButtonEvent jbutton; /**< Joystick button event data */
338 SDL_QuitEvent quit; /**< Quit request event data */ 350 SDL_QuitEvent quit; /**< Quit request event data */
339 SDL_UserEvent user; /**< Custom event data */ 351 SDL_UserEvent user; /**< Custom event data */
340 SDL_SysWMEvent syswm; /**< System dependent window event data */ 352 SDL_SysWMEvent syswm; /**< System dependent window event data */
341 353 SDL_ProximityEvent proximity; /**< Proximity In or Out event */
342 /* Temporarily here for backwards compatibility */ 354 /* Temporarily here for backwards compatibility */
343 SDL_ActiveEvent active; 355 SDL_ActiveEvent active;
344 SDL_ResizeEvent resize; 356 SDL_ResizeEvent resize;
345 } SDL_Event; 357 } SDL_Event;
346 358