include/SDL_events.h
changeset 4676 99b4560b7aa1
parent 4662 3c4e0130c9b1
child 4678 f8431f66613d
     1.1 --- a/include/SDL_events.h	Thu Jul 29 12:26:59 2010 -0400
     1.2 +++ b/include/SDL_events.h	Fri Jul 30 23:18:35 2010 +0400
     1.3 @@ -288,12 +288,14 @@
     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 -    Uint8 touchId;        /**< The touch device id */
     1.8 +    long touchId;        /**< The touch device id */
     1.9 +    long fingerId;
    1.10      Uint8 state;        /**< The current button state */
    1.11 -    Uint8 fingerId;
    1.12      Uint8 padding1;
    1.13 -    int x;
    1.14 -    int y;
    1.15 +    Uint8 padding2;
    1.16 +    Uint8 padding3;
    1.17 +    float x;
    1.18 +    float y;
    1.19      int pressure;
    1.20  } SDL_TouchFingerEvent;
    1.21  
    1.22 @@ -305,11 +307,11 @@
    1.23  {
    1.24      Uint32 type;        /**< ::SDL_TOUCHBUTTONUP OR SDL_TOUCHBUTTONDOWN */
    1.25      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.26 -    Uint8 touchId;        /**< The touch device index */
    1.27 +    long touchId;        /**< The touch device index */
    1.28      Uint8 state;        /**< The current button state */
    1.29      Uint8 button;        /**< The button changing state */
    1.30      Uint8 padding1;
    1.31 -
    1.32 +    Uint8 padding2;
    1.33  } SDL_TouchButtonEvent;
    1.34  
    1.35  
    1.36 @@ -321,10 +323,7 @@
    1.37  {
    1.38      Uint32 type;        /**< ::SDL_MULTIGESTURE */
    1.39      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.40 -    Uint8 touchId;        /**< The touch device index */
    1.41 -    Uint8 padding1;
    1.42 -    Uint8 padding2;
    1.43 -    Uint8 padding3;
    1.44 +    long touchId;        /**< The touch device index */
    1.45      float dTheta;
    1.46      float dDist;
    1.47      float x;  //currently 0...1. Change to screen coords?
    1.48 @@ -336,10 +335,7 @@
    1.49  {
    1.50      Uint32 type;        /**< ::SDL_DOLLARGESTURE */
    1.51      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.52 -    Uint8 touchId;        /**< The touch device index */
    1.53 -    Uint8 padding1;
    1.54 -    Uint8 padding2;
    1.55 -    Uint8 padding3;
    1.56 +    long touchId;        /**< The touch device index */
    1.57      unsigned long gestureId;
    1.58      float error;
    1.59    /*