summaryrefslogtreecommitdiff
path: root/src/wcmConfig.c
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2011-03-28 17:51:34 -0700
committerPeter Hutterer <peter.hutterer@who-t.net>2011-03-30 07:28:21 +1000
commit32d14dc4a9787356024020fd25e463a90a25f349 (patch)
treed4b3ea39575557a801dfb8f6a69be7ce6338cb88 /src/wcmConfig.c
parent5fec376c46e3840fe2e3f838df67cefee1c0d6c6 (diff)
downloadxf86-input-wacom-32d14dc4a9787356024020fd25e463a90a25f349.tar.gz
Resolve the oldHwProx puzzle
Change oldHwProx to oldCursorHwProx to better reflect its use. oldCursorHwProx keeps the hardware in/out prox state so we can set the MaxCursorDist for the next round of relative cursor movement when tool first comes in prox. For Protocol 5 devices, distance is reported as the maximum when tool is first detected. Then it is gradually reduced to 0 when getting closer to the tablet. Protocol 4 is the opposite: distance is 0 when tool is first in prox. The value increases as the tool gets closer to the tablet. The maximum distance (wcmMaxDist) is model specific. They are retrieved from the kernel. Reviewed-by: Chris Bagwell <chris@cnpbagwell.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/wcmConfig.c')
-rw-r--r--src/wcmConfig.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wcmConfig.c b/src/wcmConfig.c
index 2bf0ed3..6235d3c 100644
--- a/src/wcmConfig.c
+++ b/src/wcmConfig.c
@@ -62,7 +62,7 @@ static int wcmAllocate(InputInfoPtr pInfo)
priv->next = NULL;
priv->pInfo = pInfo;
priv->common = common; /* common info pointer */
- priv->oldHwProx = 1; /* previous hardware proximity */
+ priv->oldCursorHwProx = 0; /* previous cursor hardware proximity */
priv->nPressCtrl [0] = 0; /* pressure curve x0 */
priv->nPressCtrl [1] = 0; /* pressure curve y0 */
priv->nPressCtrl [2] = 100; /* pressure curve x1 */