Changeset 72408 in vbox

Timestamp:

Jun 1, 2018 11:00:21 AM (7 years ago)

Author:

vboxsync

Message:

PS2K: Corrected typematic action stopping. See bbugref:4118c57

File:

• trunk/src/VBox/Devices/Input/PS2K.cpp (modified) (5 diffs)

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

@@ -658 +658 @@
 }
 
+/* Clears the currently active typematic key, if any. */
+static void ps2kStopTypematicRepeat(PPS2K pThis)
+{
+    if (pThis->u8TypematicKey)
+    {
+        LogFunc(("Typematic key %02X\n", pThis->u8TypematicKey));
+        pThis->enmTypematicState = KBD_TMS_IDLE;
+        pThis->u8TypematicKey = 0;
+        TMTimerStop(pThis->CTX_SUFF(pKbdTypematicTimer));
+    }
+}
+
 /* Convert encoded typematic value to milliseconds. Note that the values are rated
  * with +/- 20% accuracy, so there's no need for high precision.
@@ -686 +698 @@
     ps2kSetupTypematic(pThis, KBD_DFL_RATE_DELAY);
     /* Clear last typematic key?? */
+    ps2kStopTypematicRepeat(pThis);
 }
 
@@ -719 +732 @@
             pThis->fScanning = true;
             ps2kClearQueue((GeneriQ *)&pThis->keyQ);
-            /* Clear last typematic key?? */
+            ps2kStopTypematicRepeat(pThis);
             ps2kInsertQueue((GeneriQ *)&pThis->cmdQ, KRSP_ACK);
             pThis->u8CurrCmd = 0;
@@ -725 +738 @@
         case KCMD_DFLT_DISABLE:
             pThis->fScanning = false;
-            ps2kSetDefaults(pThis);
+            ps2kSetDefaults(pThis); /* Also clears buffer/typematic state. */
             ps2kInsertQueue((GeneriQ *)&pThis->cmdQ, KRSP_ACK);
             pThis->u8CurrCmd = 0;
@@ -1060 +1073 @@
     else
     {
-        pThis->u8TypematicKey    = 0;
-        pThis->enmTypematicState = KBD_TMS_IDLE;
-        /// @todo Cancel timer right away?
-        /// @todo Cancel timer before pushing key up code!?
+        /* "Typematic operation stops when the last key pressed is released, even
+         * if other keys are still held down." (IBM PS/2 Tech Ref). The last key pressed
+         * is the one that's being repeated.
+         */
+        if (pThis->u8TypematicKey == u8HidCode)
+        {
+            /* This disables the typematic repeat. */
+            pThis->u8TypematicKey    = 0;
+            pThis->enmTypematicState = KBD_TMS_IDLE;
+            /* For good measure, we cancel the timer, too. */
+            TMTimerStop(pThis->CTX_SUFF(pKbdTypematicTimer));
+            Log(("Typematic action cleared for key %02X\n", u8HidCode));
+        }
     }