Changeset 30432 in vbox

Timestamp:

Jun 24, 2010 1:06:21 PM (15 years ago)

Author:

vboxsync

Message:

X11 additions/mouse: fixed a bug introduced with r56116 plus prevent sending a motion event if only a mouse button was pressed

File:

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

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

@@ -72 +72 @@
         &&  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
@@ -78 +79 @@
         cy = (cy * screenInfo.screens[0]->height) / 65535;
 #endif
-        /* send absolute movement */
-        xf86PostMotionEvent(pInfo->dev, 1, 0, 2, cx, cy);
+        /* The X server is calling this function even if only a button was
+         * pressed. old_x/old_y seem to be not used by the server code. */
+        if (   (uint32_t)pInfo->old_x != cx
+            || (uint32_t)pInfo->old_y != cy)
+        {
+            /* send absolute movement */
+            xf86PostMotionEvent(pInfo->dev, 1, 0, 2, cx, cy);
+            pInfo->old_x = cx;
+            pInfo->old_y = cy;
+        }
+    }
 }