1.1 --- a/include/SDL_touch.h Thu Jul 29 12:26:59 2010 -0400
1.2 +++ b/include/SDL_touch.h Fri Jul 30 23:18:35 2010 +0400
1.3 @@ -43,15 +43,14 @@
1.4
1.5
1.6 struct SDL_Finger {
1.7 - int id;
1.8 - int x;
1.9 - int y;
1.10 - int z; /* for future use */
1.11 - int xdelta;
1.12 - int ydelta;
1.13 - int last_x, last_y,last_pressure; /* the last reported coordinates */
1.14 + long id;
1.15 + float x;
1.16 + float y;
1.17 + float xdelta;
1.18 + float ydelta;
1.19 + float last_x, last_y,last_pressure; /* the last reported coordinates */
1.20 SDL_bool down;
1.21 - int pressure;
1.22 + float pressure;
1.23 };
1.24
1.25 typedef struct SDL_Touch SDL_Touch;
1.26 @@ -64,15 +63,15 @@
1.27 void (*FreeTouch) (SDL_Touch * touch);
1.28
1.29 /* data common for tablets */
1.30 - int pressure_max, pressure_min;
1.31 - int x_max,x_min;
1.32 - int y_max,y_min;
1.33 - int xres,yres,pressureres;
1.34 - int tilt; /* for future use */
1.35 - int rotation; /* for future use */
1.36 + float pressure_max, pressure_min;
1.37 + float x_max,x_min;
1.38 + float y_max,y_min;
1.39 + float xres,yres,pressureres;
1.40 + float tilt; /* for future use */
1.41 + float rotation; /* for future use */
1.42
1.43 /* Data common to all touch */
1.44 - int id;
1.45 + long id;
1.46 SDL_Window *focus;
1.47
1.48 char *name;
1.49 @@ -96,7 +95,7 @@
1.50 *
1.51 *
1.52 */
1.53 - extern DECLSPEC SDL_Touch* SDLCALL SDL_GetTouch(int id);
1.54 + extern DECLSPEC SDL_Touch* SDLCALL SDL_GetTouch(long id);
1.55
1.56
1.57
1.58 @@ -105,7 +104,7 @@
1.59 *
1.60 *
1.61 */
1.62 - extern DECLSPEC SDL_Finger* SDLCALL SDL_GetFinger(SDL_Touch *touch, int id);
1.63 + extern DECLSPEC SDL_Finger* SDLCALL SDL_GetFinger(SDL_Touch *touch, long id);
1.64
1.65 /* Ends C function definitions when using C++ */
1.66 #ifdef __cplusplus