Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #5492 - Introduce a MouseButton enum (from Ms2ger:MouseButton)

Browse Source 
Source-Repo: https://github.com/servo/servo
Source-Revision: 02be76bd4855a226669e8fcd1a638ff53e8f83d5
This commit is contained in:
Ms2ger 2015-04-03 13:29:12 +02:00
parent feb3f90385
commit e137b3f89d
18 changed files with 58 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servo/components/compositing/compositor_layer.rs
View File

@ -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,

1
servo/components/compositing/lib.rs
View File

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

7
servo/components/compositing/windowing.rs
View File

@ -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)]

8
servo/components/script/dom/document.rs
View File

@ -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) => {

4
servo/components/script/script_task.rs
View File

@ -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(..) => {}

16
servo/components/script_traits/lib.rs
View File

@ -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),
}

1
servo/components/servo/Cargo.lock generated
View File

@ -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",

2
servo/ports/cef/Cargo.lock generated
View File

@ -21,6 +21,7 @@ dependencies = [
"plugins 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"script 0.0.1",
"script_traits 0.0.1",
"servo 0.0.1",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
"style 0.0.1",
@ -403,6 +404,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",

3
servo/ports/cef/Cargo.toml
View File

@ -26,6 +26,9 @@ path = "../../components/gfx"
[dependencies.script]
path = "../../components/script"
[dependencies.script_traits]
path = "../../components/script_traits"
[dependencies.net]
path = "../../components/net"

7
servo/ports/cef/browser_host.rs
View File

@ -13,6 +13,7 @@ use geom::point::TypedPoint2D;
use geom::size::TypedSize2D;
use libc::{c_double, c_int};
use msg::constellation_msg::{self, KeyModifiers, KeyState};
use script_traits::MouseButton;
use std::cell::RefCell;
pub struct ServoCefBrowserHost {
@ -110,7 +111,11 @@ full_cef_class_impl! {
let event: &cef_mouse_event = event;
let mouse_button_type: cef_mouse_button_type_t = mouse_button_type;
let mouse_up: c_int = mouse_up;
let button_type = mouse_button_type as uint;
let button_type = match mouse_button_type {
cef_mouse_button_type_t::MBT_LEFT => MouseButton::Left,
cef_mouse_button_type_t::MBT_MIDDLE => MouseButton::Middle,
cef_mouse_button_type_t::MBT_RIGHT => MouseButton::Right,
};
let point = TypedPoint2D((*event).x as f32, (*event).y as f32);
if mouse_up != 0 {
this.downcast().send_window_event(WindowEvent::MouseWindowEventClass(

1
servo/ports/cef/lib.rs
View File

@ -32,6 +32,7 @@ extern crate js;
extern crate layers;
extern crate png;
extern crate script;
extern crate script_traits;
extern crate unicode;
extern crate net;

3
servo/ports/glutin/Cargo.toml
View File

@ -14,6 +14,9 @@ headless = ["glutin/headless"]
[dependencies.compositing]
path = "../../components/compositing"
[dependencies.script_traits]
path = "../../components/script_traits"
[dependencies.geom]
git = "https://github.com/servo/rust-geom"

1
servo/ports/glutin/lib.rs
View File

@ -17,6 +17,7 @@ extern crate glutin;
extern crate layers;
extern crate libc;
extern crate msg;
#[cfg(feature = "window")] extern crate script_traits;
extern crate time;
extern crate util;
extern crate egl;

8
servo/ports/glutin/window.rs
View File

@ -224,13 +224,15 @@ impl Window {
/// Helper function to handle a click
fn handle_mouse(&self, button: glutin::MouseButton, action: glutin::ElementState, x: i32, y: i32) {
use script_traits::MouseButton;
// FIXME(tkuehn): max pixel dist should be based on pixel density
let max_pixel_dist = 10f64;
let event = match action {
ElementState::Pressed => {
self.mouse_down_point.set(Point2D(x, y));
self.mouse_down_button.set(Some(button));
MouseWindowEvent::MouseDown(0, TypedPoint2D(x as f32, y as f32))
MouseWindowEvent::MouseDown(MouseButton::Left, TypedPoint2D(x as f32, y as f32))
}
ElementState::Released => {
match self.mouse_down_button.get() {
@ -241,13 +243,13 @@ impl Window {
pixel_dist.y * pixel_dist.y) as f64).sqrt();
if pixel_dist < max_pixel_dist {
let click_event = MouseWindowEvent::Click(
0, TypedPoint2D(x as f32, y as f32));
MouseButton::Left, TypedPoint2D(x as f32, y as f32));
self.event_queue.borrow_mut().push(WindowEvent::MouseWindowEventClass(click_event));
}
}
Some(_) => (),
}
MouseWindowEvent::MouseUp(0, TypedPoint2D(x as f32, y as f32))
MouseWindowEvent::MouseUp(MouseButton::Left, TypedPoint2D(x as f32, y as f32))
}
};
self.event_queue.borrow_mut().push(WindowEvent::MouseWindowEventClass(event));

1
servo/ports/gonk/Cargo.lock generated
View File

@ -15,6 +15,7 @@ dependencies = [
"net 0.0.1",
"profile 0.0.1",
"script 0.0.1",
"script_traits 0.0.1",
"servo 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)",

3
servo/ports/gonk/Cargo.toml
View File

@ -20,6 +20,9 @@ path = "../../components/msg"
[dependencies.script]
path = "../../components/script"
[dependencies.script_traits]
path = "../../components/script_traits"
[dependencies.net]
path = "../../components/net"

11
servo/ports/gonk/src/input.rs
View File

@ -2,6 +2,8 @@
* 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/. */
use script_traits::MouseButton;
use std::path::Path;
use std::mem::size_of;
use std::mem::transmute;
@ -167,9 +169,12 @@ fn read_input_device(device_path: &Path,
if dist < 16 {
let click_pt = TypedPoint2D(slotA.x as f32, slotA.y as f32);
println!("Dispatching click!");
sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::MouseDown(0, click_pt))).ok().unwrap();
sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::MouseUp(0, click_pt))).ok().unwrap();
sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::Click(0, click_pt))).ok().unwrap();
sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::MouseDown(MouseButton::Left, click_pt)))
.ok().unwrap();
sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::MouseUp(MouseButton::Left, click_pt)))
.ok().unwrap();
sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::Click(MouseButton::Left, click_pt)))
.ok().unwrap();
}
} else {
println!("Touch down");

1
servo/ports/gonk/src/main.rs
View File

@ -16,6 +16,7 @@ extern crate time;
extern crate util;
extern crate compositing;
extern crate script_traits;
extern crate geom;
extern crate libc;