return coordinates in MouseWheel events

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "servo-glutin"
-version = "0.6.6"
+version = "0.7.0"
 authors = ["The glutin contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform OpenGL context provider."
 keywords = ["windowing", "opengl"]

src/api/cocoa/mod.rs

@@ -1136,7 +1136,11 @@ unsafe fn NSEventToEvent(window: &Window, nsevent: id) -> Option<Event> {
                 appkit::NSEventPhaseEnded => TouchPhase::Ended,
                 _ => TouchPhase::Moved,
             };
-            Some(Event::MouseWheel(delta, phase))
+            let mouse_position = match phase {
+                TouchPhase::Started => Some(get_mouse_position(window, nsevent)),
+                _ => None
+            };
+            Some(Event::MouseWheel(delta, phase, mouse_position))
         },
         appkit::NSEventTypePressure => {
             Some(Event::TouchpadPressure(nsevent.pressure(), nsevent.stage()))

src/api/wayland/events.rs

@@ -101,7 +101,8 @@ pub fn translate_event(
                                 MouseScrollDelta::PixelDelta(0.0, amplitude as f32)
                             }
                         },
-                        TouchPhase::Moved
+                        TouchPhase::Moved,
+                        None
                     ), surface))
                 } else {
                     None

src/api/win32/callback.rs

@@ -140,7 +140,7 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
             let value = value as i32;
             let value = value as f32 / winapi::WHEEL_DELTA as f32;
 
-            send_event(window, MouseWheel(LineDelta(0.0, value), TouchPhase::Moved));
+            send_event(window, MouseWheel(LineDelta(0.0, value), TouchPhase::Moved, None));
 
             0
         },

src/api/x11/input.rs

@@ -201,7 +201,7 @@ impl XInputEventHandler {
                             } else {
                                 -1.0
                             };
-                            Some(MouseWheel(LineDelta(0.0, delta), TouchPhase::Moved))
+                            Some(MouseWheel(LineDelta(0.0, delta), TouchPhase::Moved, None))
                         } else {
                             // emulated button event from a touch/smooth-scroll
                             // event. Ignore these events and handle scrolling
@@ -236,7 +236,8 @@ impl XInputEventHandler {
 
                 if scroll_delta.0.abs() > 0.0 || scroll_delta.1.abs() > 0.0 {
                     Some(MouseWheel(LineDelta(scroll_delta.0 as f32, scroll_delta.1 as f32),
-                                    TouchPhase::Moved))
+                                    TouchPhase::Moved,
+                                    None))
                 } else {
                     let new_cursor_pos = (event_data.event_x, event_data.event_y);
                     if new_cursor_pos != self.current_state.cursor_pos {

src/events.rs

@@ -31,7 +31,7 @@ pub enum Event {
     MouseMoved(i32, i32),
 
     /// A mouse wheel movement or touchpad scroll occurred.
-    MouseWheel(MouseScrollDelta, TouchPhase),
+    MouseWheel(MouseScrollDelta, TouchPhase, Option<(i32, i32)>),
 
     /// An event from the mouse has been received.
     MouseInput(ElementState, MouseButton, Option<(i32, i32)>),