diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-25 11:16:22 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-18 11:35:46 +1000 |
commit | fedd52ba781da1960ada0a96b85293afe2509a4a (patch) | |
tree | 4a227493602cbcc85b9a1620a9dbd38108fdc274 | |
parent | 7bf22a368c752fe76dc60c3ea0f70ec1a46d653e (diff) |
ABI 12 requires per-valuator modes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r-- | src/mouse.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/mouse.c b/src/mouse.c index e600474..7088abc 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -1540,14 +1540,22 @@ MouseProc(DeviceIntPtr device, int what) #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[0], #endif - -1, -1, 1, 0, 1); + -1, -1, 1, 0, 1 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + , Relative +#endif + ); xf86InitValuatorDefaults(device, 0); /* Y valuator */ xf86InitValuatorAxisStruct(device, 1, #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[1], #endif - -1, -1, 1, 0, 1); + -1, -1, 1, 0, 1 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + , Relative +#endif + ); xf86InitValuatorDefaults(device, 1); #ifdef EXTMOUSEDEBUG |