Merge pull request #5492 from Ms2ger/MouseButton

Introduce a MouseButton enum.

components/compositing/compositor_layer.rs

@@ -49,7 +49,7 @@ pub struct CompositorData {
 impl CompositorData {
     pub fn new_layer(layer_properties: LayerProperties,
                      wants_scroll_events: WantsScrollEventsFlag,
-                     tile_size: uint)
+                     tile_size: usize)
                      -> Rc<Layer<CompositorData>> {
         let new_compositor_data = CompositorData {
             pipeline_id: layer_properties.pipeline_id,

components/compositing/lib.rs

@@ -4,7 +4,6 @@
 
 #![feature(box_syntax)]
 #![feature(core)]
-#![feature(int_uint)]
 #![feature(io)]
 #![feature(old_io)]
 #![feature(rustc_private)]

components/compositing/windowing.rs

@@ -13,6 +13,7 @@ use layers::geometry::DevicePixel;
 use layers::platform::surface::NativeGraphicsMetadata;
 use msg::compositor_msg::{PaintState, ReadyState};
 use msg::constellation_msg::{Key, KeyState, KeyModifiers};
+use script_traits::MouseButton;
 use url::Url;
 use util::cursor::Cursor;
 use util::geometry::ScreenPx;
@@ -21,9 +22,9 @@ use std::rc::Rc;
 
 #[derive(Clone)]
 pub enum MouseWindowEvent {
-    Click(uint, TypedPoint2D<DevicePixel, f32>),
-    MouseDown(uint, TypedPoint2D<DevicePixel, f32>),
-    MouseUp(uint, TypedPoint2D<DevicePixel, f32>),
+    Click(MouseButton, TypedPoint2D<DevicePixel, f32>),
+    MouseDown(MouseButton, TypedPoint2D<DevicePixel, f32>),
+    MouseUp(MouseButton, TypedPoint2D<DevicePixel, f32>),
 }
 
 #[derive(Clone)]

components/script/dom/document.rs

@@ -66,7 +66,7 @@ use msg::constellation_msg::{SUPER, ALT, SHIFT, CONTROL};
 use net::resource_task::ControlMsg::{SetCookiesForUrl, GetCookiesForUrl};
 use net::cookie_storage::CookieSource::NonHTTP;
 use script_task::Runnable;
-use script_traits::UntrustedNodeAddress;
+use script_traits::{MouseButton, UntrustedNodeAddress};
 use util::{opts, namespace};
 use util::str::{DOMString, split_html_space_chars};
 use layout_interface::{ReflowGoal, ReflowQueryType};
@@ -216,7 +216,8 @@ pub trait DocumentHelpers<'a> {
     fn title_changed(self);
     fn send_title_to_compositor(self);
     fn dirty_all_nodes(self);
-    fn handle_click_event(self, js_runtime: *mut JSRuntime, _button: uint, point: Point2D<f32>);
+    fn handle_click_event(self, js_runtime: *mut JSRuntime,
+                          button: MouseButton, point: Point2D<f32>);
     fn dispatch_key_event(self, key: Key, state: KeyState,
         modifiers: KeyModifiers, compositor: &mut Box<ScriptListener+'static>);
 
@@ -480,7 +481,8 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
         }
     }
 
-    fn handle_click_event(self, js_runtime: *mut JSRuntime, _button: uint, point: Point2D<f32>) {
+    fn handle_click_event(self, js_runtime: *mut JSRuntime,
+                          _button: MouseButton, point: Point2D<f32>) {
         debug!("ClickEvent: clicked at {:?}", point);
         let node = match self.hit_test(&point) {
             Some(node_address) => {

components/script/script_task.rs

@@ -1205,10 +1205,10 @@ impl ScriptTask {
                 self.handle_reflow_event(pipeline_id);
             }
 
-            ClickEvent(_button, point) => {
+            ClickEvent(button, point) => {
                 let page = get_page(&self.root_page(), pipeline_id);
                 let document = page.document().root();
-                document.r().handle_click_event(self.js_runtime.ptr, _button, point);
+                document.r().handle_click_event(self.js_runtime.ptr, button, point);
             }
 
             MouseDownEvent(..) => {}

components/script_traits/lib.rs

@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![feature(int_uint)]
-
 extern crate devtools_traits;
 extern crate geom;
 extern crate libc;
@@ -81,13 +79,21 @@ pub enum ConstellationControlMsg {
 unsafe impl Send for ConstellationControlMsg {
 }
 
+/// The mouse button involved in the event.
+#[derive(Clone, Debug)]
+pub enum MouseButton {
+    Left,
+    Middle,
+    Right,
+}
+
 /// Events from the compositor that the script task needs to know about
 pub enum CompositorEvent {
     ResizeEvent(WindowSizeData),
     ReflowEvent(SmallVec1<UntrustedNodeAddress>),
-    ClickEvent(uint, Point2D<f32>),
-    MouseDownEvent(uint, Point2D<f32>),
-    MouseUpEvent(uint, Point2D<f32>),
+    ClickEvent(MouseButton, Point2D<f32>),
+    MouseDownEvent(MouseButton, Point2D<f32>),
+    MouseUpEvent(MouseButton, Point2D<f32>),
     MouseMoveEvent(Point2D<f32>),
     KeyEvent(Key, KeyState, KeyModifiers),
 }

components/servo/Cargo.lock

@@ -398,6 +398,7 @@ dependencies = [
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
+ "script_traits 0.0.1",
  "time 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",