XLibre/xf86-input-synaptics
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-synaptics.git synced 2026-03-24 01:34:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Filter touch events if click actions are enabled

Browse Source 
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Chase Douglas
2012-02-09 09:55:17 -08:00
committed by Peter Hutterer
parent 336f9a09d0
commit 061e4a2596
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/synaptics.c
View File

@@ -2601,10 +2601,17 @@ HandleTouches(InputInfoPtr pInfo, struct SynapticsHwState *hw)
{
#ifdef HAVE_MULTITOUCH
SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
SynapticsParameters *para = &priv->synpara;
int new_active_touches = priv->num_active_touches;
int min_touches = 2;
Bool restart_touches = FALSE;
int i;
if (para->click_action[F3_CLICK1])
min_touches = 4;
else if (para->click_action[F2_CLICK1])
min_touches = 3;
/* Count new number of active touches */
for (i = 0; i < hw->num_mt_mask; i++)
{
@@ -2614,11 +2621,13 @@ HandleTouches(InputInfoPtr pInfo, struct SynapticsHwState *hw)
new_active_touches--;
}
if (priv->num_active_touches < 2 && new_active_touches < 2)
if (priv->num_active_touches < min_touches &&
new_active_touches < min_touches)
{
/* We stayed below number of touches needed to send events */
goto out;
} else if (priv->num_active_touches >= 2 && new_active_touches < 2)
} else if (priv->num_active_touches >= min_touches &&
new_active_touches < min_touches)
{
/* We are transitioning to less than the number of touches needed to
* send events. End all currently open touches. */
@@ -2631,7 +2640,8 @@ HandleTouches(InputInfoPtr pInfo, struct SynapticsHwState *hw)
/* Don't send any more events */
goto out;
} else if (priv->num_active_touches < 2 && new_active_touches >= 2)
} else if (priv->num_active_touches < min_touches &&
new_active_touches >= min_touches)
{
/* We are transitioning to more than the number of touches needed to
* send events. Begin all already open touches. */