include/SDL_events.h
changeset 4678 f8431f66613d
parent 4676 99b4560b7aa1
child 4683 15dfe42edbfd
     1.1 --- a/include/SDL_events.h	Sat Jul 31 01:24:50 2010 +0400
     1.2 +++ b/include/SDL_events.h	Sat Jul 31 20:02:54 2010 +0400
     1.3 @@ -288,15 +288,15 @@
     1.4      Uint32 type;        /**< ::SDL_FINGERMOTION OR 
     1.5  			   SDL_FINGERDOWN OR SDL_FINGERUP*/
     1.6      Uint32 windowID;    /**< The window with mouse focus, if any */
     1.7 -    long touchId;        /**< The touch device id */
     1.8 -    long fingerId;
     1.9 +    SDL_TouchID touchId;        /**< The touch device id */
    1.10 +    SDL_FingerID fingerId;
    1.11      Uint8 state;        /**< The current button state */
    1.12      Uint8 padding1;
    1.13      Uint8 padding2;
    1.14      Uint8 padding3;
    1.15 -    float x;
    1.16 -    float y;
    1.17 -    int pressure;
    1.18 +    Uint16 x;
    1.19 +    Uint16 y;
    1.20 +    Uint16 pressure;
    1.21  } SDL_TouchFingerEvent;
    1.22  
    1.23  
    1.24 @@ -307,7 +307,7 @@
    1.25  {
    1.26      Uint32 type;        /**< ::SDL_TOUCHBUTTONUP OR SDL_TOUCHBUTTONDOWN */
    1.27      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.28 -    long touchId;        /**< The touch device index */
    1.29 +    SDL_TouchID touchId;        /**< The touch device index */
    1.30      Uint8 state;        /**< The current button state */
    1.31      Uint8 button;        /**< The button changing state */
    1.32      Uint8 padding1;
    1.33 @@ -323,7 +323,7 @@
    1.34  {
    1.35      Uint32 type;        /**< ::SDL_MULTIGESTURE */
    1.36      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.37 -    long touchId;        /**< The touch device index */
    1.38 +    SDL_TouchID touchId;        /**< The touch device index */
    1.39      float dTheta;
    1.40      float dDist;
    1.41      float x;  //currently 0...1. Change to screen coords?
    1.42 @@ -335,8 +335,8 @@
    1.43  {
    1.44      Uint32 type;        /**< ::SDL_DOLLARGESTURE */
    1.45      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.46 -    long touchId;        /**< The touch device index */
    1.47 -    unsigned long gestureId;
    1.48 +    SDL_TouchID touchId;        /**< The touch device index */
    1.49 +    SDL_GestureID gestureId;
    1.50      float error;
    1.51    /*
    1.52      //TODO: Enable to give location?