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
 
@@ skipping 273 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) {
+  int calibrated_x = x() * to.width() / from.width();

[Daniel Erat, 2012/09/10 17:27:31]

nit: cast to floating-point and round?

[sadrul, 2012/09/10 18:19:32]

Done.

+  int calibrated_y = y() * to.height() / from.height();
+  location_ = gfx::Point(calibrated_x, calibrated_y);
+
+  calibrated_x = root_location().x() * to.width() / from.width();
+  calibrated_y = root_location().y() * to.height() / from.height();
+  root_location_ = gfx::Point(calibrated_x, calibrated_y);
+}
+
 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