Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1111)

Unified Diff: ash/autoclick/common/autoclick_controller_common.cc

Issue 2193563002: ash: Refactor autoclick common code to ash/autoclick/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: interface Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/autoclick/common/autoclick_controller_common.cc
diff --git a/ash/autoclick/common/autoclick_controller_common.cc b/ash/autoclick/common/autoclick_controller_common.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c820e2fabf9bc649f1b1e70bc49b0e38a2649a37
--- /dev/null
+++ b/ash/autoclick/common/autoclick_controller_common.cc
@@ -0,0 +1,139 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/autoclick/common/autoclick_controller_common.h"
+
+#include "ui/aura/window.h"
+#include "ui/display/screen.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
+#include "ui/gfx/geometry/vector2d.h"
+#include "ui/wm/core/coordinate_conversion.h"
+
+namespace ash {
+
+namespace {
+
+// The threshold of mouse movement measured in DIP that will
+// initiate a new autoclick.
+const int kMovementThreshold = 20;
+
+bool IsModifierKey(const ui::KeyboardCode key_code) {
+ return key_code == ui::VKEY_SHIFT || key_code == ui::VKEY_LSHIFT ||
+ key_code == ui::VKEY_CONTROL || key_code == ui::VKEY_LCONTROL ||
+ key_code == ui::VKEY_RCONTROL || key_code == ui::VKEY_MENU ||
+ key_code == ui::VKEY_LMENU || key_code == ui::VKEY_RMENU;
+}
+
+} // namespace
+
+AutoclickControllerCommon::AutoclickControllerCommon(base::TimeDelta delay,
+ Delegate* delegate)
+ : delay_(delay),
+ mouse_event_flags_(ui::EF_NONE),
+ delegate_(delegate),
+ widget_(nullptr),
+ anchor_location_(-kMovementThreshold, -kMovementThreshold),
+ autoclick_ring_handler_(new AutoclickRingHandler()) {
+ InitClickTimer();
+}
+
+AutoclickControllerCommon::~AutoclickControllerCommon() {}
+
+void AutoclickControllerCommon::HandleMouseEvent(const ui::MouseEvent& event) {
+ gfx::Point mouse_location = event.location();
+ if (event.type() == ui::ET_MOUSE_MOVED &&
sky 2016/08/15 19:27:00 It seems like this code wants to observe drag even
riajiang 2016/08/16 00:44:24 Why is it also observing drag events? I thought it
sky 2016/08/16 02:40:01 You are right, I missed that. Sorry.
+ !(event.flags() & ui::EF_IS_SYNTHESIZED)) {
+ mouse_event_flags_ = event.flags();
+
+ ::wm::ConvertPointToScreen(static_cast<aura::Window*>(event.target()),
sky 2016/08/15 19:27:00 Have you thought of how you will wire this up for
riajiang 2016/08/16 00:44:24 True... just found a comment that says event.targe
sadrul 2016/08/16 00:47:35 Ideally, we would have crbug.com/608547 fixed, and
riajiang 2016/08/17 15:23:48 Done.
+ &mouse_location);
+ UpdateRingWidget(mouse_location);
+
+ // The distance between the mouse location and the anchor location
+ // must exceed a certain threshold to initiate a new autoclick countdown.
+ // This ensures that mouse jitter caused by poor motor control does not
+ // 1. initiate an unwanted autoclick from rest
+ // 2. prevent the autoclick from ever occuring when the mouse
+ // arrives at the target.
+ gfx::Vector2d delta = mouse_location - anchor_location_;
+ if (delta.LengthSquared() >= kMovementThreshold * kMovementThreshold) {
+ anchor_location_ = mouse_location;
+ autoclick_timer_->Reset();
+ autoclick_ring_handler_->StartGesture(delay_, anchor_location_,
+ widget_.get());
+ } else if (autoclick_timer_->IsRunning()) {
+ autoclick_ring_handler_->SetGestureCenter(mouse_location, widget_.get());
+ }
+ } else if (event.type() == ui::ET_MOUSE_PRESSED) {
+ CancelAutoclick();
+ } else if (event.type() == ui::ET_MOUSEWHEEL &&
+ autoclick_timer_->IsRunning()) {
+ autoclick_timer_->Reset();
+ UpdateRingWidget(mouse_location);
+ autoclick_ring_handler_->StartGesture(delay_, anchor_location_,
+ widget_.get());
+ }
+}
+
+void AutoclickControllerCommon::HandleKeyEvent(const ui::KeyEvent& event) {
+ int modifier_mask = ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN |
+ ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN |
+ ui::EF_IS_EXTENDED_KEY;
+ int new_modifiers = event.flags() & modifier_mask;
+ mouse_event_flags_ = (mouse_event_flags_ & ~modifier_mask) | new_modifiers;
+
+ if (!IsModifierKey(event.key_code()))
+ CancelAutoclick();
+}
+
+void AutoclickControllerCommon::HandleTouchEvent(const ui::TouchEvent& event) {
+ CancelAutoclick();
+}
+
+void AutoclickControllerCommon::HandleGestureEvent(
+ const ui::GestureEvent& event) {
+ CancelAutoclick();
+}
+
+void AutoclickControllerCommon::HandleScrollEvent(
+ const ui::ScrollEvent& event) {
+ CancelAutoclick();
+}
+
+void AutoclickControllerCommon::SetAutoclickDelay(const base::TimeDelta delay) {
+ delay_ = delay;
+ InitClickTimer();
+}
+
+void AutoclickControllerCommon::CancelAutoclick() {
+ autoclick_timer_->Stop();
+ autoclick_ring_handler_->StopGesture();
+ delegate_->OnAutoclickCanceled();
+}
+
+void AutoclickControllerCommon::InitClickTimer() {
+ autoclick_timer_.reset(new base::Timer(
+ FROM_HERE, delay_, base::Bind(&AutoclickControllerCommon::DoAutoclick,
+ base::Unretained(this)),
+ false));
+}
+
+void AutoclickControllerCommon::DoAutoclick() {
+ gfx::Point screen_location =
+ display::Screen::GetScreen()->GetCursorScreenPoint();
+ anchor_location_ = screen_location;
+ delegate_->DoAutoclick(screen_location, mouse_event_flags_);
+}
+
+void AutoclickControllerCommon::UpdateRingWidget(
+ const gfx::Point& mouse_location) {
+ if (!widget_)
+ widget_.reset(
+ (delegate_->CreateAutoclickRingWidget(mouse_location)).release());
+ else
+ delegate_->UpdateAutoclickRingWidget(widget_.get(), mouse_location);
sadrul 2016/08/15 17:23:04 Use {}
riajiang 2016/08/16 00:44:24 Done.
+}
+
+} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698