Changeset 59657 in vbox

Timestamp:

Feb 12, 2016 2:08:05 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 88): Implementing keyboard handling for Qt5: Watch for keyboard hook view index on all platforms (previously for Mac and Win only).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIKeyboardHandler.cpp (modified) (10 diffs)
• UIKeyboardHandler.h (modified) (1 diff)

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

@@ -1410 +1410 @@
     , m_fPassCADtoGuest(false)
     , m_fDebuggerActive(false)
+    , m_iKeyboardHookViewIndex(-1)
 #if defined(Q_WS_MAC)
-    , m_iKeyboardHookViewIndex(-1)
     , m_uDarwinKeyModifiers(0)
 #elif defined(Q_WS_WIN)
-    , m_iKeyboardHookViewIndex(-1)
     , m_fIsHostkeyInCapture(false)
     , m_fSkipKeyboardEvents(false)
@@ -1481 +1480 @@
         UICocoaApplication::instance()->unregisterForNativeEvents(RT_BIT_32(10) | RT_BIT_32(11) | RT_BIT_32(12) /* NSKeyDown  | NSKeyUp | | NSFlagsChanged */,
                                                                   UIKeyboardHandler::macKeyboardProc, this);
-        /* Update the id: */
-        m_iKeyboardHookViewIndex = -1;
     }
 
@@ -1491 +1488 @@
     m_pAltGrMonitor = 0;
 
-    /* Cleanup keyboard-hook: */
+    /* If keyboard-hook is installed: */
     if (m_keyboardHook)
     {
         /* Uninstall existing keyboard-hook: */
-        ::UnhookWindowsHookEx(m_keyboardHook);
-        m_keyboardHook = NULL;
-        /* Update the id: */
-        m_iKeyboardHookViewIndex = -1;
+        UnhookWindowsHookEx(m_keyboardHook);
+        m_keyboardHook = 0;
     }
 
 #endif /* Q_WS_WIN */
+
+    /* Update keyboard hook view index: */
+    m_iKeyboardHookViewIndex = -1;
 }
 
@@ -1565 +1563 @@
                         ::DarwinGrabKeyboard(false);
                     }
-                    /* Update the id: */
-                    m_iKeyboardHookViewIndex = uScreenId;
                 }
 
@@ -1585 +1581 @@
                     m_keyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, UIKeyboardHandler::winKeyboardProc, GetModuleHandle(NULL), 0);
                     AssertMsg(m_keyboardHook, ("SetWindowsHookEx(): err=%d", GetLastError()));
-                    /* Update the id: */
-                    m_iKeyboardHookViewIndex = uScreenId;
                 }
 
 #endif /* Q_WS_WIN */
+
+                /* Update keyboard hook view index: */
+                m_iKeyboardHookViewIndex = uScreenId;
 
                 if (isSessionRunning())
@@ -1605 +1602 @@
                         setAutoCaptureDisabled(false);
                 }
+
                 break;
             }
@@ -1618 +1616 @@
                     UICocoaApplication::instance()->unregisterForNativeEvents(RT_BIT_32(10) | RT_BIT_32(11) | RT_BIT_32(12) /* NSKeyDown  | NSKeyUp | | NSFlagsChanged */,
                                                                               UIKeyboardHandler::macKeyboardProc, this);
-                    /* Update the id: */
-                    m_iKeyboardHookViewIndex = -1;
                 }
 
@@ -1630 +1626 @@
                     UnhookWindowsHookEx(m_keyboardHook);
                     m_keyboardHook = 0;
-                    /* Update the id: */
-                    m_iKeyboardHookViewIndex = -1;
                 }
 
 #endif /* Q_WS_WIN */
+
+                /* Update keyboard hook view index: */
+                m_iKeyboardHookViewIndex = -1;
 
                 /* Release keyboard: */
@@ -1641 +1638 @@
                 /* And all pressed keys: */
                 releaseAllPressedKeys(true);
+
                 break;
             }
@@ -1680 +1678 @@
                         popupCenter().remindAboutPausedVMInput(machineLogic()->activeMachineWindow());
                 }
+
                 break;
             }

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

@@ -212 +212 @@
     bool m_fDebuggerActive : 1;
 
-#if defined(Q_WS_MAC)
     /** Holds the keyboard hook view index. */
     int m_iKeyboardHookViewIndex;
-    /** Holds the current modifiers key mask. */
+
+#if defined(Q_WS_MAC)
+    /** Mac: Holds the current modifiers key mask. */
     UInt32 m_uDarwinKeyModifiers;
 #elif defined(Q_WS_WIN)
-    /** Holds the keyboard hook view index. */
-    int m_iKeyboardHookViewIndex;
-    /* Currently this is used in winKeyboardEvent() only: */
+    /** Win: Currently this is used in winKeyboardEvent() only. */
     bool m_fIsHostkeyInCapture;
-    /** Holds whether the keyboard event filter should ignore keyboard events. */
+    /** Win: Holds whether the keyboard event filter should ignore keyboard events. */
     bool m_fSkipKeyboardEvents;
-    /** Holds the keyboard hook instance. */
+    /** Win: Holds the keyboard hook instance. */
     HHOOK m_keyboardHook;
-    /** Holds the object monitoring key event stream for problematic AltGr events. */
+    /** Win: Holds the object monitoring key event stream for problematic AltGr events. */
     WinAltGrMonitor *m_pAltGrMonitor;
-    /** Holds the keyboard handler reference to be accessible from the keyboard hook. */
+    /** Win: Holds the keyboard handler reference to be accessible from the keyboard hook. */
     static UIKeyboardHandler *m_spKeyboardHandler;
 #endif /* Q_WS_WIN */