Changeset 25079 in vbox for trunk/src/VBox/Additions/x11/vboxmouse

Timestamp:

Nov 28, 2009 11:31:19 PM (15 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxmouse: make the X.Org server 1.5 mouse driver work on X.Org server 1.3 and 1.4

Location:

trunk/src/VBox/Additions/x11/vboxmouse

Files:

• undefined_15 (modified) (1 diff)
• vboxmouse_15.c (modified) (6 diffs)

trunk/src/VBox/Additions/x11/vboxmouse/undefined_15

@@ -87 +87 @@
 __moddi3
 InitPtrFeedbackClassDeviceStruct
+xf86ScaleAxis
+miPointerGetMotionEvents
+miPointerGetMotionBufferSize
+miPointerCurrentScreen
+screenInfo

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

@@ -53 +53 @@
 #include <xf86.h>
 #include <xf86Xinput.h>
-#include <exevents.h>
 #include <mipointer.h>
 
@@ -67 +66 @@
 
     /* The first test here is a workaround for an apparent bug in Xorg Server 1.5 */
-    if (   miPointerGetScreen(pInfo->dev) != NULL
-        && RT_SUCCESS(VbglR3GetMouseStatus(&fFeatures, &cx, &cy))
+    if (
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 2
+           miPointerCurrentScreen() != NULL
+#else
+           miPointerGetScreen(pInfo->dev) != NULL
+#endif
+        &&  RT_SUCCESS(VbglR3GetMouseStatus(&fFeatures, &cx, &cy))
         && (fFeatures & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE))
         /* send absolute movement */
@@ -90 +94 @@
     pInfo = device->public.devicePrivate;
     if (!InitValuatorClassDeviceStruct(device, 2,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 2
+                                       miPointerGetMotionEvents,
+                                       miPointerGetMotionBufferSize(),
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
                                        GetMotionHistory,
+                                       GetMotionHistorySize(),
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
+                                       GetMotionHistorySize(),
 #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                                        axis_labels,
-#endif
-                                       GetMotionHistorySize(), Absolute))
+                                       GetMotionHistorySize(),
+#else
+# error Unsupported version of X.Org
+#endif
+                                       Absolute))
         return !Success;
 
@@ -146 +159 @@
             return xrc;
         }
-        xf86Msg(X_CONFIG, "%s: Mouse Integration associated with screen %d\n",
-                pInfo->name,
-                xf86SetIntOption(pInfo->options, "ScreenNumber", 0));
         break;
 
@@ -204 +214 @@
 }
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 2
+static Bool
+VBoxConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2,
+            int v3, int v4, int v5, int *x, int *y)
+{
+    if (first == 0) {
+        *x = xf86ScaleAxis(v0, 0, screenInfo.screens[0]->width, 0, 65536);
+        *y = xf86ScaleAxis(v1, 0, screenInfo.screens[0]->height, 0, 65536);
+        return TRUE;
+    } else
+        return FALSE;
+}
+#endif
+
 static InputInfoPtr
 VBoxPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
@@ -220 +244 @@
     /* 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;