Disable touch calibration on external touchscreen.

ui/base/x/events_x.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_constants.h"
 
 #include <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/message_pump_aurax11.h"
-#include "base/string_number_conversions.h"
-#include "base/string_split.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/base/touch/touch_factory.h"
-#include "ui/base/ui_base_switches.h"
 #include "ui/base/x/device_list_cache_x.h"
 #include "ui/base/x/valuators.h"
 #include "ui/base/x/x11_atom_cache.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 
 // Copied from xserver-properties.h
@@ skipping 34 matching lines @@
   AXIS_LABEL_PROP_ABS_DBL_END_TIME,
   AXIS_LABEL_PROP_ABS_FLING_X,
   AXIS_LABEL_PROP_ABS_FLING_Y,
   AXIS_LABEL_PROP_ABS_DBL_FLING_VX,
   AXIS_LABEL_PROP_ABS_DBL_FLING_VY,
   AXIS_LABEL_PROP_ABS_FLING_STATE,
   AXIS_LABEL_PROP_ABS_FINGER_COUNT,
   NULL
 };
 
-#if defined(USE_XI2_MT)
-// If the calibration values were read, if this is true.
-bool calibration_values_read = false;
-
-// The (positive) calibration values for the four border sides.
-int left_border_touch_calibration = 0;
-int top_border_touch_calibration = 0;
-int right_border_touch_calibration = 0;
-int bottom_border_touch_calibration = 0;
-#endif
-
 // A class to support the detection of scroll events, using X11 valuators.
 class CMTEventData {
  public:
   // Returns the ScrollEventData singleton.
   static CMTEventData* GetInstance() {
     return Singleton<CMTEventData>::get();
   }
 
   // Updates the list of devices.
   void UpdateDeviceList(Display* display) {
@@ skipping 542 matching lines @@
       *xev, val, &default_value);
   return default_value;
 }
 
 Atom GetNoopEventAtom() {
   return XInternAtom(
       base::MessagePumpAuraX11::GetDefaultXDisplay(),
       "noop", False);
 }
 
-#if defined(USE_XI2_MT)
 
-void ReadTouchCalibrationValues() {
-  calibration_values_read = true;
-
-  std::vector<std::string> parts;
-  base::SplitString(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-      switches::kTouchCalibration), ',', &parts);
-  if (parts.size() >= 4) {
-    if (!base::StringToInt(parts[0], &left_border_touch_calibration))
-      DLOG(ERROR) << "Incorrect left border calibration value passed.";
-    if (!base::StringToInt(parts[1], &right_border_touch_calibration))
-      DLOG(ERROR) << "Incorrect right border calibration value passed.";
-    if (!base::StringToInt(parts[2], &top_border_touch_calibration))
-      DLOG(ERROR) << "Incorrect top border calibration value passed.";
-    if (!base::StringToInt(parts[3], &bottom_border_touch_calibration))
-      DLOG(ERROR) << "Incorrect bottom border calibration value passed.";
-  }
-}
-
-gfx::Point CalibrateTouchCoordinates(
-    const XIDeviceEvent* xievent) {
-  int x = static_cast<int>(xievent->event_x);
-  int y = static_cast<int>(xievent->event_y);
-
-  if (!calibration_values_read)
-    ReadTouchCalibrationValues();
-
-  if (!left_border_touch_calibration && !right_border_touch_calibration &&
-      !top_border_touch_calibration && !bottom_border_touch_calibration)
-    return gfx::Point(x, y);
-
-  gfx::Rect bounds =
-      gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().bounds_in_pixel();
-  const int resolution_x = bounds.width();
-  const int resolution_y = bounds.height();
-  // The "grace area" (10% in this case) is to make it easier for the user to
-  // navigate to the corner.
-  const double kGraceAreaFraction = 0.1;
-  if (left_border_touch_calibration || right_border_touch_calibration) {
-    // Offset the x position to the real
-    x -= left_border_touch_calibration;
-    // Check if we are in the grace area of the left side.
-    // Note: We might not want to do this when the gesture is locked?
-    if (x < 0 && x > -left_border_touch_calibration * kGraceAreaFraction)
-      x = 0;
-    // Check if we are in the grace area of the right side.
-    // Note: We might not want to do this when the gesture is locked?
-    if (x > resolution_x - left_border_touch_calibration &&
-        x < resolution_x - left_border_touch_calibration +
-            right_border_touch_calibration * kGraceAreaFraction)
-      x = resolution_x - left_border_touch_calibration;
-    // Scale the screen area back to the full resolution of the screen.
-    x = (x * resolution_x) / (resolution_x - (right_border_touch_calibration +
-                                              left_border_touch_calibration));
-  }
-  if (top_border_touch_calibration || bottom_border_touch_calibration) {
-    // When there is a top bezel we add our border,
-    y -= top_border_touch_calibration;
-
-    // Check if we are in the grace area of the top side.
-    // Note: We might not want to do this when the gesture is locked?
-    if (y < 0 && y > -top_border_touch_calibration * kGraceAreaFraction)
-      y = 0;
-
-    // Check if we are in the grace area of the bottom side.
-    // Note: We might not want to do this when the gesture is locked?
-    if (y > resolution_y - top_border_touch_calibration &&
-        y < resolution_y - top_border_touch_calibration +
-        bottom_border_touch_calibration * kGraceAreaFraction)
-      y = resolution_y - top_border_touch_calibration;
-    // Scale the screen area back to the full resolution of the screen.
-    y = (y * resolution_y) / (resolution_y - (bottom_border_touch_calibration +
-                                              top_border_touch_calibration));
-  }
-  // Set the modified coordinate back to the event.
-  return gfx::Point(x, y);
-}
-#endif // defined(USE_XI2_MT)
 
 }  // namespace
 
 namespace ui {
 
 void UpdateDeviceList() {
   Display* display = GetXDisplay();
   DeviceListCacheX::GetInstance()->UpdateDeviceList(display);
   CMTEventData::GetInstance()->UpdateDeviceList(display);
   TouchFactory::GetInstance()->UpdateDeviceList(display);
@@ skipping 181 matching lines @@
       XIDeviceEvent* xievent =
           static_cast<XIDeviceEvent*>(native_event->xcookie.data);
 
 #if defined(USE_XI2_MT)
       // Touch event valuators aren't coordinates.
       // Return the |event_x|/|event_y| directly as event's position.
       if (xievent->evtype == XI_TouchBegin ||
           xievent->evtype == XI_TouchUpdate ||
           xievent->evtype == XI_TouchEnd)
         // Note: Touch events are always touch screen events.
-        return CalibrateTouchCoordinates(xievent);
+        return gfx::Point(static_cast<int>(xievent->event_x),
+                          static_cast<int>(xievent->event_y));
 #endif
       // Read the position from the valuators, because the location reported in
       // event_x/event_y seems to be different (and doesn't match for events
       // coming from slave device and master device) from the values in the
       // valuators. See more on crbug.com/103981. The position in the valuators
       // is in the global screen coordinates. But it is necessary to convert it
       // into the window's coordinates. If the valuator is not set, that means
       // the value hasn't changed, and so we can use the value from
       // event_x/event_y (which are in the window's coordinates).
       double* valuators = xievent->valuators.values;
@@ skipping 219 matching lines @@
     noop->xclient.format = 8;
     DCHECK(!noop->xclient.display);
   }
   // Make sure we use atom from current xdisplay, which may
   // change during the test.
   noop->xclient.message_type = GetNoopEventAtom();
   return noop;
 }
 
 }  // namespace ui