Changeset 50191 in vbox for trunk/src

Timestamp:

Jan 23, 2014 5:05:30 PM (11 years ago)

Author:

vboxsync

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

91760

Message:

HID LEDs sync for Windows host (checked on Win7 only atm).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/platform/win/WinKeyboard.cpp (added)
• src/platform/win/WinKeyboard.h (added)
• src/runtime/UIKeyboardHandler.cpp (modified) (4 diffs)
• src/runtime/UIKeyboardHandler.h (modified) (2 diffs)
• src/runtime/UIMachineLogic.cpp (modified) (5 diffs)
• src/runtime/UIMachineLogic.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -731 +731 @@
         src/platform/win/VirtualBox.rc \
         src/platform/win/UIDesktopServices_win.cpp \
-        src/platform/win/VBoxUtils-win.cpp
+        src/platform/win/VBoxUtils-win.cpp \
+        src/platform/win/WinKeyboard.cpp
 
 VirtualBox_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS

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

@@ -356 +356 @@
 
 #if defined(Q_WS_WIN)
+/** Tell keyboard event handler to skip host keyboard events. Used for HID LEDs sync
+ * when on Windows host a keyboard event is generated in order to change corresponding LED. */
+void UIKeyboardHandler::winSkipKeyboardEvents(bool fSkip)
+{
+    m_fSkipKeyboardEvents = fSkip;
+}
 
 bool UIKeyboardHandler::winEventFilter(MSG *pMsg, ulong uScreenId)
@@ -363 +369 @@
      * Returning 'false' means passing event to Qt. */
     bool fResult = false; /* Pass to Qt by default: */
+
+    /* Skip this event if m_fSkipKeyboardEvents is set by winSkipKeyboardEvents(). */
+    if (m_fSkipKeyboardEvents)
+        return false;
+
     switch (pMsg->message)
     {
@@ -681 +692 @@
     , m_bIsHostkeyInCapture(false)
     , m_iKeyboardHookViewIndex(-1)
+    , m_fSkipKeyboardEvents(false)
 #elif defined(Q_WS_MAC)
     , m_darwinKeyModifiers(0)
@@ -1204 +1216 @@
          * (NumLock, CapsLock, ScrollLock) as the X server.
          * If not, send KeyPress events to synchronize the state: */
-#if !defined(Q_WS_MAC)
+#if !defined(Q_WS_MAC) && !defined(Q_WS_WIN)
         if (fFlags & KeyPressed)
             fixModifierState(pCodes, puCodesCount);

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

@@ -84 +84 @@
 #if defined(Q_WS_WIN)
     bool winEventFilter(MSG *pMsg, ulong uScreenId);
+    void winSkipKeyboardEvents(bool fSkip);
 #elif defined(Q_WS_X11)
     bool x11EventFilter(XEvent *pEvent, ulong uScreenId);
@@ -183 +184 @@
     HHOOK m_keyboardHook;
     int m_iKeyboardHookViewIndex;
+    /* A flag that used to tell kbd event filter to ignore keyboard events */
+    bool m_fSkipKeyboardEvents;
 #elif defined(Q_WS_MAC)
     /* The current modifier key mask. Used to figure out which modifier

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

@@ -87 +87 @@
 # include "DarwinKeyboard.h"
 #endif
+#ifdef Q_WS_WIN
+# include "WinKeyboard.h"
+#endif
 
 /* External includes: */
@@ -516 +519 @@
         return;
 
-#ifdef Q_WS_MAC
-    LogRelFlow(("UIMachineLogic::sltKeyboardLedsChanged: Updating host LED lock states.\n"));
+#if defined(Q_WS_MAC)
     DarwinHidDevicesBroadcastLeds(m_pHostLedsState, uisession()->isNumLock(), uisession()->isCapsLock(), uisession()->isScrollLock());
+#elif defined(Q_WS_WIN)
+    if (!winHidLedsInSync(uisession()->isNumLock(), uisession()->isCapsLock(), uisession()->isScrollLock()))
+    {
+        keyboardHandler()->winSkipKeyboardEvents(true);
+        WinHidDevicesBroadcastLeds(uisession()->isNumLock(), uisession()->isCapsLock(), uisession()->isScrollLock());
+        keyboardHandler()->winSkipKeyboardEvents(false);
+    }
+    else
+        LogRel2(("HID LEDs Sync: already in sync\n"));
+#else
+    LogRelFlow(("UIMachineLogic::sltKeyboardLedsChanged: Updating host LED lock states does not supported on this platform.\n"));
 #endif
 }
@@ -604 +617 @@
     , m_pDockPreviewSelectMonitorGroup(0)
     , m_DockIconPreviewMonitor(0)
+#endif /* Q_WS_MAC */
     , m_pHostLedsState(NULL)
-#endif /* Q_WS_MAC */
 {
 }
@@ -2397 +2410 @@
         return;
 
-#ifdef Q_WS_MAC
-    LogRelFlow(("UIMachineLogic::sltSwitchKeyboardLedsToGuestLeds: keep host LED lock states and broadcast guest's ones.\n"));
+#if defined(Q_WS_MAC)
     if (m_pHostLedsState == NULL)
         m_pHostLedsState = DarwinHidDevicesKeepLedsState();
     DarwinHidDevicesBroadcastLeds(m_pHostLedsState, uisession()->isNumLock(), uisession()->isCapsLock(), uisession()->isScrollLock());
-#endif /* Q_WS_MAC */
+#elif defined(Q_WS_WIN)
+    if (m_pHostLedsState == NULL)
+        m_pHostLedsState = WinHidDevicesKeepLedsState();
+    keyboardHandler()->winSkipKeyboardEvents(true);
+    WinHidDevicesBroadcastLeds(uisession()->isNumLock(), uisession()->isCapsLock(), uisession()->isScrollLock());
+    keyboardHandler()->winSkipKeyboardEvents(false);
+#else
+    LogRelFlow(("UIMachineLogic::sltSwitchKeyboardLedsToGuestLeds: keep host LED lock states and broadcast guest's ones does not supported on this platform.\n"));
+#endif
 }
 
@@ -2417 +2437 @@
 
     /* Here we have to restore host LED lock states. */
-#ifdef Q_WS_MAC
-    LogRelFlow(("UIMachineLogic::sltSwitchKeyboardLedsToPreviousLeds: restore host LED lock states.\n"));
-
     if (m_pHostLedsState)
     {
-        DarwinHidDevicesApplyAndReleaseLedsState(m_pHostLedsState);
+#if defined(Q_WS_MAC)
+        DarwinHidDevicesApplyAndReleaseLedsState(m_pHostLedsState);
+#elif defined(Q_WS_WIN)
+        keyboardHandler()->winSkipKeyboardEvents(true);
+        WinHidDevicesApplyAndReleaseLedsState(m_pHostLedsState);
+        keyboardHandler()->winSkipKeyboardEvents(false);
+#else
+        LogRelFlow(("UIMachineLogic::sltSwitchKeyboardLedsToPreviousLeds: restore host LED lock states does not supported on this platform.\n"));
+#endif
         m_pHostLedsState = NULL;
-    }
-#endif /* Q_WS_MAC */
+        }
 }
 

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

@@ -275 +275 @@
     QActionGroup *m_pDockPreviewSelectMonitorGroup;
     int m_DockIconPreviewMonitor;
+#endif /* Q_WS_MAC */
+
     void *m_pHostLedsState;
-#endif /* Q_WS_MAC */
 
     /* Friend classes: */