include/SDL_events.h
changeset 6964 c8aa24f05042
parent 6951 7833f01322b3
child 6972 3457cb05b7fb
     1.1 --- a/include/SDL_events.h	Mon Mar 04 20:27:51 2013 -0800
     1.2 +++ b/include/SDL_events.h	Tue Mar 05 17:59:36 2013 -0500
     1.3 @@ -100,6 +100,7 @@
     1.4  	SDL_CONTROLLERBUTTONUP,            /**< Game controller button released */
     1.5  	SDL_CONTROLLERDEVICEADDED,         /**< A new Game controller has been inserted into the system */
     1.6  	SDL_CONTROLLERDEVICEREMOVED,       /**< An opened Game controller has been removed */
     1.7 +	SDL_CONTROLLERDEVICEREMAPPED,      /**< The controller mapping was updated */
     1.8  
     1.9      /* Touch events */
    1.10      SDL_FINGERDOWN      = 0x700,
    1.11 @@ -358,9 +359,9 @@
    1.12   */
    1.13  typedef struct SDL_ControllerDeviceEvent
    1.14  {
    1.15 -	Uint32 type;        /**< ::SDL_CONTROLLERDEVICEADDED or ::SDL_CONTROLLERDEVICEREMOVED */
    1.16 +	Uint32 type;        /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */
    1.17  	Uint32 timestamp;
    1.18 -	Uint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED event */
    1.19 +	Uint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */
    1.20  } SDL_ControllerDeviceEvent;
    1.21  
    1.22  
    1.23 @@ -484,7 +485,7 @@
    1.24      SDL_JoyHatEvent jhat;           /**< Joystick hat event data */
    1.25      SDL_JoyButtonEvent jbutton;     /**< Joystick button event data */
    1.26      SDL_JoyDeviceEvent jdevice;     /**< Joystick device change event data */
    1.27 -	SDL_ControllerAxisEvent caxis;		/**< Game Controller button event data */
    1.28 +	SDL_ControllerAxisEvent caxis;		/**< Game Controller axis event data */
    1.29  	SDL_ControllerButtonEvent cbutton;  /**< Game Controller button event data */
    1.30  	SDL_ControllerDeviceEvent cdevice;  /**< Game Controller device event data */
    1.31      SDL_QuitEvent quit;             /**< Quit request event data */