[PATCH synaptics 03/10] Purge fast-taps option

[Peter Hutterer]

This driver has too many options, maintaining them is hard and testing
virtually doesn't happen.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 man/synaptics.man  |   10 ++--------
 src/properties.c   |   10 ----------
 src/synaptics.c    |   13 ++-----------
 src/synapticsstr.h |    1 -
 4 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/man/synaptics.man b/man/synaptics.man
index ab2fa9d..0e8870d 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -133,10 +133,6 @@ Whether the device is a click pad. See
 .B ClickPad support
 for more details. Property: "Synaptics ClickPad"
 .TP 7
-.BI "Option \*qFastTaps\*q \*q" boolean \*q
-Makes the driver react faster to a single tap, but also makes double
-clicks caused by double tapping slower. Property: "Synaptics Tap FastTap"
-.TP 7
 .BI "Option \*qVertEdgeScroll\*q \*q" boolean \*q
 Enable vertical scrolling when dragging along the right edge. Property:
 "Synaptics Edge Scrolling"
@@ -790,10 +786,6 @@ duration of a single click.
 8 bit (Bool).
 
 .TP 7
-.BI "Synaptics Tap FastTap"
-8 bit (BOOL).
-
-.TP 7
 .BI "Synaptics Middle Button Timeout"
 32 bit.
 
@@ -990,6 +982,8 @@ The following options are no longer part of the driver configuration:
 .BI "Option \*qFingerPress\*q \*q" integer \*q
 .TP
 .BI "Option \*qTrackstickSpeed\*q \*q" float \*q
+.TP
+.BI "Option \*qFastTaps\*q \*q" boolean \*q
 
 .SH "AUTHORS"
 .LP
diff --git a/src/properties.c b/src/properties.c
index 5a90d17..e89147f 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -59,7 +59,6 @@ Atom prop_tap_time = 0;
 Atom prop_tap_move = 0;
 Atom prop_tap_durations = 0;
 Atom prop_clickpad = 0;
-Atom prop_tap_fast = 0;
 Atom prop_middle_timeout = 0;
 Atom prop_twofinger_pressure = 0;
 Atom prop_twofinger_width = 0;
@@ -221,8 +220,6 @@ InitDeviceProperties(InputInfoPtr pInfo)
         InitAtom(pInfo->dev, SYNAPTICS_PROP_TAP_DURATIONS, 32, 3, values);
     prop_clickpad =
         InitAtom(pInfo->dev, SYNAPTICS_PROP_CLICKPAD, 8, 1, &para->clickpad);
-    prop_tap_fast =
-        InitAtom(pInfo->dev, SYNAPTICS_PROP_TAP_FAST, 8, 1, &para->fast_taps);
     prop_middle_timeout =
         InitAtom(pInfo->dev, SYNAPTICS_PROP_MIDDLE_TIMEOUT, 32, 1,
                  &para->emulate_mid_button_time);
@@ -485,13 +482,6 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
 
         para->clickpad = *(BOOL *) prop->data;
     }
-    else if (property == prop_tap_fast) {
-        if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER)
-            return BadMatch;
-
-        para->fast_taps = *(BOOL *) prop->data;
-
-    }
     else if (property == prop_middle_timeout) {
         if (prop->size != 1 || prop->format != 32 || prop->type != XA_INTEGER)
             return BadMatch;
diff --git a/src/synaptics.c b/src/synaptics.c
index b6dd8bb..bb52b2b 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -646,7 +646,6 @@ set_default_parameters(InputInfoPtr pInfo)
     pars->tap_time_2 = xf86SetIntOption(opts, "MaxDoubleTapTime", 180);
     pars->click_time = xf86SetIntOption(opts, "ClickTime", 100);
     pars->clickpad = xf86SetBoolOption(opts, "ClickPad", pars->clickpad);       /* Probed */
-    pars->fast_taps = xf86SetBoolOption(opts, "FastTaps", FALSE);
     /* middle mouse button emulation on a clickpad? nah, you're joking */
     middle_button_timeout = pars->clickpad ? 0 : 75;
     pars->emulate_mid_button_time =
@@ -1852,8 +1851,6 @@ SelectTapButton(SynapticsPrivate * priv, edge_type edge)
 static void
 SetTapState(SynapticsPrivate * priv, enum TapState tap_state, CARD32 millis)
 {
-    SynapticsParameters *para = &priv->synpara;
-
     DBG(3, "SetTapState - %d -> %d (millis:%u)\n", priv->tap_state, tap_state,
         millis);
     switch (tap_state) {
@@ -1865,10 +1862,7 @@ SetTapState(SynapticsPrivate * priv, enum TapState tap_state, CARD32 millis)
         priv->tap_button_state = TBS_BUTTON_UP;
         break;
     case TS_2A:
-        if (para->fast_taps)
-            priv->tap_button_state = TBS_BUTTON_DOWN;
-        else
-            priv->tap_button_state = TBS_BUTTON_UP;
+	priv->tap_button_state = TBS_BUTTON_UP;
         break;
     case TS_2B:
         priv->tap_button_state = TBS_BUTTON_UP;
@@ -1877,10 +1871,7 @@ SetTapState(SynapticsPrivate * priv, enum TapState tap_state, CARD32 millis)
         priv->tap_button_state = TBS_BUTTON_DOWN;
         break;
     case TS_SINGLETAP:
-        if (para->fast_taps)
-            priv->tap_button_state = TBS_BUTTON_UP;
-        else
-            priv->tap_button_state = TBS_BUTTON_DOWN;
+	priv->tap_button_state = TBS_BUTTON_DOWN;
         priv->touch_on.millis = millis;
         break;
     default:
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index 00a9326..2dbc054 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -125,7 +125,6 @@ typedef struct _SynapticsParameters {
     int tap_time_2;             /* max. tapping time for double taps */
     int click_time;             /* The duration of a single click */
     Bool clickpad;              /* Device is a has integrated buttons */
-    Bool fast_taps;             /* Faster reaction to single taps */
     int emulate_mid_button_time;        /* Max time between left and right button presses to
                                            emulate a middle button press. */
     int emulate_twofinger_z;    /* pressure threshold to emulate two finger touch (for Alps) */
-- 
1.7.10.1