diff options
| author | Chris Bagwell <chris@cnpbagwell.com> | 2011-11-22 20:18:44 -0600 |
|---|---|---|
| committer | Chris Bagwell <chris@cnpbagwell.com> | 2011-11-26 18:37:37 -0600 |
| commit | c6dba3dab054be19921a11f8ee38f847e4ef8962 (patch) | |
| tree | 4b32eba5fff85a17b177164c538b1b5976fa12c2 | |
| parent | b0aab508269acb3a8bf9e6699a4a283f374e8488 (diff) | |
Remove wcmTapTimeDefault variable
Its not really needed anymore. The whole *Default variable concept is
at least partially related to historically the PAD device was Init'ed
before the TOUCH device on Bamboo's but that is no longer true.
And since the TOUCH device is now Init'ed before PAD, when PAD
got Init'ed, wcmTapTimeDefault would override Touch's TapTime value;
probably not what user wanted.
For times *Default was really useful, I think wcmPostInitParseOption()
is probably a better replacement concept. I'll slowly remove these
*Defaults as I have time to test each behavior.
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
Reviewed-by: Jason Gerecke <killertofu@gmail.com>
| -rw-r--r-- | src/wcmCommon.c | 1 | ||||
| -rw-r--r-- | src/wcmValidateDevice.c | 2 | ||||
| -rw-r--r-- | src/xf86WacomDefs.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/wcmCommon.c b/src/wcmCommon.c index f1ef677..e85c6d8 100644 --- a/src/wcmCommon.c +++ b/src/wcmCommon.c @@ -1397,7 +1397,6 @@ WacomCommonPtr wcmNewCommon(void) common->wcmTPCButton = 0; /* set Tablet PC button on/off */ common->wcmGestureParameters.wcmScrollDirection = 0; common->wcmGestureParameters.wcmTapTime = 250; - common->wcmGestureParameters.wcmTapTimeDefault = 250; common->wcmRotate = ROTATE_NONE; /* default tablet rotation to off */ common->wcmMaxX = 0; /* max digitizer logical X value */ common->wcmMaxY = 0; /* max digitizer logical Y value */ diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c index d2cf636..538db0a 100644 --- a/src/wcmValidateDevice.c +++ b/src/wcmValidateDevice.c @@ -900,7 +900,7 @@ Bool wcmPreInitParseOptions(InputInfoPtr pInfo, Bool is_primary, common->wcmGestureParameters.wcmTapTime = xf86SetIntOption(pInfo->options, "TapTime", - common->wcmGestureParameters.wcmTapTimeDefault); + common->wcmGestureParameters.wcmTapTime); } /* Swap stylus buttons 2 and 3 for Tablet PCs */ diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h index 417fe1d..1cdfa1a 100644 --- a/src/xf86WacomDefs.h +++ b/src/xf86WacomDefs.h @@ -393,7 +393,6 @@ typedef struct { int wcmMaxScrollFingerSpread; /* maximum distance between fingers for scroll gesture */ int wcmGestureUsed; /* retain used gesture count within one in-prox event */ int wcmTapTime; /* minimum time between taps for a right click */ - int wcmTapTimeDefault; /* default minimum time between taps for a right click */ } WacomGesturesParameters; enum WacomProtocol { |