mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Implement MouseEvent buttons attribute
This commit is contained in:
parent
425686984d
commit
be3cb00c77
10 changed files with 111 additions and 36 deletions
|
@ -12,6 +12,7 @@ use crate::dom::mouseevent::MouseEvent;
|
|||
use crate::dom::node::window_from_node;
|
||||
use crate::dom::window::ReflowReason;
|
||||
use script_layout_interface::message::ReflowGoal;
|
||||
use script_traits::MouseButton;
|
||||
|
||||
/// Trait for elements with defined activation behavior
|
||||
pub trait Activatable {
|
||||
|
@ -96,6 +97,7 @@ pub fn synthetic_click_activation(
|
|||
alt_key,
|
||||
meta_key,
|
||||
0,
|
||||
MouseButton::Left as u16,
|
||||
None,
|
||||
None,
|
||||
);
|
||||
|
|
|
@ -926,6 +926,7 @@ impl Document {
|
|||
mouse_event_type: MouseEventType,
|
||||
node_address: Option<UntrustedNodeAddress>,
|
||||
point_in_node: Option<Point2D<f32>>,
|
||||
pressed_mouse_buttons: u16,
|
||||
) {
|
||||
let mouse_event_type_string = match mouse_event_type {
|
||||
MouseEventType::Click => "click".to_owned(),
|
||||
|
@ -976,6 +977,7 @@ impl Document {
|
|||
false,
|
||||
false,
|
||||
0i16,
|
||||
pressed_mouse_buttons,
|
||||
None,
|
||||
point_in_node,
|
||||
);
|
||||
|
@ -1007,14 +1009,19 @@ impl Document {
|
|||
|
||||
if let MouseEventType::Click = mouse_event_type {
|
||||
self.commit_focus_transaction(FocusType::Element);
|
||||
self.maybe_fire_dblclick(client_point, node);
|
||||
self.maybe_fire_dblclick(client_point, node, pressed_mouse_buttons);
|
||||
}
|
||||
|
||||
self.window
|
||||
.reflow(ReflowGoal::Full, ReflowReason::MouseEvent);
|
||||
}
|
||||
|
||||
fn maybe_fire_dblclick(&self, click_pos: Point2D<f32>, target: &Node) {
|
||||
fn maybe_fire_dblclick(
|
||||
&self,
|
||||
click_pos: Point2D<f32>,
|
||||
target: &Node,
|
||||
pressed_mouse_buttons: u16,
|
||||
) {
|
||||
// https://w3c.github.io/uievents/#event-type-dblclick
|
||||
let now = Instant::now();
|
||||
|
||||
|
@ -1053,6 +1060,7 @@ impl Document {
|
|||
false,
|
||||
false,
|
||||
0i16,
|
||||
pressed_mouse_buttons,
|
||||
None,
|
||||
None,
|
||||
);
|
||||
|
@ -1073,6 +1081,7 @@ impl Document {
|
|||
client_point: Point2D<f32>,
|
||||
target: &EventTarget,
|
||||
event_name: FireMouseEventType,
|
||||
pressed_mouse_buttons: u16,
|
||||
) {
|
||||
let client_x = client_point.x.to_i32().unwrap_or(0);
|
||||
let client_y = client_point.y.to_i32().unwrap_or(0);
|
||||
|
@ -1093,6 +1102,7 @@ impl Document {
|
|||
false,
|
||||
false,
|
||||
0i16,
|
||||
pressed_mouse_buttons,
|
||||
None,
|
||||
None,
|
||||
);
|
||||
|
@ -1107,6 +1117,7 @@ impl Document {
|
|||
client_point: Option<Point2D<f32>>,
|
||||
prev_mouse_over_target: &MutNullableDom<Element>,
|
||||
node_address: Option<UntrustedNodeAddress>,
|
||||
pressed_mouse_buttons: u16,
|
||||
) {
|
||||
let client_point = match client_point {
|
||||
None => {
|
||||
|
@ -1132,7 +1143,12 @@ impl Document {
|
|||
None => return,
|
||||
};
|
||||
|
||||
self.fire_mouse_event(client_point, new_target.upcast(), FireMouseEventType::Move);
|
||||
self.fire_mouse_event(
|
||||
client_point,
|
||||
new_target.upcast(),
|
||||
FireMouseEventType::Move,
|
||||
pressed_mouse_buttons,
|
||||
);
|
||||
|
||||
// Nothing more to do here, mousemove is sent,
|
||||
// and the element under the mouse hasn't changed.
|
||||
|
@ -1165,7 +1181,12 @@ impl Document {
|
|||
}
|
||||
|
||||
// Remove hover state to old target and its parents
|
||||
self.fire_mouse_event(client_point, old_target.upcast(), FireMouseEventType::Out);
|
||||
self.fire_mouse_event(
|
||||
client_point,
|
||||
old_target.upcast(),
|
||||
FireMouseEventType::Out,
|
||||
pressed_mouse_buttons,
|
||||
);
|
||||
|
||||
// TODO: Fire mouseleave here only if the old target is
|
||||
// not an ancestor of the new target.
|
||||
|
@ -1184,7 +1205,12 @@ impl Document {
|
|||
element.set_hover_state(true);
|
||||
}
|
||||
|
||||
self.fire_mouse_event(client_point, &new_target.upcast(), FireMouseEventType::Over);
|
||||
self.fire_mouse_event(
|
||||
client_point,
|
||||
&new_target.upcast(),
|
||||
FireMouseEventType::Over,
|
||||
pressed_mouse_buttons,
|
||||
);
|
||||
|
||||
// TODO: Fire mouseenter here.
|
||||
}
|
||||
|
|
|
@ -32,6 +32,7 @@ pub struct MouseEvent {
|
|||
alt_key: Cell<bool>,
|
||||
meta_key: Cell<bool>,
|
||||
button: Cell<i16>,
|
||||
buttons: Cell<u16>,
|
||||
related_target: MutNullableDom<EventTarget>,
|
||||
point_in_target: Cell<Option<Point2D<f32>>>,
|
||||
}
|
||||
|
@ -49,6 +50,7 @@ impl MouseEvent {
|
|||
alt_key: Cell::new(false),
|
||||
meta_key: Cell::new(false),
|
||||
button: Cell::new(0),
|
||||
buttons: Cell::new(0),
|
||||
related_target: Default::default(),
|
||||
point_in_target: Cell::new(None),
|
||||
}
|
||||
|
@ -78,6 +80,7 @@ impl MouseEvent {
|
|||
shift_key: bool,
|
||||
meta_key: bool,
|
||||
button: i16,
|
||||
buttons: u16,
|
||||
related_target: Option<&EventTarget>,
|
||||
point_in_target: Option<Point2D<f32>>,
|
||||
) -> DomRoot<MouseEvent> {
|
||||
|
@ -99,6 +102,7 @@ impl MouseEvent {
|
|||
button,
|
||||
related_target,
|
||||
);
|
||||
ev.buttons.set(buttons);
|
||||
ev.point_in_target.set(point_in_target);
|
||||
ev
|
||||
}
|
||||
|
@ -126,6 +130,7 @@ impl MouseEvent {
|
|||
init.parent.shiftKey,
|
||||
init.parent.metaKey,
|
||||
init.button,
|
||||
0,
|
||||
init.relatedTarget.deref(),
|
||||
None,
|
||||
);
|
||||
|
@ -183,6 +188,11 @@ impl MouseEventMethods for MouseEvent {
|
|||
self.button.get()
|
||||
}
|
||||
|
||||
// https://w3c.github.io/uievents/#dom-mouseevent-buttons
|
||||
fn Buttons(&self) -> u16 {
|
||||
self.buttons.get()
|
||||
}
|
||||
|
||||
// https://w3c.github.io/uievents/#widl-MouseEvent-relatedTarget
|
||||
fn GetRelatedTarget(&self) -> Option<DomRoot<EventTarget>> {
|
||||
self.related_target.get()
|
||||
|
|
|
@ -17,7 +17,7 @@ interface MouseEvent : UIEvent {
|
|||
readonly attribute short button;
|
||||
readonly attribute EventTarget? relatedTarget;
|
||||
// Introduced in DOM Level 3
|
||||
//readonly attribute unsigned short buttons;
|
||||
readonly attribute unsigned short buttons;
|
||||
//boolean getModifierState (DOMString keyArg);
|
||||
|
||||
[Pref="dom.mouseevent.which.enabled"]
|
||||
|
@ -31,7 +31,7 @@ dictionary MouseEventInit : EventModifierInit {
|
|||
long clientX = 0;
|
||||
long clientY = 0;
|
||||
short button = 0;
|
||||
//unsigned short buttons = 0;
|
||||
unsigned short buttons = 0;
|
||||
EventTarget? relatedTarget = null;
|
||||
};
|
||||
|
||||
|
|
|
@ -3060,7 +3060,14 @@ impl ScriptThread {
|
|||
self.handle_resize_event(pipeline_id, new_size, size_type);
|
||||
},
|
||||
|
||||
MouseButtonEvent(event_type, button, point, node_address, point_in_node) => {
|
||||
MouseButtonEvent(
|
||||
event_type,
|
||||
button,
|
||||
point,
|
||||
node_address,
|
||||
point_in_node,
|
||||
pressed_mouse_buttons,
|
||||
) => {
|
||||
self.handle_mouse_event(
|
||||
pipeline_id,
|
||||
event_type,
|
||||
|
@ -3068,10 +3075,11 @@ impl ScriptThread {
|
|||
point,
|
||||
node_address,
|
||||
point_in_node,
|
||||
pressed_mouse_buttons,
|
||||
);
|
||||
},
|
||||
|
||||
MouseMoveEvent(point, node_address) => {
|
||||
MouseMoveEvent(point, node_address, pressed_mouse_buttons) => {
|
||||
let document = match { self.documents.borrow().find_document(pipeline_id) } {
|
||||
Some(document) => document,
|
||||
None => return warn!("Message sent to closed pipeline {}.", pipeline_id),
|
||||
|
@ -3086,6 +3094,7 @@ impl ScriptThread {
|
|||
point,
|
||||
&self.topmost_mouse_over_target,
|
||||
node_address,
|
||||
pressed_mouse_buttons,
|
||||
);
|
||||
|
||||
// Short-circuit if nothing changed
|
||||
|
@ -3185,6 +3194,7 @@ impl ScriptThread {
|
|||
point: Point2D<f32>,
|
||||
node_address: Option<UntrustedNodeAddress>,
|
||||
point_in_node: Option<Point2D<f32>>,
|
||||
pressed_mouse_buttons: u16,
|
||||
) {
|
||||
let document = match { self.documents.borrow().find_document(pipeline_id) } {
|
||||
Some(document) => document,
|
||||
|
@ -3197,6 +3207,7 @@ impl ScriptThread {
|
|||
mouse_event_type,
|
||||
node_address,
|
||||
point_in_node,
|
||||
pressed_mouse_buttons,
|
||||
);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue