Move touch CTM from X into Chrome

ui/events/x/device_data_manager.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 "ui/events/x/device_data_manager.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/x/device_list_cache_x.h"
 #include "ui/events/x/touch_factory_x11.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/x/x11_types.h"
 
 // XIScrollClass was introduced in XI 2.1 so we need to define it here
 // for backward-compatibility with older versions of XInput.
 #if !defined(XIScrollClass)
 #define XIScrollClass 3
 #endif
 
 // Multi-touch support was introduced in XI 2.2. Add XI event types here
 // for backward-compatibility with older versions of XInput.
@@ skipping 88 matching lines @@
       xi_opcode_(-1),
       atom_cache_(gfx::GetXDisplay(), kCachedAtoms),
       button_map_count_(0) {
   CHECK(gfx::GetXDisplay());
   InitializeXInputInternal();
 
   // Make sure the sizes of enum and kCachedAtoms are aligned.
   CHECK(arraysize(kCachedAtoms) == static_cast<size_t>(DT_LAST_ENTRY) + 1);
   UpdateDeviceList(gfx::GetXDisplay());
   UpdateButtonMap();
+
+  for (int i = 0; i < kMaxDeviceNum; i++)
+    touch_device_to_display_map_[i] = gfx::Display::kInvalidDisplayID;
 }
 
 DeviceDataManager::~DeviceDataManager() {
 }
 
 bool DeviceDataManager::InitializeXInputInternal() {
   // Check if XInput is available on the system.
   xi_opcode_ = -1;
   int opcode, event, error;
   if (!XQueryExtension(
@@ skipping 440 matching lines @@
   if (deviceid >= static_cast<unsigned int>(kMaxDeviceNum))
     return false;
   if (valuator_lookup_[deviceid][type] >= 0) {
     *min = valuator_min_[deviceid][type];
     *max = valuator_max_[deviceid][type];
     return true;
   }
   return false;
 }
 
+void DeviceDataManager::ClearTouchCTM() {
+  for (int i = 0; i < kMaxDeviceNum; i++)
+    touch_device_ctm_map_[i] = TouchCTM();
+}
+
+void DeviceDataManager::SetTouchCTM(int touch_device_id,
+                                    const TouchCTM& touch_ctm) {
+  if (touch_device_id > 0 && touch_device_id < kMaxDeviceNum)
+    touch_device_ctm_map_[touch_device_id] = touch_ctm;
+}
+
+void DeviceDataManager::ApplyTouchCTM(int touch_device_id, float* x, float* y) {
+  if (touch_device_id > 0 && touch_device_id < kMaxDeviceNum) {
+    const TouchCTM ctm = touch_device_ctm_map_[touch_device_id];
+    *x = *x * ctm.x_scale + ctm.x_offset;
+    *y = *y * ctm.y_scale + ctm.y_offset;
+  }
+}
+
+void DeviceDataManager::ClearTouchDeviceToDisplayMap() {
+  for (int i = 0 ; i < kMaxDeviceNum; i++)
+    touch_device_to_display_map_[i] = gfx::Display::kInvalidDisplayID;
+}
+
+void DeviceDataManager::MapTouchDeviceToDisplay(int touch_device_id,
+                                                int64 display_id) {
+  if (touch_device_id > 0 && touch_device_id < kMaxDeviceNum)
+    touch_device_to_display_map_[touch_device_id] = display_id;
+}
+
+int64 DeviceDataManager::GetDisplayForTouchDevice(int touch_device_id) {
+  if (touch_device_id > 0 && touch_device_id < kMaxDeviceNum)
+    return touch_device_to_display_map_[touch_device_id];
+  else

[sadrul, 2014/03/15 19:32:51]

Don't need the else here.

[Yufeng Shen (Slow to review), 2014/04/29 20:34:18]

Done.

+    return gfx::Display::kInvalidDisplayID;
+}
+
 void DeviceDataManager::SetDeviceListForTest(
     const std::vector<unsigned int>& touchscreen,
     const std::vector<unsigned int>& cmt_devices) {
   for (int i = 0; i < kMaxDeviceNum; ++i) {
     valuator_count_[i] = 0;
     valuator_lookup_[i].clear();
     data_type_lookup_[i].clear();
     valuator_min_[i].clear();
     valuator_max_[i].clear();
     for (int j = 0; j < kMaxSlotNum; j++)
@@ skipping 49 matching lines @@
   for (int j = start_valuator; j <= end_valuator; ++j) {
     valuator_lookup_[deviceid][j] = valuator_count_[deviceid];
     data_type_lookup_[deviceid][valuator_count_[deviceid]] = j;
     valuator_min_[deviceid][j] = min_value;
     valuator_max_[deviceid][j] = max_value;
     valuator_count_[deviceid]++;
   }
 }
 
 }  // namespace ui