Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-16 11:53:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move first_touch_point into the TouchState machine

Browse source
This commit is contained in:
Matt Brubeck 2015-11-06 14:04:33 -08:00
parent 2171683244
commit 37bfe20986
1 changed files with 26 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

62
components/compositing/compositor.rs
View file

@ -182,9 +182,6 @@ pub struct IOCompositor<Window: WindowMethods> {
/// Touch input state machine /// Touch input state machine
touch_gesture_state: TouchState, touch_gesture_state: TouchState,
/// When tracking a touch for gesture detection, the point where it started
first_touch_point: Option<TypedPoint2D<DevicePixel, f32>>,
/// Pending scroll events. /// Pending scroll events.
pending_scroll_events: Vec<ScrollEvent>, pending_scroll_events: Vec<ScrollEvent>,
@ -210,13 +207,14 @@ enum TouchState {
/// Not tracking any touch point /// Not tracking any touch point
Nothing, Nothing,
/// A touchstart event was dispatched to the page, but the response wasn't received yet. /// A touchstart event was dispatched to the page, but the response wasn't received yet.
/// Contains the number of active touch points. /// Contains the number of active touch points and the initial touch location.
WaitingForScript(u32), WaitingForScript(u32, TypedPoint2D<DevicePixel, f32>),
/// Script is consuming the current touch sequence; don't perform default actions. /// Script is consuming the current touch sequence; don't perform default actions.
/// Contains the number of active touch points. /// Contains the number of active touch points.
DefaultPrevented(u32), DefaultPrevented(u32),
/// A single touch point is active and may perform click or pan default actions. /// A single touch point is active and may perform click or pan default actions.
Touching, /// Contains the initial touch location.
Touching(TypedPoint2D<DevicePixel, f32>),
/// A single touch point is active and has started panning. Contains the latest touch location. /// A single touch point is active and has started panning. Contains the latest touch location.
Panning(TypedPoint2D<DevicePixel, f32>), Panning(TypedPoint2D<DevicePixel, f32>),
/// A multi-touch gesture is in progress. Contains the number of active touch points. /// A multi-touch gesture is in progress. Contains the number of active touch points.
@ -349,7 +347,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
scrolling_timer: ScrollingTimerProxy::new(state.sender), scrolling_timer: ScrollingTimerProxy::new(state.sender),
composition_request: CompositionRequest::NoCompositingNecessary, composition_request: CompositionRequest::NoCompositingNecessary,
touch_gesture_state: TouchState::Nothing, touch_gesture_state: TouchState::Nothing,
first_touch_point: None,
pending_scroll_events: Vec::new(), pending_scroll_events: Vec::new(),
composite_target: composite_target, composite_target: composite_target,
shutdown_state: ShutdownState::NotShuttingDown, shutdown_state: ShutdownState::NotShuttingDown,
@ -560,13 +557,13 @@ impl<Window: WindowMethods> IOCompositor<Window> {
(Msg::TouchEventProcessed(result), ShutdownState::NotShuttingDown) => { (Msg::TouchEventProcessed(result), ShutdownState::NotShuttingDown) => {
match self.touch_gesture_state { match self.touch_gesture_state {
TouchState::WaitingForScript(n) => { TouchState::WaitingForScript(n, p) => {
self.touch_gesture_state = match result { self.touch_gesture_state = match result {
EventResult::DefaultPrevented => TouchState::DefaultPrevented(n), EventResult::DefaultPrevented => TouchState::DefaultPrevented(n),
EventResult::DefaultAllowed => if n > 1 { EventResult::DefaultAllowed => if n > 1 {
TouchState::MultiTouch(n) TouchState::MultiTouch(n)
} else { } else {
TouchState::Touching TouchState::Touching(p)
} }
}; };
} }
@ -1229,17 +1226,15 @@ impl<Window: WindowMethods> IOCompositor<Window> {
fn on_touch_down(&mut self, identifier: TouchId, point: TypedPoint2D<DevicePixel, f32>) { fn on_touch_down(&mut self, identifier: TouchId, point: TypedPoint2D<DevicePixel, f32>) {
self.touch_gesture_state = match self.touch_gesture_state { self.touch_gesture_state = match self.touch_gesture_state {
TouchState::Nothing => { TouchState::Nothing => {
// TODO: Don't wait for script if we know the page has no touch event listeners. TouchState::WaitingForScript(1, point)
self.first_touch_point = Some(point);
TouchState::WaitingForScript(1)
} }
TouchState::Touching | TouchState::Touching(_) |
TouchState::Panning(_) => { TouchState::Panning(_) => {
// Was a single-touch sequence; now a multi-touch sequence: // Was a single-touch sequence; now a multi-touch sequence:
TouchState::MultiTouch(2) TouchState::MultiTouch(2)
} }
TouchState::WaitingForScript(n) => { TouchState::WaitingForScript(n, p) => {
TouchState::WaitingForScript(n + 1) TouchState::WaitingForScript(n + 1, p)
} }
TouchState::DefaultPrevented(n) => { TouchState::DefaultPrevented(n) => {
TouchState::DefaultPrevented(n + 1) TouchState::DefaultPrevented(n + 1)
@ -1258,24 +1253,19 @@ impl<Window: WindowMethods> IOCompositor<Window> {
match self.touch_gesture_state { match self.touch_gesture_state {
TouchState::Nothing => warn!("Got unexpected touch move event"), TouchState::Nothing => warn!("Got unexpected touch move event"),
TouchState::WaitingForScript(_) => { TouchState::WaitingForScript(..) => {
// TODO: Queue events while waiting for script? // TODO: Queue events while waiting for script?
} }
TouchState::Touching => { TouchState::Touching(p0) => {
match self.first_touch_point { let delta = point - p0;
Some(p0) => { let px: TypedPoint2D<ScreenPx, _> = delta / self.device_pixels_per_screen_px();
let delta = point - p0; let px = px.to_untyped();
let px: TypedPoint2D<ScreenPx, _> = delta / self.device_pixels_per_screen_px();
let px = px.to_untyped();
if px.x.abs() > TOUCH_PAN_MIN_SCREEN_PX || if px.x.abs() > TOUCH_PAN_MIN_SCREEN_PX ||
px.y.abs() > TOUCH_PAN_MIN_SCREEN_PX px.y.abs() > TOUCH_PAN_MIN_SCREEN_PX
{ {
self.touch_gesture_state = TouchState::Panning(point); self.touch_gesture_state = TouchState::Panning(point);
self.on_scroll_window_event(delta, point.cast().unwrap()); self.on_scroll_window_event(delta, point.cast().unwrap());
}
}
None => warn!("first_touch_point not set")
} }
} }
TouchState::Panning(p0) => { TouchState::Panning(p0) => {
@ -1304,7 +1294,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
} }
self.touch_gesture_state = match self.touch_gesture_state { self.touch_gesture_state = match self.touch_gesture_state {
TouchState::Touching => { TouchState::Touching(_) => {
// TODO: If the duration exceeds some threshold, send a contextmenu event instead. // TODO: If the duration exceeds some threshold, send a contextmenu event instead.
// TODO: Don't send a click if preventDefault is called on the touchend event. // TODO: Don't send a click if preventDefault is called on the touchend event.
self.simulate_mouse_click(point); self.simulate_mouse_click(point);
@ -1312,12 +1302,12 @@ impl<Window: WindowMethods> IOCompositor<Window> {
} }
TouchState::Nothing | TouchState::Nothing |
TouchState::Panning(_) | TouchState::Panning(_) |
TouchState::WaitingForScript(1) | TouchState::WaitingForScript(1, _) |
TouchState::DefaultPrevented(1) | TouchState::DefaultPrevented(1) |
TouchState::MultiTouch(1) => { TouchState::MultiTouch(1) => {
TouchState::Nothing TouchState::Nothing
} }
TouchState::WaitingForScript(n) => TouchState::WaitingForScript(n - 1), TouchState::WaitingForScript(n, p) => TouchState::WaitingForScript(n - 1, p),
TouchState::DefaultPrevented(n) => TouchState::DefaultPrevented(n - 1), TouchState::DefaultPrevented(n) => TouchState::DefaultPrevented(n - 1),
TouchState::MultiTouch(n) => TouchState::MultiTouch(n - 1), TouchState::MultiTouch(n) => TouchState::MultiTouch(n - 1),
}; };
@ -1332,14 +1322,14 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.touch_gesture_state = match self.touch_gesture_state { self.touch_gesture_state = match self.touch_gesture_state {
TouchState::Nothing | TouchState::Nothing |
TouchState::Touching | TouchState::Touching(_) |
TouchState::Panning(_) | TouchState::Panning(_) |
TouchState::WaitingForScript(1) | TouchState::WaitingForScript(1, _) |
TouchState::DefaultPrevented(1) | TouchState::DefaultPrevented(1) |
TouchState::MultiTouch(1) => { TouchState::MultiTouch(1) => {
TouchState::Nothing TouchState::Nothing
} }
TouchState::WaitingForScript(n) => TouchState::WaitingForScript(n - 1), TouchState::WaitingForScript(n, p) => TouchState::WaitingForScript(n - 1, p),
TouchState::DefaultPrevented(n) => TouchState::DefaultPrevented(n - 1), TouchState::DefaultPrevented(n) => TouchState::DefaultPrevented(n - 1),
TouchState::MultiTouch(n) => TouchState::MultiTouch(n - 1), TouchState::MultiTouch(n) => TouchState::MultiTouch(n - 1),
}; };