From fafb57ec0c2855d171d00d80794ff620a61cd4c0 Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Fri, 29 Jan 2016 23:13:17 +0100
Subject: [PATCH] Added data{1,2} fields to Event::User

---
 src/sdl2/event.rs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs
index 063798cf..a266d005 100644
--- a/src/sdl2/event.rs
+++ b/src/sdl2/event.rs
@@ -510,7 +510,9 @@ pub enum Event {
         timestamp: u32,
         window_id: u32,
         type_: u32,
-        code: i32
+        code: i32,
+        data1: *mut c_void,
+        data2: *mut c_void
     },
 
     Unknown {
@@ -570,15 +572,14 @@ impl Event {
     fn to_ll(self) -> Option<ll::SDL_Event> {
         let mut ret = unsafe { mem::uninitialized() };
         match self {
-            // just ignore timestamp
-            Event::User { window_id, type_, code, .. } => {
+            Event::User { window_id, type_, code, data1, data2, timestamp} => {
                 let event = ll::SDL_UserEvent {
                     type_: type_ as uint32_t,
-                    timestamp: 0,
+                    timestamp: timestamp,
                     windowID: window_id,
                     code: code as i32,
-                    data1: ptr::null_mut(),
-                    data2: ptr::null_mut(),
+                    data1: data1,
+                    data2: data2
                 };
                 unsafe {
                     ptr::copy(&event, &mut ret as *mut ll::SDL_Event as *mut ll::SDL_UserEvent, 1);
@@ -981,7 +982,9 @@ impl Event {
                         timestamp: event.timestamp,
                         window_id: event.windowID,
                         type_: raw_type,
-                        code: event.code
+                        code: event.code,
+                        data1: event.data1,
+                        data2: event.data2
                     }
                 }
             }