diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-02-05 00:42:36 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-10 09:42:26 +1000 |
| commit | d14ea867ad5d6f8a758a18223e457e1a56fa6065 (patch) | |
| tree | c3761d8ba6337aa31805fb9f75aca1e026b2f0ca /src | |
| parent | 2c7eab5a6d28cf8bbf34fba79601dac4e6e37d7e (diff) | |
Purge fast-taps option
This driver has too many options, maintaining them is hard and testing
virtually doesn't happen.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/properties.c | 10 | ||||
| -rw-r--r-- | src/synaptics.c | 13 | ||||
| -rw-r--r-- | src/synapticsstr.h | 1 |
3 files changed, 2 insertions, 22 deletions
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, ¶->clickpad); - prop_tap_fast = - InitAtom(pInfo->dev, SYNAPTICS_PROP_TAP_FAST, 8, 1, ¶->fast_taps); prop_middle_timeout = InitAtom(pInfo->dev, SYNAPTICS_PROP_MIDDLE_TIMEOUT, 32, 1, ¶->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) */ |