Changeset 34001 in vbox for trunk/src/VBox/Devices/Input/UsbKbd.cpp

Timestamp:

Nov 11, 2010 4:31:11 PM (14 years ago)

Author:

vboxsync

Message:

UsbKbd: Proper fix for funny Korean keys.

File:

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

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

@@ -376 +376 @@
     0x00, 0x00, 0x00, 0x00, 0x68, 0x69, 0x6a, 0x6b, /* 60-67 */
     0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x00, /* 68-6F */
-    0x88, 0x90, 0x91, 0x87, 0x00, 0x00, 0x00, 0x00, /* 70-77 */
+    0x88, 0x91, 0x90, 0x87, 0x00, 0x00, 0x00, 0x00, /* 70-77 */
     0x00, 0x8a, 0x00, 0x8b, 0x00, 0x89, 0x85, 0x00  /* 78-7F */
 };
@@ -702 +702 @@
                             uint8_t *pabDepressedKeys)
 {
+    int rc = false;
     unsigned iBuf = 0;
     RT_ZERO(*pReport);
@@ -725 +726 @@
                 pReport->aKeys[iBuf] = iKey;
                 ++iBuf;
+                /* More Korean keyboard hackery: Give the caller a hint that
+                 * a key release event needs reporting.
+                 */
+                if (iKey == 0x90 || iKey == 0x91)
+                    rc = true;
             }
             pabUnreportedKeys[iKey] = 0;
         }
     }
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -843 +849 @@
         PUSBHIDK_REPORT pReport = (PUSBHIDK_REPORT)&pUrb->abData[0];
 
-        int rc = usbHidFillReport(pReport, pThis->abUnreportedKeys,
-                                  pThis->abDepressedKeys);
-        pThis->fHasPendingChanges = false;
-        AssertRCReturn(rc, rc);
+        int again = usbHidFillReport(pReport, pThis->abUnreportedKeys,
+                                      pThis->abDepressedKeys);
+        if (again)
+            pThis->fHasPendingChanges = true;
+        else
+            pThis->fHasPendingChanges = false;
         return usbHidCompleteOk(pThis, pUrb, sizeof(*pReport));
     }