Changeset 54289 in vbox for trunk

Timestamp:

Feb 19, 2015 12:57:35 AM (10 years ago)

Author:

vboxsync

Message:

PS2M: Try harder not to leave buttons hanging.

File:

• trunk/src/VBox/Devices/Input/PS2M.cpp (modified) (4 diffs)

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

@@ -242 +242 @@
     /** Instantaneous button data. */
     uint32_t            fCurrB;
+    /** Button state last sent to the guest. */
+    uint32_t            fReportedB;
     /** Throttling delay in milliseconds. */
     uint32_t            uThrottleDelay;
-    uint32_t            Alignment0;
 
     /** The device critical section protecting everything - R3 Ptr */
@@ -458 +459 @@
     /* Event queue, eccumulators, and button status bits are cleared. */
     ps2kClearQueue((GeneriQ *)&pThis->evtQ);
-    pThis->iAccumX = pThis->iAccumY = pThis->iAccumZ = pThis->fAccumB = pThis->fCurrB = 0;
+    pThis->iAccumX = pThis->iAccumY = pThis->iAccumZ = pThis->fAccumB;
 }
 
@@ -541 +542 @@
     }
 
-    /* Clear the movement accumulators. */
+    /* Clear the movement accumulators, but not necessarily button state. */
     pThis->iAccumX = pThis->iAccumY = pThis->iAccumZ = 0;
     /* Clear accumulated button state only when it's being used. */
     if (fAccumBtns)
-        pThis->fAccumB = 0;
+    {
+        pThis->fReportedB = pThis->fAccumB;
+        pThis->fAccumB    = 0;
+    }
 }
 
@@ -778 +782 @@
 #else
     /* If more movement is accumulated, report it and restart the timer. */
-    uHaveEvents = pThis->iAccumX | pThis->iAccumY | pThis->iAccumZ | pThis->fAccumB;
+    uHaveEvents = pThis->iAccumX | pThis->iAccumY | pThis->iAccumZ | (pThis->fCurrB != pThis->fReportedB);
     LogFlowFunc(("Have%s events\n", uHaveEvents ? "" : " no"));