Changeset 19614 in vbox

Timestamp:

May 12, 2009 12:27:21 PM (16 years ago)

Author:

vboxsync

Message:

Main and Devices: absolute mouse support: do not send a mouse movement event if only the button state has changed

Location:

trunk/src/VBox

Files:

• Devices/Input/DevPS2.cpp (modified) (1 diff)
• Main/MouseImpl.cpp (modified) (2 diffs)
• Main/include/MouseImpl.h (modified) (1 diff)

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -779 +779 @@
     s->mouse_dy -= dy;
     s->mouse_dz += dz;
+#ifndef VBOX
     /* XXX: SDL sometimes generates nul events: we delete them */
     if (s->mouse_dx == 0 && s->mouse_dy == 0 && s->mouse_dz == 0 &&
         s->mouse_buttons == buttons_state)
         return;
+#else
+    /* This issue does not affect VBox, and under some circumstances (which?)
+     * we may wish to send null events to make mouse integration work. */
+#endif
     s->mouse_buttons = buttons_state;
 

trunk/src/VBox/Main/MouseImpl.cpp

@@ -59 +59 @@
 {
     mpDrv = NULL;
+    mLastAbsX = 0;
+    mLastAbsY = 0;
     return S_OK;
 }
@@ -315 +317 @@
             fButtons |= PDMIMOUSEPORT_BUTTON_MIDDLE;
 
-        vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, 1, 1, dz,
-                                          fButtons);
+        /* This is a workaround.  In order to alert the Guest Additions to the
+         * fact that the absolute pointer position has changed, we send a
+         * a minute movement event to the PS/2 mouse device.  But in order
+         * to avoid the mouse jiggling every time the use clicks, we check to
+         * see if the position has really changed since the last mouse event.
+         */
+        if ((mLastAbsX == mouseXAbs) && (mLastAbsY == mouseYAbs))
+            vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, 0, 0, dz,
+                                              fButtons);
+        else
+            vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, 1, 1, dz,
+                                              fButtons);
+        mLastAbsX = mouseXAbs;
+        mLastAbsY = mouseYAbs;
         if (RT_FAILURE (vrc))
             rc = setError (VBOX_E_IPRT_ERROR,

trunk/src/VBox/Main/include/MouseImpl.h

@@ -106 +106 @@
 
     LONG uHostCaps;
+    uint32_t mLastAbsX;
+    uint32_t mLastAbsY;
 };