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

remoting/host/input_injector_x11.cc

 // Copyright (c) 2012 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/input_injector.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XTest.h>
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversion_utils.h"
 #include "remoting/base/logging.h"
+#if defined(OS_CHROMEOS)
+#include "remoting/host/chromeos/display_transform_util.h"
+#endif
 #include "remoting/host/clipboard.h"
 #include "remoting/host/linux/unicode_to_keysym.h"
 #include "remoting/proto/internal.pb.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 
 namespace remoting {
 
 namespace {
 
@@ skipping 363 matching lines @@
     VLOG(3) << "Moving mouse by " << event.delta_x() << "," << event.delta_y();
     XTestFakeRelativeMotionEvent(display_,
                                  event.delta_x(), event.delta_y(),
                                  CurrentTime);
 
   } else if (event.has_x() && event.has_y()) {
     // Injecting a motion event immediately before a button release results in
     // a MotionNotify even if the mouse position hasn't changed, which confuses
     // apps which assume MotionNotify implies movement. See crbug.com/138075.
     bool inject_motion = true;
-    webrtc::DesktopVector new_mouse_position(
-        webrtc::DesktopVector(event.x(), event.y()));
+    webrtc::DesktopVector new_mouse_position(event.x(), event.y());
+#if defined(OS_CHROMEOS)
+    // When a physical display (1280 x 850) is rotated 90 degs (it is
+    // effectively an 850 x 1280) display, Chromoting clients sends mouse events
+    // in the rotated co-ordinates system (850 x 1280).  However, ChromeOS
+    // expects the raw events to match the native resolution.
+    // Rotates the co-ordinates of the input events appropriately for the
+    // current display rotation settings.
+    gfx::PointF screen_location =
+        ConvertPointToNativeScreen(gfx::PointF(event.x(), event.y()));
+    new_mouse_position.set(screen_location.x(), screen_location.y());

[Wez, 2014/12/04 01:28:25]

Can we do this rotation in the InputInjectorChromeOS, before we pass the event
on to the X11 injector, rather than polluting it?

[kelvinp, 2014/12/05 03:17:28]

This is going to be an interim hack, that will be removed when all ChromeOS
devices is moving away from x11.  So, i don't think there is much value is
writing a class that we will throw away later.  I have filed a bug to remove the
hack as discussed.

+#endif
     if (event.has_button() && event.has_button_down() && !event.button_down()) {
       if (new_mouse_position.equals(latest_mouse_position_))
         inject_motion = false;
     }
 
     if (inject_motion) {
       latest_mouse_position_.set(std::max(0, new_mouse_position.x()),
                                  std::max(0, new_mouse_position.y()));
 
       VLOG(3) << "Moving mouse to " << latest_mouse_position_.x()
@@ skipping 188 matching lines @@
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   scoped_ptr<InputInjectorX11> injector(
       new InputInjectorX11(main_task_runner));
   if (!injector->Init())
     return nullptr;
   return injector.Pass();
 }
 
 }  // namespace remoting