diff options
| author | Peter Osterlund <petero2@telia.com> | 2007-01-28 23:37:55 +0100 |
|---|---|---|
| committer | Peter Osterlund <petero2@telia.com> | 2007-01-28 23:37:55 +0100 |
| commit | 46bdefebcc32abb354355a1588ccf184cd719828 (patch) | |
| tree | 0600fe2e79f73ddfc9ce5ab32e74893de21d56f5 | |
| parent | addb1d7ecf8bf1ad2596dd0ef20ad3ca2e755341 (diff) | |
Rename the TrackstickAccelFactor option to TrackstickSpeed.
| -rw-r--r-- | synaptics.c | 6 | ||||
| -rw-r--r-- | synaptics.h | 2 | ||||
| -rw-r--r-- | synclient.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/synaptics.c b/synaptics.c index 3c66642..3337e22 100644 --- a/synaptics.c +++ b/synaptics.c @@ -425,7 +425,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags) pars->min_speed = synSetFloatOption(opts, "MinSpeed", 0.09); pars->max_speed = synSetFloatOption(opts, "MaxSpeed", 0.18); pars->accl = synSetFloatOption(opts, "AccelFactor", 0.0015); - pars->trackstick_accl = synSetFloatOption(opts, "TrackstickAccelFactor", 0.5); + pars->trackstick_speed = synSetFloatOption(opts, "TrackstickSpeed", 0.5); pars->scroll_dist_circ = synSetFloatOption(opts, "CircScrollDelta", 0.1); pars->coasting_speed = synSetFloatOption(opts, "CoastingSpeed", 0.0); pars->press_motion_min_factor = synSetFloatOption(opts, "PressureMotionMinFactor", 1.0); @@ -1286,8 +1286,8 @@ ComputeDeltas(SynapticsPrivate *priv, struct SynapticsHwState *hw, dx = (hw->x - priv->trackstick_neutral_x); dy = (hw->y - priv->trackstick_neutral_y); - dx = dx * para->trackstick_accl; - dy = dy * para->trackstick_accl; + dx = dx * para->trackstick_speed; + dy = dy * para->trackstick_speed; } else if (moving_state == MS_TOUCHPAD_RELATIVE) { dx = estimate_delta(hw->x, HIST(0).x, HIST(1).x, HIST(2).x); dy = estimate_delta(hw->y, HIST(0).y, HIST(1).y, HIST(2).y); diff --git a/synaptics.h b/synaptics.h index 9cd3969..1f9f8ba 100644 --- a/synaptics.h +++ b/synaptics.h @@ -67,7 +67,7 @@ typedef struct _SynapticsSHM Bool scroll_twofinger_vert; /* Enable/disable vertical two-finger scrolling */ Bool scroll_twofinger_horiz; /* Enable/disable horizontal two-finger scrolling */ double min_speed, max_speed, accl; /* movement parameters */ - double trackstick_accl; /* trackstick mode acceleration parameters */ + double trackstick_speed; /* trackstick mode speed */ int edge_motion_min_z; /* finger pressure at which minimum edge motion speed is set */ int edge_motion_max_z; /* finger pressure at which maximum edge motion speed is set */ int edge_motion_min_speed; /* slowest setting for edge motion speed */ diff --git a/synclient.c b/synclient.c index de49f2d..40b636c 100644 --- a/synclient.c +++ b/synclient.c @@ -73,7 +73,7 @@ static struct Parameter params[] = { DEFINE_PAR("MinSpeed", min_speed, PT_DOUBLE, 0, 1.0), DEFINE_PAR("MaxSpeed", max_speed, PT_DOUBLE, 0, 1.0), DEFINE_PAR("AccelFactor", accl, PT_DOUBLE, 0, 0.2), - DEFINE_PAR("TrackstickAccelFactor", trackstick_accl, PT_DOUBLE, 0, 2.0), + DEFINE_PAR("TrackstickSpeed", trackstick_speed, PT_DOUBLE, 0, 2.0), DEFINE_PAR("EdgeMotionMinZ", edge_motion_min_z, PT_INT, 1, 255), DEFINE_PAR("EdgeMotionMaxZ", edge_motion_max_z, PT_INT, 1, 255), DEFINE_PAR("EdgeMotionMinSpeed", edge_motion_min_speed, PT_INT, 0, 1000), |