Changeset 98983 in vbox for trunk

Timestamp:

Mar 15, 2023 12:06:02 PM (23 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking UIKeyboardHandler a bit; First of all, we should notify UIMachine with actual keyboard-state when machine-state is changed to/from Null state; Besides that, a bit of cleanup.

Location:

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

Files:

• UIKeyboardHandler.cpp (modified) (27 diffs)
• UIKeyboardHandler.h (modified) (2 diffs)
• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)

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

@@ -204 +204 @@
 {
     /* Do NOT capture the keyboard if it is already captured: */
-    if (m_fIsKeyboardCaptured)
+    if (m_fKeyboardCaptured)
     {
         /* Make sure the right screen had captured the keyboard: */
@@ -236 +236 @@
 {
     /* Do NOT capture the keyboard if it is already captured: */
-    if (m_fIsKeyboardCaptured)
+    if (m_fKeyboardCaptured)
         return true;
 
@@ -326 +326 @@
 
         /* Store new keyboard-captured state value: */
-        m_fIsKeyboardCaptured = true;
+        m_fKeyboardCaptured = true;
 
         /* Notify all the listeners: */
@@ -340 +340 @@
 {
     /* Do NOT release the keyboard if it is already released: */
-    if (!m_fIsKeyboardCaptured)
+    if (!m_fKeyboardCaptured)
     {
         /* If a delayed capture is scheduled then cancel it: */
@@ -396 +396 @@
 
         /* Store new keyboard-captured state value: */
-        m_fIsKeyboardCaptured = false;
+        m_fKeyboardCaptured = false;
 
         /* Notify all the listeners: */
@@ -454 +454 @@
     if (aReleaseHostKey)
     {
-        m_bIsHostComboPressed = false;
+        m_fHostComboPressed = false;
         m_pressedHostComboKeys.clear();
     }
@@ -476 +476 @@
 int UIKeyboardHandler::state() const
 {
-    return (m_fIsKeyboardCaptured ? UIKeyboardStateType_KeyboardCaptured : 0) |
-           (m_bIsHostComboPressed ? UIKeyboardStateType_HostKeyPressed : 0) |
+    return (m_fKeyboardCaptured ? UIKeyboardStateType_KeyboardCaptured : 0) |
+           (m_fHostComboPressed ? UIKeyboardStateType_HostKeyPressed : 0) |
            (m_fHostKeyComboPressInserted ? UIKeyboardStateType_HostKeyPressedInsertion : 0);
 }
@@ -793 +793 @@
              * shortcuts for example). So send it directly to the window with the
              * special flag in the reserved area of lParam (to avoid recursion). */
-            if (!fResult && m_fIsKeyboardCaptured)
+            if (!fResult && m_fKeyboardCaptured)
             {
                 ::SendMessage(pMsg->hwnd, pMsg->message,
@@ -906 +906 @@
 void UIKeyboardHandler::sltMachineStateChanged()
 {
-    /* Get machine state: */
-    KMachineState state = uimachine()->machineState();
+    /* Get previous and cached machine states: */
+    const KMachineState enmPreviousState = uimachine()->machineStatePrevious();
+    const KMachineState enmState = uimachine()->machineState();
+
+    /* Notify all the listeners that machine state was [de]initialized: */
+    if (   enmPreviousState == KMachineState_Null
+        || enmState == KMachineState_Null)
+        emit sigStateChange(state());
+
     /* Handle particular machine states: */
-    switch (state)
+    switch (enmState)
     {
         case KMachineState_Paused:
@@ -952 +959 @@
      * if we are not in paused VM state already: */
     if (machineLogic()->activeMachineWindow() &&
-        state != KMachineState_Paused &&
-        state != KMachineState_TeleportingPausedVM)
+        enmState != KMachineState_Paused &&
+        enmState != KMachineState_TeleportingPausedVM)
         UINotificationMessage::forgetAboutPausedVMInput();
 }
@@ -972 +979 @@
     , m_pMachineLogic(pMachineLogic)
     , m_iKeyboardCaptureViewIndex(-1)
-    , m_fIsKeyboardCaptured(false)
-    , m_bIsHostComboPressed(false)
+    , m_fKeyboardCaptured(false)
+    , m_fHostComboPressed(false)
     , m_bIsHostComboAlone(false)
     , m_bIsHostComboProcessed(false)
@@ -1211 +1218 @@
                 QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
 
-                if (m_bIsHostComboPressed && pEvent->type() == QEvent::KeyPress)
+                if (m_fHostComboPressed && pEvent->type() == QEvent::KeyPress)
                 {
                     /* Passing F1-F12 keys to the guest: */
@@ -1237 +1244 @@
                     actionPool()->processHotKey(QKeySequence(pKeyEvent->key()));
                 }
-                else if (!m_bIsHostComboPressed && pEvent->type() == QEvent::KeyRelease)
+                else if (!m_fHostComboPressed && pEvent->type() == QEvent::KeyRelease)
                 {
                     /* Show a possible warning on key release which seems to be more expected by the end user: */
@@ -1354 +1361 @@
      * captured, but is being released under the capture. Detect this situation
      * and do not pass on the key press to the virtual machine. */
-/** @todo r=bird: Why do this complicated test before the simple m_fIsKeyboardCaptured one? */
+/** @todo r=bird: Why do this complicated test before the simple m_fKeyboardCaptured one? */
     uint8_t what_pressed =      (event.flags & 0x01)
                              && (event.vkCode != VK_RSHIFT)
@@ -1366 +1373 @@
         return false;
 
-    if (!m_fIsKeyboardCaptured)
+    if (!m_fKeyboardCaptured)
         return false;
 
@@ -1413 +1420 @@
          * to the host when the user forgets the Host Key. Note that it's always possible
          * to send C-A-D to the guest using the Host+Del combination: */
-        if (isSessionRunning() && m_fIsKeyboardCaptured)
+        if (isSessionRunning() && m_fKeyboardCaptured)
         {
             releaseKeyboard();
@@ -1463 +1470 @@
 
         /* Update keyboard-captured flag: */
-        if (m_fIsKeyboardCaptured)
+        if (m_fKeyboardCaptured)
             m_pressedKeys[uScan] |= IsKbdCaptured;
         else
@@ -1490 +1497 @@
     if (isHostComboStateChanged)
     {
-        if (!m_bIsHostComboPressed)
-        {
-            m_bIsHostComboPressed = true;
+        if (!m_fHostComboPressed)
+        {
+            m_fHostComboPressed = true;
             m_bIsHostComboAlone = true;
             m_bIsHostComboProcessed = false;
@@ -1501 +1508 @@
     else
     {
-        if (m_bIsHostComboPressed)
+        if (m_fHostComboPressed)
         {
             if (m_bIsHostComboAlone)
@@ -1523 +1530 @@
 void UIKeyboardHandler::keyEventHandleHostComboRelease(ulong uScreenId)
 {
-    if (m_bIsHostComboPressed)
-    {
-        m_bIsHostComboPressed = false;
+    if (m_fHostComboPressed)
+    {
+        m_fHostComboPressed = false;
         /* Capturing/releasing keyboard/mouse if necessary: */
         if (m_bIsHostComboAlone && !m_bIsHostComboProcessed)
@@ -1532 +1539 @@
             {
                 bool ok = true;
-                if (!m_fIsKeyboardCaptured)
+                if (!m_fKeyboardCaptured)
                 {
                     /* Temporarily disable auto-capture that will take place after
@@ -1552 +1559 @@
                                          || !uimachine()->isMouseIntegrated();
 
-                    if (m_fIsKeyboardCaptured)
+                    if (m_fKeyboardCaptured)
                     {
                         releaseKeyboard();
@@ -1596 +1603 @@
             if (!m_pressedHostComboKeys.contains(iKey))
                 m_pressedHostComboKeys.insert(iKey, uScan);
-            else if (m_bIsHostComboPressed)
+            else if (m_fHostComboPressed)
                 return true;
         }
@@ -1620 +1627 @@
 
     /* Check if currently pressed/released key had changed host-combo state: */
-    const bool isHostComboStateChanged = (!m_bIsHostComboPressed &&  fIsFullHostComboPresent) ||
-                                         ( m_bIsHostComboPressed && !fIsFullHostComboPresent);
+    const bool isHostComboStateChanged = (!m_fHostComboPressed &&  fIsFullHostComboPresent) ||
+                                         ( m_fHostComboPressed && !fIsFullHostComboPresent);
 
 #ifdef VBOX_WS_WIN
-    if (m_bIsHostComboPressed || isHostComboStateChanged)
+    if (m_fHostComboPressed || isHostComboStateChanged)
     {
         /* Currently this is used in winKeyboardEvent() only: */
-        m_fIsHostkeyInCapture = m_fIsKeyboardCaptured;
+        m_fIsHostkeyInCapture = m_fKeyboardCaptured;
     }
 #endif /* VBOX_WS_WIN */
@@ -1644 +1651 @@
     uint uCodesCount = 0;
     uint8_t uWhatPressed = fFlags & KeyExtended ? IsExtKeyPressed : IsKeyPressed;
-    if ((!m_bIsHostComboPressed && !isHostComboStateChanged) ||
-        ( m_bIsHostComboPressed &&  isHostComboStateChanged) ||
+    if ((!m_fHostComboPressed && !isHostComboStateChanged) ||
+        ( m_fHostComboPressed &&  isHostComboStateChanged) ||
         (!(fFlags & KeyPressed) && (m_pressedKeys[uScan] & uWhatPressed)))
     {
@@ -1698 +1705 @@
         else
         {
-            if (m_bIsHostComboPressed)
+            if (m_fHostComboPressed)
                 m_bIsHostComboAlone = true;
         }
@@ -1720 +1727 @@
 
         /* If full host-key sequence was just finalized: */
-        if (isHostComboStateChanged && m_bIsHostComboPressed)
+        if (isHostComboStateChanged && m_fHostComboPressed)
         {
             /* We have to make guest to release pressed keys from the host-combination: */

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

@@ -96 +96 @@
 
     /* Some getters required by side-code: */
-    bool isHostKeyPressed() const { return m_bIsHostComboPressed; }
+    bool isHostKeyPressed() const { return m_fHostComboPressed; }
 #ifdef VBOX_WS_MAC
     bool isHostKeyAlone() const { return m_bIsHostComboAlone; }
@@ -201 +201 @@
     QMap<int, uint8_t> m_pressedHostComboKeys;
 
-    bool m_fIsKeyboardCaptured : 1;
-    bool m_bIsHostComboPressed : 1;
+    bool m_fKeyboardCaptured : 1;
+    bool m_fHostComboPressed : 1;
     bool m_bIsHostComboAlone : 1;
     bool m_bIsHostComboProcessed : 1;

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

@@ -324 +324 @@
     actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)->setChecked(fServerEnabled);
     actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)->blockSignals(false);
+}
+
+KMachineState UIMachine::machineStatePrevious() const
+{
+    return uisession()->machineStatePrevious();
 }
 

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

@@ -232 +232 @@
     /** @name Machine-state stuff.
      ** @{ */
+        /** Returns previous machine state. */
+        KMachineState machineStatePrevious() const;
         /** Returns cached machine state. */
         KMachineState machineState() const;