Changeset 25456 in vbox for trunk

Timestamp:

Dec 17, 2009 11:40:11 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56116

Message:

Additions/x11/vboxmouse: properly support X.Org 1.4 in the newer driver

Location:

trunk/src/VBox/Additions/x11/vboxmouse

Files:

• Makefile.kmk (modified) (1 diff)
• vboxmouse_15.c (modified) (5 diffs)

trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk

@@ -242 +242 @@
 $$(PATH_vboxmouse_drv_16)/tstvboxmouse16.run: $$(INSTARGET_vboxmouse_drv_16)
         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-            $(INSTARGET_vboxmouse_drv_16) $(OUR_PATH_VBOXMOUSE)/undefined_16
+            $(INSTARGET_vboxmouse_drv_16) $(OUR_PATH_VBOXMOUSE)/undefined_15
         $(QUIET)$(APPEND) -t "$@" "done"
 

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

@@ -74 +74 @@
         &&  RT_SUCCESS(VbglR3GetMouseStatus(&fFeatures, &cx, &cy))
         && (fFeatures & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE))
+#if ABI_XINPUT_VERSION == SET_ABI_VERSION(2, 0)
+        /* Bug in the 1.4 X server series - conversion_proc was no longer
+         * called, but the server didn't yet do the conversion itself. */
+        cx = xf86ScaleAxis(cx, 0, screenInfo.screens[0]->width, 0, 65536);
+        cy = xf86ScaleAxis(cy, 0, screenInfo.screens[0]->height, 0, 65536);
+#endif
         /* send absolute movement */
         xf86PostMotionEvent(pInfo->dev, 1, 0, 2, cx, cy);
@@ -122 +128 @@
 
     /* Tell the server about the range of axis values we report */
+#if ABI_XINPUT_VERSION <= SET_ABI_VERSION(2, 0)
+    xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
+    xf86InitValuatorAxisStruct(device, 1, 0, -1, 1, 0, 1);
+#else
     xf86InitValuatorAxisStruct(device, 0,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+# if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                                axis_labels[0],
-#endif
+# endif
                                0 /* min X */, 65536 /* max X */,
                                10000, 0, 10000);
-    xf86InitValuatorDefaults(device, 0);
 
     xf86InitValuatorAxisStruct(device, 1,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+# if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                                axis_labels[1],
-#endif
+# endif
                                0 /* min Y */, 65536 /* max Y */,
                                10000, 0, 10000);
+#endif
+    xf86InitValuatorDefaults(device, 0);
     xf86InitValuatorDefaults(device, 1);
     xf86MotionHistoryAllocate(pInfo);
@@ -214 +225 @@
 }
 
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 2
 static Bool
 VBoxConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2,
@@ -226 +236 @@
         return FALSE;
 }
-#endif
 
 static InputInfoPtr
@@ -244 +253 @@
     /* Unlike evdev, we set this unconditionally, as we don't handle keyboards. */
     pInfo->type_name = XI_MOUSE;
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 2
     pInfo->conversion_proc = VBoxConvert;
-#endif
     pInfo->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS |
             XI86_ALWAYS_CORE;