|
@@ -34,13 +34,6 @@
|
|
|
#include "../video/SDL_sysvideo.h"
|
|
|
#include "SDL_syswm.h"
|
|
|
|
|
|
-#undef SDL_PRIs64
|
|
|
-#if (defined(__WIN32__) || defined(__GDK__)) && !defined(__CYGWIN__)
|
|
|
-#define SDL_PRIs64 "I64d"
|
|
|
-#else
|
|
|
-#define SDL_PRIs64 "lld"
|
|
|
-#endif
|
|
|
-
|
|
|
/* An arbitrary limit so we don't have unbounded growth */
|
|
|
#define SDL_MAX_QUEUED_EVENTS 65535
|
|
|
|
|
@@ -454,8 +447,8 @@ static void SDL_LogEvent(const SDL_Event *event)
|
|
|
|
|
|
#define PRINT_FINGER_EVENT(event) \
|
|
|
(void)SDL_snprintf(details, sizeof(details), " (timestamp=%u touchid=%" SDL_PRIs64 " fingerid=%" SDL_PRIs64 " x=%f y=%f dx=%f dy=%f pressure=%f)", \
|
|
|
- (uint)event->tfinger.timestamp, (long long)event->tfinger.touchId, \
|
|
|
- (long long)event->tfinger.fingerId, event->tfinger.x, event->tfinger.y, \
|
|
|
+ (uint)event->tfinger.timestamp, event->tfinger.touchId, \
|
|
|
+ event->tfinger.fingerId, event->tfinger.x, event->tfinger.y, \
|
|
|
event->tfinger.dx, event->tfinger.dy, event->tfinger.pressure)
|
|
|
SDL_EVENT_CASE(SDL_FINGERDOWN)
|
|
|
PRINT_FINGER_EVENT(event);
|
|
@@ -470,8 +463,8 @@ static void SDL_LogEvent(const SDL_Event *event)
|
|
|
|
|
|
#define PRINT_DOLLAR_EVENT(event) \
|
|
|
(void)SDL_snprintf(details, sizeof(details), " (timestamp=%u touchid=%" SDL_PRIs64 " gestureid=%" SDL_PRIs64 " numfingers=%u error=%f x=%f y=%f)", \
|
|
|
- (uint)event->dgesture.timestamp, (long long)event->dgesture.touchId, \
|
|
|
- (long long)event->dgesture.gestureId, (uint)event->dgesture.numFingers, \
|
|
|
+ (uint)event->dgesture.timestamp, event->dgesture.touchId, \
|
|
|
+ event->dgesture.gestureId, (uint)event->dgesture.numFingers, \
|
|
|
event->dgesture.error, event->dgesture.x, event->dgesture.y)
|
|
|
SDL_EVENT_CASE(SDL_DOLLARGESTURE)
|
|
|
PRINT_DOLLAR_EVENT(event);
|
|
@@ -483,7 +476,7 @@ static void SDL_LogEvent(const SDL_Event *event)
|
|
|
|
|
|
SDL_EVENT_CASE(SDL_MULTIGESTURE)
|
|
|
(void)SDL_snprintf(details, sizeof(details), " (timestamp=%u touchid=%" SDL_PRIs64 " dtheta=%f ddist=%f x=%f y=%f numfingers=%u)",
|
|
|
- (uint)event->mgesture.timestamp, (long long)event->mgesture.touchId,
|
|
|
+ (uint)event->mgesture.timestamp, event->mgesture.touchId,
|
|
|
event->mgesture.dTheta, event->mgesture.dDist,
|
|
|
event->mgesture.x, event->mgesture.y, (uint)event->mgesture.numFingers);
|
|
|
break;
|