diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-16 10:02:59 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-17 16:52:09 +1000 |
| commit | b0704a9d3c7a25e0b160414983025db9d14be496 (patch) | |
| tree | a56bf23d9ab65ea847a9868048c85695ea8d619f | |
| parent | f5bfe7f3364df330adcf07c59be93bbcb6f0b98f (diff) | |
Remove synSetFloatOption, use xf86SetRealOption instead.
As a side-benefit, this means float options now show up in the log too.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Christoph Brill <egore911@egore911.de>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>Z
| -rw-r--r-- | src/synaptics.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index 664d2fa..f119cf6 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -289,17 +289,6 @@ free_param_data(SynapticsPrivate *priv) priv->synpara = NULL; } -static double -synSetFloatOption(pointer options, const char *optname, double default_value) -{ - char *str_par; - double value; - str_par = xf86FindOptionValue(options, optname); - if ((!str_par) || (sscanf(str_par, "%lf", &value) != 1)) - return default_value; - return value; -} - static void set_default_parameters(LocalDevicePtr local) { SynapticsPrivate *priv = local->private; /* read-only */ @@ -484,14 +473,14 @@ static void set_default_parameters(LocalDevicePtr local) pars->press_motion_min_z = xf86SetIntOption(opts, "PressureMotionMinZ", pressureMotionMinZ); pars->press_motion_max_z = xf86SetIntOption(opts, "PressureMotionMaxZ", pressureMotionMaxZ); - pars->min_speed = synSetFloatOption(opts, "MinSpeed", 0.4); - pars->max_speed = synSetFloatOption(opts, "MaxSpeed", 0.7); - pars->accl = synSetFloatOption(opts, "AccelFactor", accelFactor); - pars->trackstick_speed = synSetFloatOption(opts, "TrackstickSpeed", 40); - 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); - pars->press_motion_max_factor = synSetFloatOption(opts, "PressureMotionMaxFactor", 1.0); + pars->min_speed = xf86SetRealOption(opts, "MinSpeed", 0.4); + pars->max_speed = xf86SetRealOption(opts, "MaxSpeed", 0.7); + pars->accl = xf86SetRealOption(opts, "AccelFactor", accelFactor); + pars->trackstick_speed = xf86SetRealOption(opts, "TrackstickSpeed", 40); + pars->scroll_dist_circ = xf86SetRealOption(opts, "CircScrollDelta", 0.1); + pars->coasting_speed = xf86SetRealOption(opts, "CoastingSpeed", 0.0); + pars->press_motion_min_factor = xf86SetRealOption(opts, "PressureMotionMinFactor", 1.0); + pars->press_motion_max_factor = xf86SetRealOption(opts, "PressureMotionMaxFactor", 1.0); pars->grab_event_device = xf86SetBoolOption(opts, "GrabEventDevice", TRUE); /* Warn about (and fix) incorrectly configured TopEdge/BottomEdge parameters */ |