Update rich touch information to conform to standard

views/events/event_x.cc

 // Copyright (c) 2011 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 "views/events/event.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
@@ skipping 227 matching lines @@
 uint16 GetCharacterFromXKeyEvent(XKeyEvent* key) {
   char buf[6];
   int bytes_written = XLookupString(key, buf, 6, NULL, NULL);
   DCHECK_LE(bytes_written, 6);
 
   string16 result;
   return (bytes_written > 0 && UTF8ToUTF16(buf, bytes_written, &result) &&
           result.length() == 1) ? result[0] : 0;
 }
 
-float GetTouchRadiusFromXEvent(XEvent* xev) {
-  float diameter = 0.0;
+float GetTouchRadiusFromXEvent(XEvent* xev, TouchFactory::TouchParam tp) {
+  float diameter = 2.0;
 
 #if defined(HAVE_XINPUT2)
   TouchFactory* touch_factory = TouchFactory::GetInstance();
-  touch_factory->ExtractTouchParam(*xev, TouchFactory::TP_TOUCH_MAJOR,
-                                   &diameter);
+  touch_factory->ExtractTouchParam(*xev, tp, &diameter);
 #endif

[sadrul, 2011/06/08 17:30:14]

Let's have:

float GetTouchParamFromXEvent(XEvent* xev,
    TouchParam tp,
    float default_value) {
  float value = default_value;
#if defined(HAVE_XINPUT2)
  TouchFactory::GetInstance()->ExtractTouchParam(*xev, tp, &value);
#endif
  return value;
}

and use it in the constructor (doing ' / 2.0' for radius_x_ and radius_y_) and
remove GetTouchAngleFromXEvent too

[Yufeng Shen (Slow to review), 2011/06/08 19:39:24]

Done.

 
   return diameter / 2.0;
 }
 
 float GetTouchAngleFromXEvent(XEvent* xev) {
   float angle = 0.0;
 
 #if defined(HAVE_XINPUT2)
   TouchFactory* touch_factory = TouchFactory::GetInstance();
   touch_factory->ExtractTouchParam(*xev, TouchFactory::TP_ORIENTATION,
                                    &angle);
 #endif
 
   return angle;
 }
 
-
-float GetTouchRatioFromXEvent(XEvent* xev) {
-  float ratio = 1.0;
-
-#if defined(HAVE_XINPUT2)
-  TouchFactory* touch_factory = TouchFactory::GetInstance();
-  float major_v = -1.0;
-  float minor_v = -1.0;
-
-  if (!touch_factory->ExtractTouchParam(*xev,
-                                        TouchFactory::TP_TOUCH_MAJOR,
-                                        &major_v) ||
-      !touch_factory->ExtractTouchParam(*xev,
-                                        TouchFactory::TP_TOUCH_MINOR,
-                                        &minor_v))
-    return ratio;
-
-  // In case minor axis exists but is zero.
-  if (minor_v > 0.0)
-    ratio = major_v / minor_v;
-#endif
-
-  return ratio;
-}
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Event, private:
 
 void Event::InitWithNativeEvent2(NativeEvent2 native_event_2,
                                  FromNativeEvent2) {
   native_event_ = NULL;
   // TODO(beng): remove once we rid views of Gtk/Gdk.
   native_event_2_ = native_event_2;
@@ skipping 107 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent, public:
 
 #if defined(HAVE_XINPUT2)
 TouchEvent::TouchEvent(NativeEvent2 native_event_2,
                        FromNativeEvent2 from_native)
     : LocatedEvent(native_event_2, from_native),
       touch_id_(GetTouchIDFromXEvent(native_event_2)),
-      radius_(GetTouchRadiusFromXEvent(native_event_2)),
-      angle_(GetTouchAngleFromXEvent(native_event_2)),
-      ratio_(GetTouchRatioFromXEvent(native_event_2)) {
+      radiusX_(GetTouchRadiusFromXEvent(native_event_2,
+                                        TouchFactory::TP_TOUCH_MAJOR)),
+      radiusY_(GetTouchRadiusFromXEvent(native_event_2,
+                                        TouchFactory::TP_TOUCH_MINOR)),
+      angle_(GetTouchAngleFromXEvent(native_event_2)) {
   if (type() == ui::ET_TOUCH_PRESSED || type() == ui::ET_TOUCH_RELEASED) {
     TouchFactory* factory = TouchFactory::GetInstance();
     float slot;
     if (factory->ExtractTouchParam(*native_event_2,
                                    TouchFactory::TP_SLOT_ID, &slot)) {
       factory->SetSlotUsed(slot, type() == ui::ET_TOUCH_PRESSED);
     }
   }
 }
 #endif
 
 }  // namespace views