On Sat, Jul 02, 2011 at 08:03:32PM -0500, [email protected] wrote: > From: Chris Bagwell <[email protected]> > > Added missing check to enable click-to-tap only when > gestures are enabled. > > Changed touchpad detection logic to look for WCM_LCD since > some people prefer their touchpad to be in absolute mode. > > Move touchpad detection to be inside touchpad gesture function > for better context. > > Signed-off-by: Chris Bagwell <[email protected]> > --- > src/wcmTouchFilter.c | 10 +++++++++- > 1 files changed, 9 insertions(+), 1 deletions(-) > > diff --git a/src/wcmTouchFilter.c b/src/wcmTouchFilter.c > index 4afede2..f02b712 100644 > --- a/src/wcmTouchFilter.c > +++ b/src/wcmTouchFilter.c > @@ -170,6 +170,10 @@ static void wcmSingleFingerTap(WacomDevicePtr priv) > > DBG(10, priv, "\n"); > > + /* This gesture is not valid on touchscreens. */ > + if (TabletHasFeature(priv->common, WCM_LCD)) > + return; > + > if (!ds[0].proximity && dsLast[0].proximity && !ds[1].proximity) > { > /* Single Tap must have lasted less than wcmTapTime > @@ -304,7 +308,11 @@ void wcmGestureFilter(WacomDevicePtr priv, int channel) > wcmFingerZoom(priv); > } > ret: > - if (!common->wcmGestureMode && !channel && !is_absolute(priv->pInfo)) > + /* Perform single finger gesture logics only when gestures > + * are enabled, not processing second touch, and not attempting > + * to detect second touch. > + */ > + if (common->wcmGesture && !channel && !common->wcmGestureMode)
I'd really prefer if wcmGestureMode would be an enum of the various options, with GESTURE_MODE_NONE as the disabled state. it be much easier to read. Plus, wcmGesture should probably be a Bool if its used as a boolean. Cheers, Peter > wcmSingleFingerTap(priv); > } > > -- > 1.7.5.4 ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
