Changeset 49304 in vbox for trunk

Timestamp:

Oct 28, 2013 9:42:53 AM (11 years ago)

Author:

vboxsync

Message:

OS X host: LEDs sync: ignore CAPS LOCK timeout in Carbon event for now.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp

@@ -316 +316 @@
 } VBoxKbdState_t;
 
+/* A struct that used to pass input event info from IOKit callback to a Carbon one */
+typedef struct VBoxKbdEvent_t {
+    VBoxKbdState_t *pKbd;
+    uint32_t        iKeyCode;
+    uint64_t        tsKeyDown;
+    uint64_t        tsKeyUp;
+} VBoxKbdEvent_t;
+
 /* HID LEDs synchronization data: IOKit specific data. */
 typedef struct VBoxHidsState_t {
@@ -1462 +1470 @@
 }
 
-typedef struct VBoxKbdEvent_t {
-    VBoxKbdState_t *pKbd;
-    uint32_t        iKeyCode;
-    uint64_t        tsKeyDown;
-    uint64_t        tsKeyUp;
-} VBoxKbdEvent_t;
-
 /** IOKit key press callback. Triggered before Carbon callback. We remember which keyboard produced a keypress here. */
 static void darwinHidInputCallback(void *pData, IOReturn unused, void *unused1, IOHIDValueRef pValueRef)
@@ -1599 +1600 @@
 
             if (pEvent->iKeyCode == kHIDUsage_KeypadNumLock
-             || (pEvent->iKeyCode == kHIDUsage_KeyboardCapsLock &&
-                 (RTTimeSystemMilliTS() - pEvent->tsKeyDown) > pEvent->pKbd->cCapsLockTimeout))
+             || pEvent->iKeyCode == kHIDUsage_KeyboardCapsLock)
             {
                 /* Found one. Keep its index in queue in order to remove it later. */