include/SDL_events.h
changeset 6950 1ddb72193079
parent 6949 4de584a3a027
child 6951 7833f01322b3
     1.1 --- a/include/SDL_events.h	Sat Mar 02 17:51:32 2013 -0800
     1.2 +++ b/include/SDL_events.h	Sat Mar 02 20:44:16 2013 -0800
     1.3 @@ -151,8 +151,8 @@
     1.4      Uint8 padding1;
     1.5      Uint8 padding2;
     1.6      Uint8 padding3;
     1.7 -    int data1;          /**< event dependent data */
     1.8 -    int data2;          /**< event dependent data */
     1.9 +    Sint32 data1;       /**< event dependent data */
    1.10 +    Sint32 data2;       /**< event dependent data */
    1.11  } SDL_WindowEvent;
    1.12  
    1.13  /**
    1.14 @@ -180,8 +180,8 @@
    1.15      Uint32 timestamp;
    1.16      Uint32 windowID;                            /**< The window with keyboard focus, if any */
    1.17      char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE];  /**< The editing text */
    1.18 -    int start;                                  /**< The start cursor of selected editing text */
    1.19 -    int length;                                 /**< The length of selected editing text */
    1.20 +    Sint32 start;                               /**< The start cursor of selected editing text */
    1.21 +    Sint32 length;                              /**< The length of selected editing text */
    1.22  } SDL_TextEditingEvent;
    1.23  
    1.24  
    1.25 @@ -205,14 +205,15 @@
    1.26      Uint32 type;        /**< ::SDL_MOUSEMOTION */
    1.27      Uint32 timestamp;
    1.28      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.29 +    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
    1.30      Uint8 state;        /**< The current button state */
    1.31      Uint8 padding1;
    1.32      Uint8 padding2;
    1.33      Uint8 padding3;
    1.34 -    int x;              /**< X coordinate, relative to window */
    1.35 -    int y;              /**< Y coordinate, relative to window */
    1.36 -    int xrel;           /**< The relative motion in the X direction */
    1.37 -    int yrel;           /**< The relative motion in the Y direction */
    1.38 +    Sint32 x;           /**< X coordinate, relative to window */
    1.39 +    Sint32 y;           /**< Y coordinate, relative to window */
    1.40 +    Sint32 xrel;        /**< The relative motion in the X direction */
    1.41 +    Sint32 yrel;        /**< The relative motion in the Y direction */
    1.42  } SDL_MouseMotionEvent;
    1.43  
    1.44  /**
    1.45 @@ -223,12 +224,13 @@
    1.46      Uint32 type;        /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */
    1.47      Uint32 timestamp;
    1.48      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.49 +    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
    1.50      Uint8 button;       /**< The mouse button index */
    1.51      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
    1.52      Uint8 padding1;
    1.53      Uint8 padding2;
    1.54 -    int x;              /**< X coordinate, relative to window */
    1.55 -    int y;              /**< Y coordinate, relative to window */
    1.56 +    Sint32 x;           /**< X coordinate, relative to window */
    1.57 +    Sint32 y;           /**< Y coordinate, relative to window */
    1.58  } SDL_MouseButtonEvent;
    1.59  
    1.60  /**
    1.61 @@ -239,8 +241,9 @@
    1.62      Uint32 type;        /**< ::SDL_MOUSEWHEEL */
    1.63      Uint32 timestamp;
    1.64      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.65 -    int x;              /**< The amount scrolled horizontally */
    1.66 -    int y;              /**< The amount scrolled vertically */
    1.67 +    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
    1.68 +    Sint32 x;           /**< The amount scrolled horizontally */
    1.69 +    Sint32 y;           /**< The amount scrolled vertically */
    1.70  } SDL_MouseWheelEvent;
    1.71  
    1.72  /**
    1.73 @@ -467,7 +470,7 @@
    1.74      Uint32 type;        /**< ::SDL_USEREVENT through ::SDL_NUMEVENTS-1 */
    1.75      Uint32 timestamp;
    1.76      Uint32 windowID;    /**< The associated window if any */
    1.77 -    int code;           /**< User defined event code */
    1.78 +    Sint32 code;        /**< User defined event code */
    1.79      void *data1;        /**< User defined data pointer */
    1.80      void *data2;        /**< User defined data pointer */
    1.81  } SDL_UserEvent;