From: Chris Bagwell <ch...@cnpbagwell.com>
Changed logic to dispatch 1 or 2 channels events to be
based on value of wcmBTNChannel instead of based on protocol
used.
Although previous logic worked, this way is clearer to reason
why wcmEvent() needs to be called for 1 or 2 channel's.
Signed-off-by: Chris Bagwell <ch...@cnpbagwell.com>
---
src/wcmUSB.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index a5cdc8b..6427adf 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -1212,13 +1212,11 @@ static void usbDispatchEvents(InputInfoPtr pInfo)
/* dispatch events */
if (channel_change ||
- (common->wcmProtocolLevel != WCM_PROTOCOL_GENERIC &&
- btn_channel_change))
+ (private->wcmBTNChannel == channel && btn_channel_change))
wcmEvent(common, channel, ds);
- /* dispatch pad events on generic tablets */
- if (common->wcmProtocolLevel == WCM_PROTOCOL_GENERIC &&
- btn_channel_change)
+ /* dispatch butten events when re-routed */
+ if (private->wcmBTNChannel != channel && btn_channel_change)
{
/* Force to in proximity for this special case */
btn_ds->proximity = 1;
--
1.7.3.2
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
