encounter/rust-sdl2
0
0
Fork 0
mirror of https://github.com/encounter/rust-sdl2.git synced 2026-07-10 21:18:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added data{1,2} fields to Event::User

Browse Source
This commit is contained in:
Maarten Hoogendoorn
2016-01-29 23:19:25 +01:00
parent 8d03a3255c
commit fafb57ec0c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdl2/event.rs
+10 -7
View File
@@ -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
}
}
}