Arbitration did not work as expected since common is meant for tools
on the same logical port, not for tools of the same physical device
or of the same product id. Plus, not all devices support touch.
Signed-off-by: Ping Cheng <pi...@wacom.com>
---
v2: make sure the device support touch
---
src/wcmCommon.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index 02f3da1..8bf1ebb 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -1180,6 +1180,8 @@ static void commonDispatchDevice(WacomCommonPtr common,
unsigned int channel,
{
if (IsPen(priv))
{
+ common->wcmTouchDevice->common->wcmPenInProx =
filtered.proximity;
+
/* send touch out when pen coming in-prox for devices
* that provideboth pen and touch events so system
* cursor won't jump between tools.
@@ -1196,9 +1198,6 @@ static void commonDispatchDevice(WacomCommonPtr common,
unsigned int channel,
return;
}
- if (IsPen(priv))
- common->wcmPenInProx = filtered.proximity;
-
if ((IsPen(priv) || IsTouch(priv)) && common->wcmMaxZ)
{
priv->minPressure = rebasePressure(priv, &filtered);
--
1.7.10.4
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
