diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-02 09:04:45 +1000 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2010-11-04 08:55:27 +0100 |
| commit | 4e08974ead62fc50ebbe0190abce78c5de3fcdff (patch) | |
| tree | 66d28fd4b43b8c8af2efea49c83ba19e5ad68faf | |
| parent | 4527ef863a4c4d3e499007abb65dbb5e086219e8 (diff) | |
ABI 12 requires valuator modes to be specified.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
| -rw-r--r-- | src/vmmouse.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/src/vmmouse.c b/src/vmmouse.c index 86f1ccf..32abd9e 100644 --- a/src/vmmouse.c +++ b/src/vmmouse.c @@ -787,13 +787,21 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode) #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[0], #endif - 0, 65535, 10000, 0, 10000); + 0, 65535, 10000, 0, 10000 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + , Absolute +#endif + ); #else xf86InitValuatorAxisStruct(device, 0, #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[0], #endif - 0, -1, 1, 0, 1); + 0, -1, 1, 0, 1 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + , Relative +#endif + ); #endif xf86InitValuatorDefaults(device, 0); /* Y valuator */ @@ -802,13 +810,21 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode) #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[1], #endif - 0, 65535, 10000, 0, 10000); + 0, 65535, 10000, 0, 10000 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + , Absolute +#endif + ); #else xf86InitValuatorAxisStruct(device, 1, #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[1], #endif - 0, -1, 1, 0, 1); + 0, -1, 1, 0, 1 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + , Relative +#endif + ); #endif xf86InitValuatorDefaults(device, 1); #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 |