Add a mechanism to provide non-linear scaling of fling acceleration.

ui/base/gestures/gesture_sequence.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/gestures/gesture_sequence.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/gestures/gesture_configuration.h"
 #include "ui/base/gestures/gesture_util.h"
 #include "ui/gfx/rect.h"
 
+#include <stdio.h>
+
+
 namespace ui {
 
 namespace {
 
 // ui::EventType is mapped to TouchState so it can fit into 3 bits of
 // Signature.
 enum TouchState {
   TS_RELEASED,
   TS_PRESSED,
   TS_MOVED,
@@ skipping 245 matching lines @@
 
 unsigned int ComputeTouchBitmask(const GesturePoint* points) {
   unsigned int touch_bitmask = 0;
   for (int i = 0; i < GestureSequence::kMaxGesturePoints; ++i) {
     if (points[i].in_use())
       touch_bitmask |= 1 << points[i].touch_id();
   }
   return touch_bitmask;
 }
 
+// Number of different accelerations for fling velocity adjustment.
+const unsigned kNumberOfFlingVelocityBands = 8;
+
+// Fling acceleration bands.
+static float fling_scaling_bands[kNumberOfFlingVelocityBands];
+
+// Maximum fling velocity.
+const float kMaxFlingVelocityFromFinger = 15000.0f;
+
+// True if we've configured the fling scaling bands.
+static bool did_setup_scaling = false;
+
+// Setup a default flat fling acceleration profile.
+static void SetDefaultFlingVelocityScaling() {

[sadrul, 2012/10/20 01:28:51]

I think functions in anonymous namespace don't need to be declared static

[rjkroege, 2012/10/22 15:21:34]

Done.

+  for (unsigned i = 0; i < kNumberOfFlingVelocityBands; i++) {
+    fling_scaling_bands[i] =
+        GestureConfiguration::touchscreen_fling_acceleration_adjustment();
+  }
+}
+
+// Read |kNumberOfFlingVelocityBands| comma-separated floating point
+// values from an environment variable and use that to configure the fling
+// velocity profile.
+static void ReadFlingVelocityScalingIfNecessary() {
+  if (did_setup_scaling)

[sadrul, 2012/10/20 01:28:51]

Make |did_setup_scaling| a local static variable in this function?

[rjkroege, 2012/10/22 15:21:34]

Done.

+    return;
+  did_setup_scaling = true;
+  SetDefaultFlingVelocityScaling();
+  char* pk = getenv("BANDED_FLING_VELOCITY_ADJUSTMENT");
+  if (!pk) {
+      LOG(WARNING) << "Could not read configuration var. defaulting.\n";
+      return;
+  }
+
+  char* s = pk;

[sadrul, 2012/10/20 01:28:51]

Perhaps use StringTokenizer (base/string_tokenizer.h) and base::StringToDouble
(base/string_number_conversions.h)?

[rjkroege, 2012/10/22 15:21:34]

Is this really an improvement? :-)

Done.

[rjkroege, 2012/10/22 15:21:34]

Done.

+  for (unsigned i = 0; i < kNumberOfFlingVelocityBands; i++) {
+    float f;
+    f = strtof(s, &s);
+    s++;
+    if (f > 0.f)
+      fling_scaling_bands[i] = f;
+  }
+}
+
 float CalibrateFlingVelocity(float velocity) {
-  const float velocity_scaling  =
-      GestureConfiguration::touchscreen_fling_acceleration_adjustment();
-  return velocity_scaling * velocity;
+  ReadFlingVelocityScalingIfNecessary();
+  float abs_velocity = (velocity < 0) ? velocity * -1: velocity;

[sadrul, 2012/10/20 01:28:51]

abs_velocity = fabs(velocity)?

[rjkroege, 2012/10/22 15:21:34]

Done.

+  abs_velocity = std::min(abs_velocity, kMaxFlingVelocityFromFinger - 1.f);
+  int band =
+      (abs_velocity / kMaxFlingVelocityFromFinger) *
+      kNumberOfFlingVelocityBands;
+  return fling_scaling_bands[band] * velocity;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // GestureSequence Public:
 
 GestureSequence::GestureSequence(GestureEventHelper* helper)
     : state_(GS_NO_GESTURE),
       flags_(0),
@@ skipping 784 matching lines @@
     return;
 
   // Since long press timer has been started, there should be a non-NULL point.
   const GesturePoint* point = GetPointByPointId(0);
   if (!ui::gestures::IsInsideManhattanSquare(point->first_touch_position(),
       event.location()))
     long_press_timer_->Stop();
 }
 
 }  // namespace ui