diff options
author | jimtla <none@none> | 2010-07-31 20:02:54 +0400 |
---|---|---|
committer | jimtla <none@none> | 2010-07-31 20:02:54 +0400 |
commit | 39ee818f988d2a2a11582a94c86dae7e5414045f (patch) | |
tree | ce9b13db3eb1243953ad2543848aee95d5e7ff94 /include/SDL_events.h | |
parent | 598471cf715bac37bbd6c8d35db4f4589b17e2b6 (diff) |
Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working).
Diffstat (limited to 'include/SDL_events.h')
-rw-r--r-- | include/SDL_events.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/SDL_events.h b/include/SDL_events.h index 928c64cb..032bed43 100644 --- a/include/SDL_events.h +++ b/include/SDL_events.h @@ -288,15 +288,15 @@ typedef struct SDL_TouchFingerEvent Uint32 type; /**< ::SDL_FINGERMOTION OR SDL_FINGERDOWN OR SDL_FINGERUP*/ Uint32 windowID; /**< The window with mouse focus, if any */ - long touchId; /**< The touch device id */ - long fingerId; + SDL_TouchID touchId; /**< The touch device id */ + SDL_FingerID fingerId; Uint8 state; /**< The current button state */ Uint8 padding1; Uint8 padding2; Uint8 padding3; - float x; - float y; - int pressure; + Uint16 x; + Uint16 y; + Uint16 pressure; } SDL_TouchFingerEvent; @@ -307,7 +307,7 @@ typedef struct SDL_TouchButtonEvent { Uint32 type; /**< ::SDL_TOUCHBUTTONUP OR SDL_TOUCHBUTTONDOWN */ Uint32 windowID; /**< The window with mouse focus, if any */ - long touchId; /**< The touch device index */ + SDL_TouchID touchId; /**< The touch device index */ Uint8 state; /**< The current button state */ Uint8 button; /**< The button changing state */ Uint8 padding1; @@ -323,7 +323,7 @@ typedef struct SDL_MultiGestureEvent { Uint32 type; /**< ::SDL_MULTIGESTURE */ Uint32 windowID; /**< The window with mouse focus, if any */ - long touchId; /**< The touch device index */ + SDL_TouchID touchId; /**< The touch device index */ float dTheta; float dDist; float x; //currently 0...1. Change to screen coords? @@ -335,8 +335,8 @@ typedef struct SDL_DollarGestureEvent { Uint32 type; /**< ::SDL_DOLLARGESTURE */ Uint32 windowID; /**< The window with mouse focus, if any */ - long touchId; /**< The touch device index */ - unsigned long gestureId; + SDL_TouchID touchId; /**< The touch device index */ + SDL_GestureID gestureId; float error; /* //TODO: Enable to give location? |