diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2011-11-09 09:14:14 -0800 |
|---|---|---|
| committer | Jason Gerecke <killertofu@gmail.com> | 2011-11-14 16:09:29 -0800 |
| commit | 2c4360d7be38f242a89f2da291e075b28e0dfc51 (patch) | |
| tree | ff9c2213b86d148e988a7e3d220fc445ebbe833a | |
| parent | ef47fa044b6bc3949c0b8d96c665d18937da719b (diff) | |
Only convert I4 tilt bits to rotation for the I4 mouse (v2)
This re-implements commit 9be9719d78af035c45ea4b191c21fab0ee54f198.
Ping pointed out the device_type field that I had somehow missed
when making the earlier commit. This provides essentially the same
information as the IsCursor() macro that the original patch went
through so much trouble to use.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/wcmCommon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wcmCommon.c b/src/wcmCommon.c index ee138ba..b907499 100644 --- a/src/wcmCommon.c +++ b/src/wcmCommon.c @@ -901,7 +901,8 @@ void wcmEvent(WacomCommonPtr common, unsigned int channel, } if (TabletHasFeature(common, WCM_ROTATION) && - TabletHasFeature(common, WCM_RING)) /* I4 */ + TabletHasFeature(common, WCM_RING) && + ds.device_type == CURSOR_ID) /* I4 mouse */ { /* convert Intuos4 mouse tilt to rotation */ ds.rotation = wcmTilt2R(ds.tiltx, ds.tilty, |