From 4e08974ead62fc50ebbe0190abce78c5de3fcdff Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 2 Nov 2010 09:04:45 +1000 Subject: ABI 12 requires valuator modes to be specified. Signed-off-by: Peter Hutterer Acked-by: Thomas Hellstrom --- src/vmmouse.c | 24 ++++++++++++++++++++---- 1 file 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 -- cgit v1.2.3