We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

diff for suggested path

diff.txt (text/plain), 16.14 KB, created by Mike Lawrence on 2015-04-23 18:17:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Lawrence

Created: 2015-04-23 18:17:38 UTC

Size: 16.14 KB

patch

obsolete

>Binary files SDL-2.0.4-9561/.DS_Store and SDL-2.0.4-XXXX/.DS_Store differ
>diff -crB SDL-2.0.4-9561/include/SDL_events.h SDL-2.0.4-XXXX/include/SDL_events.h
>*** SDL-2.0.4-9561/include/SDL_events.h	2015-03-22 21:49:01.000000000 -0300
>--- SDL-2.0.4-XXXX/include/SDL_events.h	2015-04-23 15:12:33.000000000 -0300
>***************
>*** 159,165 ****
>  typedef struct SDL_CommonEvent
>  {
>      Uint32 type;
>!     Uint32 timestamp;
>  } SDL_CommonEvent;
>  
>  /**
>--- 159,165 ----
>  typedef struct SDL_CommonEvent
>  {
>      Uint32 type;
>!     Uint64 timestamp;
>  } SDL_CommonEvent;
>  
>  /**
>***************
>*** 168,174 ****
>  typedef struct SDL_WindowEvent
>  {
>      Uint32 type;        /**< ::SDL_WINDOWEVENT */
>!     Uint32 timestamp;
>      Uint32 windowID;    /**< The associated window */
>      Uint8 event;        /**< ::SDL_WindowEventID */
>      Uint8 padding1;
>--- 168,174 ----
>  typedef struct SDL_WindowEvent
>  {
>      Uint32 type;        /**< ::SDL_WINDOWEVENT */
>!     Uint64 timestamp;
>      Uint32 windowID;    /**< The associated window */
>      Uint8 event;        /**< ::SDL_WindowEventID */
>      Uint8 padding1;
>***************
>*** 184,190 ****
>  typedef struct SDL_KeyboardEvent
>  {
>      Uint32 type;        /**< ::SDL_KEYDOWN or ::SDL_KEYUP */
>!     Uint32 timestamp;
>      Uint32 windowID;    /**< The window with keyboard focus, if any */
>      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
>      Uint8 repeat;       /**< Non-zero if this is a key repeat */
>--- 184,190 ----
>  typedef struct SDL_KeyboardEvent
>  {
>      Uint32 type;        /**< ::SDL_KEYDOWN or ::SDL_KEYUP */
>!     Uint64 timestamp;
>      Uint32 windowID;    /**< The window with keyboard focus, if any */
>      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
>      Uint8 repeat;       /**< Non-zero if this is a key repeat */
>***************
>*** 200,206 ****
>  typedef struct SDL_TextEditingEvent
>  {
>      Uint32 type;                                /**< ::SDL_TEXTEDITING */
>!     Uint32 timestamp;
>      Uint32 windowID;                            /**< The window with keyboard focus, if any */
>      char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE];  /**< The editing text */
>      Sint32 start;                               /**< The start cursor of selected editing text */
>--- 200,206 ----
>  typedef struct SDL_TextEditingEvent
>  {
>      Uint32 type;                                /**< ::SDL_TEXTEDITING */
>!     Uint64 timestamp;
>      Uint32 windowID;                            /**< The window with keyboard focus, if any */
>      char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE];  /**< The editing text */
>      Sint32 start;                               /**< The start cursor of selected editing text */
>***************
>*** 215,221 ****
>  typedef struct SDL_TextInputEvent
>  {
>      Uint32 type;                              /**< ::SDL_TEXTINPUT */
>!     Uint32 timestamp;
>      Uint32 windowID;                          /**< The window with keyboard focus, if any */
>      char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];  /**< The input text */
>  } SDL_TextInputEvent;
>--- 215,221 ----
>  typedef struct SDL_TextInputEvent
>  {
>      Uint32 type;                              /**< ::SDL_TEXTINPUT */
>!     Uint64 timestamp;
>      Uint32 windowID;                          /**< The window with keyboard focus, if any */
>      char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];  /**< The input text */
>  } SDL_TextInputEvent;
>***************
>*** 226,232 ****
>  typedef struct SDL_MouseMotionEvent
>  {
>      Uint32 type;        /**< ::SDL_MOUSEMOTION */
>!     Uint32 timestamp;
>      Uint32 windowID;    /**< The window with mouse focus, if any */
>      Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
>      Uint32 state;       /**< The current button state */
>--- 226,232 ----
>  typedef struct SDL_MouseMotionEvent
>  {
>      Uint32 type;        /**< ::SDL_MOUSEMOTION */
>!     Uint64 timestamp;
>      Uint32 windowID;    /**< The window with mouse focus, if any */
>      Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
>      Uint32 state;       /**< The current button state */
>***************
>*** 242,248 ****
>  typedef struct SDL_MouseButtonEvent
>  {
>      Uint32 type;        /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */
>!     Uint32 timestamp;
>      Uint32 windowID;    /**< The window with mouse focus, if any */
>      Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
>      Uint8 button;       /**< The mouse button index */
>--- 242,248 ----
>  typedef struct SDL_MouseButtonEvent
>  {
>      Uint32 type;        /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */
>!     Uint64 timestamp;
>      Uint32 windowID;    /**< The window with mouse focus, if any */
>      Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
>      Uint8 button;       /**< The mouse button index */
>***************
>*** 259,265 ****
>  typedef struct SDL_MouseWheelEvent
>  {
>      Uint32 type;        /**< ::SDL_MOUSEWHEEL */
>!     Uint32 timestamp;
>      Uint32 windowID;    /**< The window with mouse focus, if any */
>      Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
>      Sint32 x;           /**< The amount scrolled horizontally, positive to the right and negative to the left */
>--- 259,265 ----
>  typedef struct SDL_MouseWheelEvent
>  {
>      Uint32 type;        /**< ::SDL_MOUSEWHEEL */
>!     Uint64 timestamp;
>      Uint32 windowID;    /**< The window with mouse focus, if any */
>      Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
>      Sint32 x;           /**< The amount scrolled horizontally, positive to the right and negative to the left */
>***************
>*** 273,279 ****
>  typedef struct SDL_JoyAxisEvent
>  {
>      Uint32 type;        /**< ::SDL_JOYAXISMOTION */
>!     Uint32 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 axis;         /**< The joystick axis index */
>      Uint8 padding1;
>--- 273,279 ----
>  typedef struct SDL_JoyAxisEvent
>  {
>      Uint32 type;        /**< ::SDL_JOYAXISMOTION */
>!     Uint64 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 axis;         /**< The joystick axis index */
>      Uint8 padding1;
>***************
>*** 289,295 ****
>  typedef struct SDL_JoyBallEvent
>  {
>      Uint32 type;        /**< ::SDL_JOYBALLMOTION */
>!     Uint32 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 ball;         /**< The joystick trackball index */
>      Uint8 padding1;
>--- 289,295 ----
>  typedef struct SDL_JoyBallEvent
>  {
>      Uint32 type;        /**< ::SDL_JOYBALLMOTION */
>!     Uint64 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 ball;         /**< The joystick trackball index */
>      Uint8 padding1;
>***************
>*** 305,311 ****
>  typedef struct SDL_JoyHatEvent
>  {
>      Uint32 type;        /**< ::SDL_JOYHATMOTION */
>!     Uint32 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 hat;          /**< The joystick hat index */
>      Uint8 value;        /**< The hat position value.
>--- 305,311 ----
>  typedef struct SDL_JoyHatEvent
>  {
>      Uint32 type;        /**< ::SDL_JOYHATMOTION */
>!     Uint64 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 hat;          /**< The joystick hat index */
>      Uint8 value;        /**< The hat position value.
>***************
>*** 325,331 ****
>  typedef struct SDL_JoyButtonEvent
>  {
>      Uint32 type;        /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */
>!     Uint32 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 button;       /**< The joystick button index */
>      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
>--- 325,331 ----
>  typedef struct SDL_JoyButtonEvent
>  {
>      Uint32 type;        /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */
>!     Uint64 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 button;       /**< The joystick button index */
>      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
>***************
>*** 339,345 ****
>  typedef struct SDL_JoyDeviceEvent
>  {
>      Uint32 type;        /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */
>!     Uint32 timestamp;
>      Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED event */
>  } SDL_JoyDeviceEvent;
>  
>--- 339,345 ----
>  typedef struct SDL_JoyDeviceEvent
>  {
>      Uint32 type;        /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */
>!     Uint64 timestamp;
>      Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED event */
>  } SDL_JoyDeviceEvent;
>  
>***************
>*** 350,356 ****
>  typedef struct SDL_ControllerAxisEvent
>  {
>      Uint32 type;        /**< ::SDL_CONTROLLERAXISMOTION */
>!     Uint32 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 axis;         /**< The controller axis (SDL_GameControllerAxis) */
>      Uint8 padding1;
>--- 350,356 ----
>  typedef struct SDL_ControllerAxisEvent
>  {
>      Uint32 type;        /**< ::SDL_CONTROLLERAXISMOTION */
>!     Uint64 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 axis;         /**< The controller axis (SDL_GameControllerAxis) */
>      Uint8 padding1;
>***************
>*** 367,373 ****
>  typedef struct SDL_ControllerButtonEvent
>  {
>      Uint32 type;        /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */
>!     Uint32 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 button;       /**< The controller button (SDL_GameControllerButton) */
>      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
>--- 367,373 ----
>  typedef struct SDL_ControllerButtonEvent
>  {
>      Uint32 type;        /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */
>!     Uint64 timestamp;
>      SDL_JoystickID which; /**< The joystick instance id */
>      Uint8 button;       /**< The controller button (SDL_GameControllerButton) */
>      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
>***************
>*** 382,388 ****
>  typedef struct SDL_ControllerDeviceEvent
>  {
>      Uint32 type;        /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */
>!     Uint32 timestamp;
>      Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */
>  } SDL_ControllerDeviceEvent;
>  
>--- 382,388 ----
>  typedef struct SDL_ControllerDeviceEvent
>  {
>      Uint32 type;        /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */
>!     Uint64 timestamp;
>      Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */
>  } SDL_ControllerDeviceEvent;
>  
>***************
>*** 392,398 ****
>  typedef struct SDL_AudioDeviceEvent
>  {
>      Uint32 type;        /**< ::SDL_AUDIODEVICEADDED, or ::SDL_AUDIODEVICEREMOVED */
>!     Uint32 timestamp;
>      Uint32 which;       /**< The audio device index for the ADDED event (valid until next SDL_GetNumAudioDevices() call), SDL_AudioDeviceID for the REMOVED event */
>      Uint8 iscapture;    /**< zero if an output device, non-zero if a capture device. */
>      Uint8 padding1;
>--- 392,398 ----
>  typedef struct SDL_AudioDeviceEvent
>  {
>      Uint32 type;        /**< ::SDL_AUDIODEVICEADDED, or ::SDL_AUDIODEVICEREMOVED */
>!     Uint64 timestamp;
>      Uint32 which;       /**< The audio device index for the ADDED event (valid until next SDL_GetNumAudioDevices() call), SDL_AudioDeviceID for the REMOVED event */
>      Uint8 iscapture;    /**< zero if an output device, non-zero if a capture device. */
>      Uint8 padding1;
>***************
>*** 407,413 ****
>  typedef struct SDL_TouchFingerEvent
>  {
>      Uint32 type;        /**< ::SDL_FINGERMOTION or ::SDL_FINGERDOWN or ::SDL_FINGERUP */
>!     Uint32 timestamp;
>      SDL_TouchID touchId; /**< The touch device id */
>      SDL_FingerID fingerId;
>      float x;            /**< Normalized in the range 0...1 */
>--- 407,413 ----
>  typedef struct SDL_TouchFingerEvent
>  {
>      Uint32 type;        /**< ::SDL_FINGERMOTION or ::SDL_FINGERDOWN or ::SDL_FINGERUP */
>!     Uint64 timestamp;
>      SDL_TouchID touchId; /**< The touch device id */
>      SDL_FingerID fingerId;
>      float x;            /**< Normalized in the range 0...1 */
>***************
>*** 424,430 ****
>  typedef struct SDL_MultiGestureEvent
>  {
>      Uint32 type;        /**< ::SDL_MULTIGESTURE */
>!     Uint32 timestamp;
>      SDL_TouchID touchId; /**< The touch device index */
>      float dTheta;
>      float dDist;
>--- 424,430 ----
>  typedef struct SDL_MultiGestureEvent
>  {
>      Uint32 type;        /**< ::SDL_MULTIGESTURE */
>!     Uint64 timestamp;
>      SDL_TouchID touchId; /**< The touch device index */
>      float dTheta;
>      float dDist;
>***************
>*** 441,447 ****
>  typedef struct SDL_DollarGestureEvent
>  {
>      Uint32 type;        /**< ::SDL_DOLLARGESTURE or ::SDL_DOLLARRECORD */
>!     Uint32 timestamp;
>      SDL_TouchID touchId; /**< The touch device id */
>      SDL_GestureID gestureId;
>      Uint32 numFingers;
>--- 441,447 ----
>  typedef struct SDL_DollarGestureEvent
>  {
>      Uint32 type;        /**< ::SDL_DOLLARGESTURE or ::SDL_DOLLARRECORD */
>!     Uint64 timestamp;
>      SDL_TouchID touchId; /**< The touch device id */
>      SDL_GestureID gestureId;
>      Uint32 numFingers;
>***************
>*** 459,465 ****
>  typedef struct SDL_DropEvent
>  {
>      Uint32 type;        /**< ::SDL_DROPFILE */
>!     Uint32 timestamp;
>      char *file;         /**< The file name, which should be freed with SDL_free() */
>  } SDL_DropEvent;
>  
>--- 459,465 ----
>  typedef struct SDL_DropEvent
>  {
>      Uint32 type;        /**< ::SDL_DROPFILE */
>!     Uint64 timestamp;
>      char *file;         /**< The file name, which should be freed with SDL_free() */
>  } SDL_DropEvent;
>  
>***************
>*** 470,476 ****
>  typedef struct SDL_QuitEvent
>  {
>      Uint32 type;        /**< ::SDL_QUIT */
>!     Uint32 timestamp;
>  } SDL_QuitEvent;
>  
>  /**
>--- 470,476 ----
>  typedef struct SDL_QuitEvent
>  {
>      Uint32 type;        /**< ::SDL_QUIT */
>!     Uint64 timestamp;
>  } SDL_QuitEvent;
>  
>  /**
>***************
>*** 479,485 ****
>  typedef struct SDL_OSEvent
>  {
>      Uint32 type;        /**< ::SDL_QUIT */
>!     Uint32 timestamp;
>  } SDL_OSEvent;
>  
>  /**
>--- 479,485 ----
>  typedef struct SDL_OSEvent
>  {
>      Uint32 type;        /**< ::SDL_QUIT */
>!     Uint64 timestamp;
>  } SDL_OSEvent;
>  
>  /**
>***************
>*** 488,494 ****
>  typedef struct SDL_UserEvent
>  {
>      Uint32 type;        /**< ::SDL_USEREVENT through ::SDL_LASTEVENT-1 */
>!     Uint32 timestamp;
>      Uint32 windowID;    /**< The associated window if any */
>      Sint32 code;        /**< User defined event code */
>      void *data1;        /**< User defined data pointer */
>--- 488,494 ----
>  typedef struct SDL_UserEvent
>  {
>      Uint32 type;        /**< ::SDL_USEREVENT through ::SDL_LASTEVENT-1 */
>!     Uint64 timestamp;
>      Uint32 windowID;    /**< The associated window if any */
>      Sint32 code;        /**< User defined event code */
>      void *data1;        /**< User defined data pointer */
>***************
>*** 508,514 ****
>  typedef struct SDL_SysWMEvent
>  {
>      Uint32 type;        /**< ::SDL_SYSWMEVENT */
>!     Uint32 timestamp;
>      SDL_SysWMmsg *msg;  /**< driver dependent data, defined in SDL_syswm.h */
>  } SDL_SysWMEvent;
>  
>--- 508,514 ----
>  typedef struct SDL_SysWMEvent
>  {
>      Uint32 type;        /**< ::SDL_SYSWMEVENT */
>!     Uint64 timestamp;
>      SDL_SysWMmsg *msg;  /**< driver dependent data, defined in SDL_syswm.h */
>  } SDL_SysWMEvent;
>  
>Binary files SDL-2.0.4-9561/src/.DS_Store and SDL-2.0.4-XXXX/src/.DS_Store differ
>diff -crB SDL-2.0.4-9561/src/events/SDL_events.c SDL-2.0.4-XXXX/src/events/SDL_events.c
>*** SDL-2.0.4-9561/src/events/SDL_events.c	2015-04-15 18:51:02.000000000 -0300
>--- SDL-2.0.4-XXXX/src/events/SDL_events.c	2015-04-23 15:13:17.000000000 -0300
>***************
>*** 428,434 ****
>      Uint32 expiration = 0;
>  
>      if (timeout > 0)
>!         expiration = SDL_GetTicks() + timeout;
>  
>      for (;;) {
>          SDL_PumpEvents();
>--- 428,434 ----
>      Uint32 expiration = 0;
>  
>      if (timeout > 0)
>!         expiration = SDL_GetPerformanceCounter() + timeout;
>  
>      for (;;) {
>          SDL_PumpEvents();

Actions: View

Attachments on bug 2958: 2131

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.