diff options
| -rw-r--r-- | synaptics.c | 5 | ||||
| -rw-r--r-- | synaptics.h | 2 | ||||
| -rw-r--r-- | synclient.c | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/synaptics.c b/synaptics.c index 114b022..ba7eef2 100644 --- a/synaptics.c +++ b/synaptics.c @@ -426,7 +426,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags) 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_exp_accl = synSetFloatOption(opts, "TrackstickAccelExp", 1.1); 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); @@ -1314,8 +1313,8 @@ ComputeDeltas(SynapticsPrivate *priv, struct SynapticsHwState *hw, dx = (hw->x - priv->trackstick_neutral_x); dy = (hw->y - priv->trackstick_neutral_y); - dx = xf86pow(xf86fabs(dx), para->trackstick_exp_accl) * (dx < 0 ? -1.0 : 1.0) * para->trackstick_accl; - dy = xf86pow(xf86fabs(dy), para->trackstick_exp_accl) * (dy < 0 ? -1.0 : 1.0) * para->trackstick_accl; + dx = dx * para->trackstick_accl; + dy = dy * para->trackstick_accl; } /* speed depending on distance/packet */ diff --git a/synaptics.h b/synaptics.h index 09abf76..032a9a3 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_exp_accl; /* trackstick mode acceleration parameters */ + double trackstick_accl; /* trackstick mode acceleration parameters */ 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 4a06977..de49f2d 100644 --- a/synclient.c +++ b/synclient.c @@ -74,7 +74,6 @@ static struct Parameter params[] = { 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("TrackstickAccelExp", trackstick_exp_accl, 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), |