No functional changes, prep work for auto-detection of suppress.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
---
src/wcmValidateDevice.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index 959ee26..ad66aaf 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -783,16 +783,6 @@ Bool wcmPreInitParseOptions(InputInfoPtr pInfo, Bool
is_primary,
common->wcmRawSample = DEFAULT_SAMPLES;
}
- common->wcmSuppress = xf86SetIntOption(pInfo->options, "Suppress",
- common->wcmSuppress);
- if (common->wcmSuppress != 0) /* 0 disables suppression */
- {
- if (common->wcmSuppress > MAX_SUPPRESS)
- common->wcmSuppress = MAX_SUPPRESS;
- if (common->wcmSuppress < DEFAULT_SUPPRESS)
- common->wcmSuppress = DEFAULT_SUPPRESS;
- }
-
if (xf86SetBoolOption(pInfo->options, "Tilt",
(common->wcmFlags & TILT_REQUEST_FLAG)))
common->wcmFlags |= TILT_REQUEST_FLAG;
@@ -978,6 +968,16 @@ Bool wcmPostInitParseOptions(InputInfoPtr pInfo, Bool
is_primary,
common->wcmMaxZ = xf86SetIntOption(pInfo->options, "MaxZ",
common->wcmMaxZ);
+ common->wcmSuppress = xf86SetIntOption(pInfo->options, "Suppress",
+ common->wcmSuppress);
+ if (common->wcmSuppress != 0) /* 0 disables suppression */
+ {
+ if (common->wcmSuppress > MAX_SUPPRESS)
+ common->wcmSuppress = MAX_SUPPRESS;
+ if (common->wcmSuppress < DEFAULT_SUPPRESS)
+ common->wcmSuppress = DEFAULT_SUPPRESS;
+ }
+
/* 2FG touch device */
if (TabletHasFeature(common, WCM_2FGT) && IsTouch(priv))
{
--
1.8.1.4
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
