From e6032c34515a19ebac09090028f806d82ddfb62d Mon Sep 17 00:00:00 2001 From: Chase Douglas Date: Thu, 9 Feb 2012 10:06:54 -0800 Subject: Filter touch events if two-finger scrolling is enabled Signed-off-by: Chase Douglas Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- src/synaptics.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/synaptics.c b/src/synaptics.c index dfeb0c4..7b3f680 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -2607,9 +2607,10 @@ HandleTouches(InputInfoPtr pInfo, struct SynapticsHwState *hw) Bool restart_touches = FALSE; int i; - if (para->click_action[F3_CLICK1] || para.tap_action[F3_TAP]) + 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]) + else if (para->click_action[F2_CLICK1] || para->tap_action[F2_TAP] || + para->scroll_twofinger_vert || para->scroll_twofinger_horiz) min_touches = 3; /* Count new number of active touches */ -- cgit v1.2.3