diff options
Diffstat (limited to 'src/wcmValidateDevice.c')
| -rw-r--r-- | src/wcmValidateDevice.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c index dda2fff..a389c81 100644 --- a/src/wcmValidateDevice.c +++ b/src/wcmValidateDevice.c @@ -1064,11 +1064,11 @@ error: return FALSE; } -/* The values were based on trail and error. */ -#define WCM_BAMBOO3_MAXX 4096.0 -#define WCM_BAMBOO3_ZOOM_DISTANCE 180.0 -#define WCM_BAMBOO3_SCROLL_DISTANCE 80.0 -#define WCM_BAMBOO3_SCROLL_SPREAD_DISTANCE 350.0 +/* The values were based on trial and error with a 3rd-gen Bamboo */ +#define WCM_DEFAULT_MM_XRES (27.8 * 1000) +#define WCM_DEFAULT_MM_YRES (44.5 * 1000) +#define WCM_ZOOM_DISTANCE_MM 6.5 +#define WCM_SCROLL_DISTANCE_MM 1.8 /** * Parse post-init options for this device. Useful for overriding HW @@ -1095,10 +1095,10 @@ Bool wcmPostInitParseOptions(InputInfoPtr pInfo, Bool is_primary, /* 2FG touch device */ if (TabletHasFeature(common, WCM_2FGT) && IsTouch(priv)) { - int zoom_distance = common->wcmMaxTouchX * - (WCM_BAMBOO3_ZOOM_DISTANCE / WCM_BAMBOO3_MAXX); - int scroll_distance = common->wcmMaxTouchX * - (WCM_BAMBOO3_SCROLL_DISTANCE / WCM_BAMBOO3_MAXX); + int x_res = common->wcmTouchResolX ? common->wcmTouchResolX : WCM_DEFAULT_MM_XRES; + int y_res = common->wcmTouchResolY ? common->wcmTouchResolY : WCM_DEFAULT_MM_YRES; + int zoom_distance = WCM_ZOOM_DISTANCE_MM * x_res / 1000; + int scroll_distance = WCM_SCROLL_DISTANCE_MM * y_res / 1000; common->wcmGestureParameters.wcmZoomDistance = xf86SetIntOption(pInfo->options, "ZoomDistance", @@ -1107,10 +1107,6 @@ Bool wcmPostInitParseOptions(InputInfoPtr pInfo, Bool is_primary, common->wcmGestureParameters.wcmScrollDistance = xf86SetIntOption(pInfo->options, "ScrollDistance", scroll_distance); - - common->wcmGestureParameters.wcmMaxScrollFingerSpread = - common->wcmMaxTouchX * - (WCM_BAMBOO3_SCROLL_SPREAD_DISTANCE / WCM_BAMBOO3_MAXX); } |