Changeset 22589 in vbox

Timestamp:

Aug 31, 2009 9:31:07 AM (15 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxmouse: adjust mouse driver vor XInput 2, contributed by Lubomir Rintel

File:

• trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c (modified) (2 diffs)

trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c

@@ -81 +81 @@
 
     pInfo = device->public.devicePrivate;
+    Atom axis_labels[2] = { 0, 0 };
+    Atom button_labels[2] = { 0, 0 };
 
     if (!InitValuatorClassDeviceStruct(device, 2,
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
                                        GetMotionHistory,
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+                                       axis_labels,
 #endif
                                        GetMotionHistorySize(), Absolute))
@@ -90 +94 @@
 
     /* Pretend we have buttons so the server accepts us as a pointing device. */
-    if (!InitButtonClassDeviceStruct(device, 2 /* number of buttons */, map))
+    if (!InitButtonClassDeviceStruct(device, 2, /* number of buttons */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+                                     button_labels,
+#endif
+                                     map))
         return !Success;
 
     /* Tell the server about the range of axis values we report */
-    xf86InitValuatorAxisStruct(device, 0, 0 /* min X */, 65536 /* max X */,
+    xf86InitValuatorAxisStruct(device, 0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+                               axis_labels[0],
+#endif
+                               0 /* min X */, 65536 /* max X */,
                                10000, 0, 10000);
     xf86InitValuatorDefaults(device, 0);
 
-    xf86InitValuatorAxisStruct(device, 1, 0 /* min Y */, 65536 /* max Y */,
+    xf86InitValuatorAxisStruct(device, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+                               axis_labels[1],
+#endif
+                               0 /* min Y */, 65536 /* max Y */,
                                10000, 0, 10000);
     xf86InitValuatorDefaults(device, 1);