On Thu, Mar 18, 2010 at 08:57:54PM -0500, [email protected] wrote: > From: Chris Bagwell <[email protected]> > > Now that we support touchpads (Bamboo P&T), the old logic > for button presses on touchscreens needs to consider this. > > I chose looking at tablet_id instead of ABSOLUTE/RELATIVE setting > because we would have to do a for() loop to find correct private > structure for touch device. > > Eventually, we will merge over touchscreen gesture support > from linuxwacom which will centralize all gesture logic > in either wcmCommon.c or wcmTouchFilter.c. > > Signed-off-by: Chris Bagwell <[email protected]> > --- > src/wcmUSB.c | 14 ++++++++++---- > 1 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/src/wcmUSB.c b/src/wcmUSB.c > index 7532551..137d9b1 100644 > --- a/src/wcmUSB.c > +++ b/src/wcmUSB.c > @@ -991,12 +991,18 @@ static void usbParseChannel(LocalDevicePtr local, int > channel) > if ((ds->proximity && !dslast.proximity) || > (!ds->proximity && > dslast.proximity)) > ds->sample = (int)GetTimeInMillis(); > - /* left button is always pressed for touch > without capacity > + /* left button is always pressed for > + * touchscreen without capacity > * when the first finger touch event received. > - * For touch with capacity, left button event > will be decided > - * in wcmCommon.c by capacity threshold > + * For touchscreen with capacity, left button > + * event will be decided > + * in wcmCommon.c by capacity threshold. > + * Touchpads should not have button > + * press. > */ > - if (common->wcmCapacityDefault < 0) > + if (common->wcmCapacityDefault < 0 && > + (common->tablet_id < 0xd0 || > + common->tablet_id > 0xd3)) > MOD_BUTTONS (0, event->value); > } > else if (event->code == BTN_TOOL_TRIPLETAP) > -- > 1.6.6.1
Thanks, tested and merged. Cheers, Peter ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
