Changeset 48647 in vbox

Timestamp:

Sep 24, 2013 8:30:29 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89245

Message:

Mac OS X host: keyboard LEDs sync: GUI part; code is still disabled.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (1 diff)
• HostDrivers/Support/Makefile.kmk (modified) (1 diff)
• HostDrivers/Support/darwin/Info.plist (modified) (1 diff)
• HostDrivers/Support/darwin/SUPKeyboardService-darwin.cpp (added)

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

@@ -44 +44 @@
 #endif
 #include <IOKit/hid/IOHIDLib.h>
+#include <IOKit/hidsystem/IOHIDLib.h>
 #include <ApplicationServices/ApplicationServices.h>
 #include <Carbon/Carbon.h>
@@ -1455 +1456 @@
 }
 
+/** Call VBoxKeyboardService to sync keyboard controls and LEDs. */
+static void darwinVBoxKeyboardSync(void)
+{
+    CFDictionaryRef matchingDictionaryRef = IOServiceMatching("org_virtualbox_VBoxKeyboard");
+    if (matchingDictionaryRef)
+    {
+        io_service_t service;
+        service = IOServiceGetMatchingService(kIOMasterPortDefault, matchingDictionaryRef);
+        if (service)
+        {
+            kern_return_t rc;
+            io_connect_t  connection;
+            rc = IOServiceOpen(service, mach_task_self(), 0, &connection);
+            if (rc == 0)
+            {
+                Log2(("VBoxKeyboard IOService opened!\n"));
+
+                rc = IOConnectCallScalarMethod(connection, 0, NULL, 0, NULL, 0);
+                Log2(("VBoxKeyboard IOService IOCTL: 0x%X!\n", rc));
+
+                rc = IOServiceClose(connection);
+                if (rc == 0)
+                {
+                    Log2(("VBoxKeyboard IOService closed!\n"));
+                }
+                else
+                {
+                    Log2(("Unable to close VBoxKeyboard IOService: 0x%X\n", rc));
+                }
+            }
+            else
+            {
+                Log2(("Unable to open VBoxKeyboard IOService: 0x%X\n", rc));
+            }
+
+            IOObjectRelease(service);
+        }
+        else
+        {
+            Log2(("Unable to find VBoxKeyboard IOService\n"));
+        }
+
+    }
+    else
+    {
+        Log2(("Unable to construct VBoxKeyboard IOService matching dictionary\n"));
+    }
+}
+
 /**
  * Apply LEDs state stored in *pState and release resources aquired by *pState.
@@ -1488 +1538 @@
                     rc2 = kIOReturnError;
                 }
+
             }
+
+            darwinVBoxKeyboardSync();
         }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -1017 +1017 @@
         ::CGSetLocalEventsSuppressionInterval(0.0);
         ::darwinSetMouseCoalescingEnabled(false);
+
+        /* Bring the caps lock state up to date, otherwise e.g. a later Shift
+         * key press will accidentally inject a CapsLock key press and release,
+         * see UIKeyboardHandler::darwinKeyboardEvent for the code handling
+         * modifier key state changes */
+        m_darwinKeyModifiers ^= (m_darwinKeyModifiers ^ ::GetCurrentEventKeyModifiers()) & alphaLock;
 
         /* Register the event callback/hook and grab the keyboard. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1034 +1034 @@
                      * set current lock states to guest values we have,
                      * As we have no ipc between threads of different VMs
-                     * we are using 100ms timer as lazy sync timout: */
-                    QTimer::singleShot(100, this, SLOT(sltSwitchKeyboardLedsToGuestLeds()));
+                     * we are using 300ms timer as lazy sync timout: */
+                    QTimer::singleShot(300, this, SLOT(sltSwitchKeyboardLedsToGuestLeds()));
                     break;
                 }

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -304 +304 @@
 
  VBoxDrv_SOURCES.darwin   = \
-        darwin/SUPDrv-darwin.cpp
+        darwin/SUPDrv-darwin.cpp \
+        darwin/SUPKeyboardService-darwin.cpp
  VBoxDrv_SOURCES.linux    = \
         linux/SUPDrv-linux.c

trunk/src/VBox/HostDrivers/Support/darwin/Info.plist

@@ -25 +25 @@
             <key>IOUserClientClass</key>        <string>org_virtualbox_SupDrvClient</string>
         </dict>
+        <key>VBoxDrvKeyboard</key>
+        <dict>
+            <key>CFBundleIdentifier</key>       <string>org.virtualbox.kext.VBoxDrv</string>
+            <key>IOClass</key>                  <string>org_virtualbox_VBoxKeyboard</string>
+            <key>IOMatchCategory</key>          <string>org_virtualbox_VBoxKeyboard</string>
+            <key>IOProviderClass</key>          <string>IOResources</string>
+            <key>IOResourceMatch</key>          <string>IOKit</string>
+            <key>IOUserClientClass</key>        <string>org_virtualbox_VBoxKeyboardClient</string>
+        </dict>
     </dict>
     <key>OSBundleLibraries</key>