Show a visual indicator for the progress of auto-click.

ash/autoclick/autoclick_controller.cc

 // Copyright 2013 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/autoclick_controller.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/shell.h"
 #include "base/timer/timer.h"
@@ skipping 31 matching lines @@
 
 // static.
 const int AutoclickController::kDefaultAutoclickDelayMs = 400;
 
 class AutoclickControllerImpl : public AutoclickController,
                                 public ui::EventHandler {
  public:
   AutoclickControllerImpl();
   ~AutoclickControllerImpl() override;
 
+  // AutoclickController overrides.

[jdufault, 2016/06/08 17:50:19]

Move this into the other AutoclickController override section.

[sammiequon, 2016/06/09 04:03:46]

Done.

+  void SetDelegate(
+      std::unique_ptr<Delegate> autoclickgesture_delegate) override;

[jdufault, 2016/06/08 17:50:19]

Just delegate

[sammiequon, 2016/06/09 04:03:46]

Done.

+
  private:
   // AutoclickController overrides:
   void SetEnabled(bool enabled) override;
   bool IsEnabled() const override;
   void SetAutoclickDelay(int delay_ms) override;
   int GetAutoclickDelay() const override;
 
   // ui::EventHandler overrides:
   void OnMouseEvent(ui::MouseEvent* event) override;
   void OnKeyEvent(ui::KeyEvent* event) override;
   void OnTouchEvent(ui::TouchEvent* event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
   void OnScrollEvent(ui::ScrollEvent* event) override;
 
+  void StartRingDisplay();
+  void StopRingDisplay();
+  void ChangeRingDisplayCenter();
+
   void InitClickTimer();
 
   void DoAutoclick();
 
   bool enabled_;
   int delay_ms_;
   int mouse_event_flags_;
   std::unique_ptr<base::Timer> autoclick_timer_;
+  std::unique_ptr<Delegate> autoclick_gesture_delegate_;

[jdufault, 2016/06/08 17:50:19]

Just delegate_

[sammiequon, 2016/06/09 04:03:46]

Done.

   // The position in screen coordinates used to determine
   // the distance the mouse has moved.
   gfx::Point anchor_location_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoclickControllerImpl);
 };
 
-
 AutoclickControllerImpl::AutoclickControllerImpl()

[jdufault, 2016/06/08 17:50:19]

Restore newline

[sammiequon, 2016/06/09 04:03:46]

Done.

     : enabled_(false),
       delay_ms_(kDefaultAutoclickDelayMs),
       mouse_event_flags_(ui::EF_NONE),
+      autoclick_gesture_delegate_(nullptr),
       anchor_location_(-kMovementThreshold, -kMovementThreshold) {
   InitClickTimer();
 }
 
 AutoclickControllerImpl::~AutoclickControllerImpl() {
 }
 
+void AutoclickControllerImpl::SetDelegate(
+    std::unique_ptr<Delegate> autoclickgesture_delegate) {
+  autoclick_gesture_delegate_ = std::move(autoclickgesture_delegate);
+}
+
 void AutoclickControllerImpl::SetEnabled(bool enabled) {
   if (enabled_ == enabled)
     return;
   enabled_ = enabled;
 
   if (enabled_) {
     Shell::GetInstance()->AddPreTargetHandler(this);
     autoclick_timer_->Stop();
   } else {
     Shell::GetInstance()->RemovePreTargetHandler(this);
   }
 }
 
 bool AutoclickControllerImpl::IsEnabled() const {
   return enabled_;
 }
 
 void AutoclickControllerImpl::SetAutoclickDelay(int delay_ms) {
   delay_ms_ = delay_ms;
   InitClickTimer();
 }
 
 int AutoclickControllerImpl::GetAutoclickDelay() const {
   return delay_ms_;
 }
 
+void AutoclickControllerImpl::StartRingDisplay() {
+  if (autoclick_gesture_delegate_)
+    autoclick_gesture_delegate_->StartGesture(delay_ms_, anchor_location_);
+}
+
+void AutoclickControllerImpl::StopRingDisplay() {
+  if (autoclick_gesture_delegate_)
+    autoclick_gesture_delegate_->StopGesture();
+}
+
+void AutoclickControllerImpl::ChangeRingDisplayCenter() {
+  if (autoclick_gesture_delegate_)
+    autoclick_gesture_delegate_->SetGestureCenter(anchor_location_);
+}
+
 void AutoclickControllerImpl::InitClickTimer() {
   autoclick_timer_.reset(new base::Timer(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(delay_ms_),
       base::Bind(&AutoclickControllerImpl::DoAutoclick,
                  base::Unretained(this)),
       false));
 }
 
 void AutoclickControllerImpl::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_MOVED &&
       !(event->flags() & ui::EF_IS_SYNTHESIZED)) {
     mouse_event_flags_ = event->flags();
 
     gfx::Point mouse_location = event->location();
     ::wm::ConvertPointToScreen(static_cast<aura::Window*>(event->target()),
                                &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();
+      StartRingDisplay();
+    } else if (autoclick_timer_->IsRunning()) {
+      anchor_location_ = mouse_location;
+      ChangeRingDisplayCenter();
     }
   } else if (event->type() == ui::ET_MOUSE_PRESSED) {
     autoclick_timer_->Stop();
+    StopRingDisplay();
   } else if (event->type() == ui::ET_MOUSEWHEEL &&
              autoclick_timer_->IsRunning()) {
     autoclick_timer_->Reset();
+    StartRingDisplay();
   }
 }
 
 void AutoclickControllerImpl::OnKeyEvent(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()))
+  if (!IsModifierKey(event->key_code())) {
     autoclick_timer_->Stop();
+    StopRingDisplay();
+  }
 }
 
 void AutoclickControllerImpl::OnTouchEvent(ui::TouchEvent* event) {
   autoclick_timer_->Stop();
+  StopRingDisplay();
 }
 
 void AutoclickControllerImpl::OnGestureEvent(ui::GestureEvent* event) {
   autoclick_timer_->Stop();
+  StopRingDisplay();
 }
 
 void AutoclickControllerImpl::OnScrollEvent(ui::ScrollEvent* event) {
   autoclick_timer_->Stop();
+  StopRingDisplay();
 }
 
 void AutoclickControllerImpl::DoAutoclick() {
   gfx::Point screen_location =
       aura::Env::GetInstance()->last_mouse_location();
   aura::Window* root_window =
       WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(screen_location));
   DCHECK(root_window) << "Root window not found while attempting autoclick.";
 
   gfx::Point click_location(screen_location);
@@ skipping 19 matching lines @@
   if (details.dispatcher_destroyed)
     return;
 }
 
 // static.
 AutoclickController* AutoclickController::CreateInstance() {
   return new AutoclickControllerImpl();
 }
 
 }  // namespace ash