aura-x11: Fix touch-calibration for multi-monitor setups.

ui/base/events/event.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 "ui/base/events/event.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
+#include <cmath>
 #include <cstring>
 
 #include "ui/base/keycodes/keyboard_code_conversion.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/point3.h"
 #include "ui/gfx/transform.h"
 
 #if defined(USE_X11)
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #endif
 
 namespace {
 
 base::NativeEvent CopyNativeEvent(const base::NativeEvent& event) {
 #if defined(USE_X11)
   if (!event || event->type == GenericEvent)
     return NULL;
   XEvent* copy = new XEvent;
   *copy = *event;
   return copy;
 #elif defined(OS_WIN)
   return event;
 #else
   NOTREACHED() <<
       "Don't know how to copy base::NativeEvent for this platform";
   return NULL;
 #endif
 }
 
+gfx::Point CalibratePoint(const gfx::Point& point,
+                          const gfx::Size& from,
+                          const gfx::Size& to) {
+  float calibrated_x =
+      static_cast<float>(point.x()) * to.width() / from.width();
+  float calibrated_y =
+      static_cast<float>(point.y()) * to.height() / from.height();
+  return gfx::Point(static_cast<int>(floorf(calibrated_x + 0.5f)),
+                    static_cast<int>(floorf(calibrated_y + 0.5f)));
+}
+
 }  // namespace
 
 namespace ui {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Event
 
 Event::~Event() {
 #if defined(USE_X11)
   if (delete_native_event_)
@@ skipping 234 matching lines @@
       radius_x_(0.0f),
       radius_y_(0.0f),
       rotation_angle_(0.0f),
       force_(0.0f) {
   set_time_stamp(time_stamp);
 }
 
 TouchEvent::~TouchEvent() {
 }
 
+void TouchEvent::CalibrateLocation(const gfx::Size& from, const gfx::Size& to) {
+  location_ = CalibratePoint(location_, from, to);
+  root_location_ = CalibratePoint(root_location_, from, to);
+}
+
 void TouchEvent::UpdateForRootTransform(const Transform& root_transform) {
   LocatedEvent::UpdateForRootTransform(root_transform);
   gfx::Point3f scale;
   InterpolatedTransform::FactorTRS(root_transform, NULL, NULL, &scale);
   if (scale.x())
     radius_x_ /= scale.x();
   if (scale.y())
     radius_y_ /= scale.y();
 }
 
@@ skipping 188 matching lines @@
 int GestureEvent::GetLowestTouchId() const {
   if (touch_ids_bitfield_ == 0)
     return -1;
   int i = -1;
   // Find the index of the least significant 1 bit
   while (!(1 << ++i & touch_ids_bitfield_));
   return i;
 }
 
 }  // namespace ui