Remote assistance on Chrome OS Part IX - Input injection on Ozone

remoting/host/local_input_monitor_chromeos.cc

 // Copyright 2014 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 "remoting/host/local_input_monitor.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/non_thread_safe.h"
+#include "remoting/host/chromeos/pixel_rotator.h"
 #include "remoting/host/client_session_control.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/platform/platform_event_observer.h"
 #include "ui/events/platform/platform_event_source.h"
 
 namespace remoting {
 
@@ skipping 23 matching lines @@
    private:
     void HandleMouseMove(const ui::PlatformEvent& event);
     void HandleKeyPressed(const ui::PlatformEvent& event);
 
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
 
     // Points to the object receiving mouse event notifications and session
     // disconnect requests.  Must be called on the |caller_task_runner_|.
     base::WeakPtr<ClientSessionControl> client_session_control_;
 
+    // Rotate the local mouse positions appropriately based on the current

[Wez, 2014/12/06 01:55:17]

nit: Used to rotate...

Here and elsewhere, does it also translate, e.g in the Ash-on-X11 case?

[kelvinp, 2014/12/08 18:41:44]

Done. No, it doesn't translate AFAIK.

+    // display rotation settings.
+    scoped_ptr<PixelRotator> rotator_;
+
     DISALLOW_COPY_AND_ASSIGN(Core);
   };
 
   // Task runner on which ui::events are received.
   scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
   scoped_ptr<Core> core_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalInputMonitorChromeos);
 };
 
@@ skipping 14 matching lines @@
 LocalInputMonitorChromeos::Core::Core(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     base::WeakPtr<ClientSessionControl> client_session_control)
     : caller_task_runner_(caller_task_runner),
       client_session_control_(client_session_control) {
   DCHECK(client_session_control_.get());
 }
 
 void LocalInputMonitorChromeos::Core::Start() {
   ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
+  rotator_.reset(new PixelRotator());
 }
 
 LocalInputMonitorChromeos::Core::~Core() {
   ui::PlatformEventSource::GetInstance()->RemovePlatformEventObserver(this);
 }
 
 void LocalInputMonitorChromeos::Core::WillProcessEvent(
     const ui::PlatformEvent& event) {
   // No need to handle this callback.
 }
 
 void LocalInputMonitorChromeos::Core::DidProcessEvent(
     const ui::PlatformEvent& event) {
   ui::EventType type = ui::EventTypeFromNative(event);
   if (type == ui::ET_MOUSE_MOVED) {
     HandleMouseMove(event);
   } else if (type == ui::ET_KEY_PRESSED) {
     HandleKeyPressed(event);
   }
 }
 
 void LocalInputMonitorChromeos::Core::HandleMouseMove(
     const ui::PlatformEvent& event) {
-  gfx::Point mouse_position = ui::EventLocationFromNative(event);
+  gfx::PointF mouse_position = ui::EventLocationFromNative(event);
+  mouse_position = rotator_->FromScreenPixel(mouse_position);
+
   caller_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(
           &ClientSessionControl::OnLocalMouseMoved, client_session_control_,
           webrtc::DesktopVector(mouse_position.x(), mouse_position.y())));
 }
 
 void LocalInputMonitorChromeos::Core::HandleKeyPressed(
     const ui::PlatformEvent& event) {
   ui::KeyEvent key_event(event);
@@ skipping 11 matching lines @@
 scoped_ptr<LocalInputMonitor> LocalInputMonitor::Create(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
     base::WeakPtr<ClientSessionControl> client_session_control) {
   return make_scoped_ptr(new LocalInputMonitorChromeos(
       caller_task_runner, input_task_runner, client_session_control));
 }
 
 }  // namespace remoting