Changeset 38274 in vbox for trunk/src/VBox

Timestamp:

Aug 2, 2011 10:14:57 AM (13 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxmouse: some server versions round up pointer values differently to what I would expect; this time we shift in the right direction

File:

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

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

@@ -59 +59 @@
 #include "product-generated.h"
 
+enum
+{
+#if ABI_XINPUT_VERSION > SET_ABI_VERSION(2, 0)
+/* The X server does (to my mind) incorrect rounding, so we adjust our range to
+ * compensate. */
+    ADJUST_RANGE = 32,
+#else
+    ADJUST_RANGE = 0,
+#endif
+    /** The minumum value our device can return */
+    RANGE_MIN = ADJUST_RANGE,
+    /** The maximum value our device can return */
+    RANGE_MAX = 0xFFFF + ADJUST_RANGE
+};
+
 static void
 VBoxReadInput(InputInfoPtr pInfo)
@@ -132 +147 @@
                                axis_labels[0],
 # endif
-/* The X server does (to my mind) incorrect rounding, hence the strange values.
- */
-                               -32 /* min X */, 65503 /* max X */,
+                               RANGE_MIN /* min X */, RANGE_MAX /* max X */,
                                10000, 0, 10000
 # if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
@@ -145 +158 @@
                                axis_labels[1],
 # endif
-/* The X server does (to my mind) incorrect rounding, hence the strange values.
- */
-                               -32 /* min Y */, 65503 /* max Y */,
+                               RANGE_MIN /* min Y */, RANGE_MAX /* max Y */,
                                10000, 0, 10000
 # if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12