[PATCH vmmouse 4/4] ABI 12 requires valuator modes to be specified.
Peter Hutterer
peter.hutterer at who-t.net
Mon Nov 1 16:09:44 PDT 2010
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
src/vmmouse.c | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 2f66b67..7f861eb 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
--
1.7.3.1
More information about the xorg-devel
mailing list