Mercurial > sdl-ios-xcode
comparison include/SDL_events.h @ 4676:99b4560b7aa1
Upgraded touchId/fingerId to long. Changed position variables to floats.
author | jimtla |
---|---|
date | Fri, 30 Jul 2010 23:18:35 +0400 |
parents | 3c4e0130c9b1 |
children | f8431f66613d |
comparison
equal
deleted
inserted
replaced
4675:641c13b0ce5f | 4676:99b4560b7aa1 |
---|---|
286 typedef struct SDL_TouchFingerEvent | 286 typedef struct SDL_TouchFingerEvent |
287 { | 287 { |
288 Uint32 type; /**< ::SDL_FINGERMOTION OR | 288 Uint32 type; /**< ::SDL_FINGERMOTION OR |
289 SDL_FINGERDOWN OR SDL_FINGERUP*/ | 289 SDL_FINGERDOWN OR SDL_FINGERUP*/ |
290 Uint32 windowID; /**< The window with mouse focus, if any */ | 290 Uint32 windowID; /**< The window with mouse focus, if any */ |
291 Uint8 touchId; /**< The touch device id */ | 291 long touchId; /**< The touch device id */ |
292 long fingerId; | |
292 Uint8 state; /**< The current button state */ | 293 Uint8 state; /**< The current button state */ |
293 Uint8 fingerId; | 294 Uint8 padding1; |
294 Uint8 padding1; | 295 Uint8 padding2; |
295 int x; | 296 Uint8 padding3; |
296 int y; | 297 float x; |
298 float y; | |
297 int pressure; | 299 int pressure; |
298 } SDL_TouchFingerEvent; | 300 } SDL_TouchFingerEvent; |
299 | 301 |
300 | 302 |
301 /** | 303 /** |
303 */ | 305 */ |
304 typedef struct SDL_TouchButtonEvent | 306 typedef struct SDL_TouchButtonEvent |
305 { | 307 { |
306 Uint32 type; /**< ::SDL_TOUCHBUTTONUP OR SDL_TOUCHBUTTONDOWN */ | 308 Uint32 type; /**< ::SDL_TOUCHBUTTONUP OR SDL_TOUCHBUTTONDOWN */ |
307 Uint32 windowID; /**< The window with mouse focus, if any */ | 309 Uint32 windowID; /**< The window with mouse focus, if any */ |
308 Uint8 touchId; /**< The touch device index */ | 310 long touchId; /**< The touch device index */ |
309 Uint8 state; /**< The current button state */ | 311 Uint8 state; /**< The current button state */ |
310 Uint8 button; /**< The button changing state */ | 312 Uint8 button; /**< The button changing state */ |
311 Uint8 padding1; | 313 Uint8 padding1; |
312 | 314 Uint8 padding2; |
313 } SDL_TouchButtonEvent; | 315 } SDL_TouchButtonEvent; |
314 | 316 |
315 | 317 |
316 | 318 |
317 /** | 319 /** |
319 */ | 321 */ |
320 typedef struct SDL_MultiGestureEvent | 322 typedef struct SDL_MultiGestureEvent |
321 { | 323 { |
322 Uint32 type; /**< ::SDL_MULTIGESTURE */ | 324 Uint32 type; /**< ::SDL_MULTIGESTURE */ |
323 Uint32 windowID; /**< The window with mouse focus, if any */ | 325 Uint32 windowID; /**< The window with mouse focus, if any */ |
324 Uint8 touchId; /**< The touch device index */ | 326 long touchId; /**< The touch device index */ |
325 Uint8 padding1; | |
326 Uint8 padding2; | |
327 Uint8 padding3; | |
328 float dTheta; | 327 float dTheta; |
329 float dDist; | 328 float dDist; |
330 float x; //currently 0...1. Change to screen coords? | 329 float x; //currently 0...1. Change to screen coords? |
331 float y; | 330 float y; |
332 | 331 |
334 | 333 |
335 typedef struct SDL_DollarGestureEvent | 334 typedef struct SDL_DollarGestureEvent |
336 { | 335 { |
337 Uint32 type; /**< ::SDL_DOLLARGESTURE */ | 336 Uint32 type; /**< ::SDL_DOLLARGESTURE */ |
338 Uint32 windowID; /**< The window with mouse focus, if any */ | 337 Uint32 windowID; /**< The window with mouse focus, if any */ |
339 Uint8 touchId; /**< The touch device index */ | 338 long touchId; /**< The touch device index */ |
340 Uint8 padding1; | |
341 Uint8 padding2; | |
342 Uint8 padding3; | |
343 unsigned long gestureId; | 339 unsigned long gestureId; |
344 float error; | 340 float error; |
345 /* | 341 /* |
346 //TODO: Enable to give location? | 342 //TODO: Enable to give location? |
347 float x; //currently 0...1. Change to screen coords? | 343 float x; //currently 0...1. Change to screen coords? |