diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-03-12 14:11:29 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-03-12 14:13:18 +1000 |
| commit | 17bbcad28000bbd896a33047c0720ada89e05f5d (patch) | |
| tree | 3e2969351e42ee8482e1e482902b3d0e2ba265dd /src/synaptics.c | |
| parent | b40a5255fe73f7f95c8ff7145dd91605f3430119 (diff) | |
Revert "Add another third state to TouchpadOff for disabling all but button clicks"
This third state is not needed, the behaviour of the touchpad driver is now
good enough to not need an external syndaemon instance to toggle this third
state.
This reverts commit eea73358760c7ff9c9dac061f265753637c6f25c.
Conflicts:
man/synaptics.man
src/synaptics.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/synaptics.c')
| -rw-r--r-- | src/synaptics.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index 640fa6f..aeb1c57 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -1810,8 +1810,7 @@ SelectTapButton(SynapticsPrivate * priv, enum EdgeType edge) { enum TapEvent tap; - if (priv->synpara.touchpad_off == TOUCHPAD_TAP_OFF || - priv->synpara.touchpad_off == TOUCHPAD_CLICK_ONLY) { + if (priv->synpara.touchpad_off == TOUCHPAD_TAP_OFF) { priv->tap_button = 0; return; } @@ -2350,9 +2349,7 @@ HandleScrolling(SynapticsPrivate * priv, struct SynapticsHwState *hw, SynapticsParameters *para = &priv->synpara; int delay = 1000000000; - if ((priv->synpara.touchpad_off == TOUCHPAD_TAP_OFF) || - (priv->synpara.touchpad_off == TOUCHPAD_CLICK_ONLY) || - (priv->finger_state == FS_BLOCKED)) { + if ((priv->synpara.touchpad_off == TOUCHPAD_TAP_OFF) || (priv->finger_state == FS_BLOCKED)) { stop_coasting(priv); priv->circ_scroll_on = FALSE; priv->vert_scroll_edge_on = FALSE; @@ -2964,9 +2961,6 @@ HandleTouches(InputInfoPtr pInfo, struct SynapticsHwState *hw) Bool restart_touches = FALSE; int i; - if (para->touchpad_off == TOUCHPAD_CLICK_ONLY) - goto out; - if (para->click_action[F3_CLICK1] || para->tap_action[F3_TAP]) min_touches = 4; else if (para->click_action[F2_CLICK1] || para->tap_action[F2_TAP] || @@ -3213,8 +3207,7 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now, } /* Post events */ - if (finger >= FS_TOUCHED && (dx || dy) && !ignore_motion && - (para->touchpad_off != TOUCHPAD_CLICK_ONLY)) + if (finger >= FS_TOUCHED && (dx || dy) && !ignore_motion) xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy); if (priv->mid_emu_state == MBE_LEFT_CLICK) { |