Changeset 49090 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 14, 2013 6:33:39 PM (11 years ago)

Author:

vboxsync

Message:

OS X host: leds sync: resync last affected HID device with the guest state at the point where Carbon input callback is issued; now all things should in sync.

File:

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

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

@@ -311 +311 @@
     IOHIDDeviceRef    pDevice;              /** A reference to IOKit HID device */
     VBoxLedState_t    LED;                  /** LED states */
-    CFMutableArrayRef pStorageArray;        /** A reference to array where VBoxKbdState_t instance is stored */
+    void             *pParentContainer;     /** A pointer to a VBoxHidsState_t instance where VBoxKbdState_t instance is stored */
     CFIndex           idxPosition;          /** Position in global storage (used to simplify CFArray navigation when removing detached device) */
 } VBoxKbdState_t;
@@ -1476 +1476 @@
     {
         Log2(("carbon event: caps=%s, num=%s\n", VBOX_BOOL_TO_STR_STATE(fCaps), VBOX_BOOL_TO_STR_STATE(fNum)));
-        if (g_LastTouchedState)
-        {
-            g_LastTouchedState->LED.fCapsLockOn = fCaps;
-            g_LastTouchedState->LED.fNumLockOn  = fNum;
+
+        VBoxKbdState_t  *pKbd = g_LastTouchedState;
+        if (pKbd)
+        {
+            pKbd->LED.fCapsLockOn = fCaps;
+            pKbd->LED.fNumLockOn  = fNum;
+
+            /* Silently resync last touched KBD device */
+            VBoxHidsState_t *pHidState = (VBoxHidsState_t *)pKbd->pParentContainer;
+            if (pHidState)
+            {
+                CFDictionaryRef elementMatchingDict = darwinQueryLedElementMatchingDictionary();
+                if (elementMatchingDict)
+                {
+                    (void)darwinSetDeviceLedsState(pKbd->pDevice, elementMatchingDict, pHidState->guestState.fNumLockOn,
+                        pHidState->guestState.fCapsLockOn, pHidState->guestState.fScrollLockOn);
+
+                    CFRelease(elementMatchingDict);
+                }
+            }
 
             /* Forget device */
@@ -1495 +1511 @@
     (void)unused1;
 
-    VBoxKbdState_t *pKbd = (VBoxKbdState_t *)pData;
-
-    AssertReturnVoid(pKbd);
-    AssertReturnVoid(pKbd->pStorageArray);
+    VBoxKbdState_t  *pKbd      = (VBoxKbdState_t  *)pData;                  AssertReturnVoid(pKbd);
+    VBoxHidsState_t *pHidState = (VBoxHidsState_t *)pKbd->pParentContainer; AssertReturnVoid(pHidState);
+
+    AssertReturnVoid(pHidState->pDeviceCollection);
 
     Log2(("Forget KBD %d\n", (int)pKbd->idxPosition));
-    CFArrayRemoveValueAtIndex(pKbd->pStorageArray, pKbd->idxPosition);
+    CFArrayRemoveValueAtIndex(pHidState->pDeviceCollection, pKbd->idxPosition);
     free(pKbd);
 }
@@ -1535 +1551 @@
             {
                 pKbd->pDevice = pDevice;
-                pKbd->pStorageArray = pHidState->pDeviceCollection;
+                pKbd->pParentContainer = (void *)pHidState;
                 pKbd->idxPosition = CFArrayGetCount(pHidState->pDeviceCollection);