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

Timestamp:

Jan 25, 2010 4:38:27 PM (15 years ago)

Author:

vboxsync

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

56916

Message:

Additions/x11: simplify the newer mouse driver and work around a bug in some 1.4 series X.Org servers

Location:

trunk/src/VBox/Additions/x11/vboxmouse

Files:

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

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

@@ -92 +92 @@
 miPointerCurrentScreen
 screenInfo
+InitPointerDeviceStruct

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

@@ -77 +77 @@
         /* 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);
+        cx = (cx * screenInfo.screens[0]->width) / 65535;
+        cy = (cy * screenInfo.screens[0]->height) / 65535;
 #endif
         /* send absolute movement */
@@ -96 +96 @@
     Atom axis_labels[2] = { 0, 0 };
     Atom button_labels[2] = { 0, 0 };
-    InputInfoPtr pInfo;
-
-    pInfo = device->public.devicePrivate;
-    if (!InitValuatorClassDeviceStruct(device, 2,
+    if (!InitPointerDeviceStruct((DevicePtr)device, map, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+                                 button_labels,
+#endif
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 2
-                                       miPointerGetMotionEvents,
-                                       miPointerGetMotionBufferSize(),
+                                 miPointerGetMotionEvents, VBoxPtrCtrlProc,
+                                 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,
-                                       GetMotionHistorySize(),
+                                 GetMotionHistory, VBoxPtrCtrlProc, 
+                                 GetMotionHistorySize(), 2 /* Number of axes */
+
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
+                                 VBoxPtrCtrlProc, GetMotionHistorySize(),
+                                                                 2 /* Number of axes */
 #else
 # error Unsupported version of X.Org
 #endif
-                                       Absolute))
-        return !Success;
-
-    /* Pretend we have buttons so the server accepts us as a pointing device. */
-    if (!InitButtonClassDeviceStruct(device, 2, /* number of buttons */
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-                                     button_labels,
-#endif
-                                     map))
-        return !Success;
-    if (!InitPtrFeedbackClassDeviceStruct(device, VBoxPtrCtrlProc))
+                                 , axis_labels
+#endif
+                                 ))
         return !Success;
 
@@ -148 +140 @@
     xf86InitValuatorDefaults(device, 0);
     xf86InitValuatorDefaults(device, 1);
-    xf86MotionHistoryAllocate(pInfo);
+    xf86MotionHistoryAllocate(device->public.devicePrivate);
 
     return Success;