Changeset 37716 in vbox for trunk

Timestamp:

Jun 30, 2011 4:34:13 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: reverted r72134 and follow-ups for now

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIKeyboardHandler.cpp (modified) (9 diffs)
• runtime/UIKeyboardHandler.h (modified) (1 diff)
• settings/global/UIGlobalSettingsInput.ui (modified) (1 diff)

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

@@ -191 +191 @@
             case UIVisualStateType_Seamless:
             {
-                /* Keyboard grabbing can fail temporarily because some keyboard shortcut is still grabbed by window manager. */
-                if (XGrabKeyboard(QX11Info::display(), m_windows[m_iKeyboardCaptureViewIndex]->machineWindow()->winId(), False, GrabModeAsync, GrabModeAsync, CurrentTime))
-                    m_fIsKeyboardCaptured = false;
+                /* Keyboard grabbing can fail because of some keyboard shortcut is still grabbed by window manager.
+                 * We can't be sure this shortcut will be released at all, so we will retry to grab keyboard for 50 times,
+                 * and after we will just ignore that issue: */
+                int cTriesLeft = 50;
+                while (cTriesLeft && XGrabKeyboard(QX11Info::display(), m_windows[m_iKeyboardCaptureViewIndex]->machineWindow()->winId(), False, GrabModeAsync, GrabModeAsync, CurrentTime)) { --cTriesLeft; }
                 break;
             }
@@ -210 +212 @@
 
         /* Notify all the listeners: */
-        if (m_fIsKeyboardCaptured)
-            emit keyboardStateChanged(keyboardState());
+        emit keyboardStateChanged(keyboardState());
     }
 }
@@ -482 +483 @@
          * and this hack is probably not necessary anymore. So disable it for Qt >= 4.5.0. */
         case XFocusOut:
+        case XFocusIn:
         {
             if (isSessionRunning())
@@ -487 +489 @@
                 if (VBoxGlobal::qtRTVersion() < ((4 << 16) | (5 << 8) | 0))
                 {
-                    /* Release keyboard: */
-                    releaseKeyboard();
-                    /* And all pressed keys including host-one: */
-                    releaseAllPressedKeys(true);
+                    if (pEvent->type == XFocusIn)
+                    {
+                        /* Capture keyboard by chosen view number: */
+                        captureKeyboard(uScreenId);
+                        /* Reset the single-time disable capture flag: */
+                        if (isAutoCaptureDisabled())
+                            setAutoCaptureDisabled(false);
+                    }
+                    else
+                    {
+                        /* Release keyboard: */
+                        releaseKeyboard();
+                        /* And all pressed keys including host-one: */
+                        releaseAllPressedKeys(true);
+                    }
                 }
             }
@@ -587 +600 @@
             /* And all pressed keys except the host-one : */
             releaseAllPressedKeys(false /* release host-key? */);
+            break;
+        }
+        case KMachineState_Running:
+        {
+            /* Capture the keyboard by the first focused view: */
+            QList<ulong> theListOfViewIds = m_views.keys();
+            for (int i = 0; i < theListOfViewIds.size(); ++i)
+            {
+                if (viewHasFocus(theListOfViewIds[i]))
+                {
+                    /* Capture keyboard: */
+#ifdef Q_WS_WIN
+                    if (!isAutoCaptureDisabled() && autoCaptureSetGlobally() &&
+                        GetAncestor(m_views[theListOfViewIds[i]]->winId(), GA_ROOT) == GetForegroundWindow())
+#else /* Q_WS_WIN */
+                    if (!isAutoCaptureDisabled() && autoCaptureSetGlobally())
+#endif /* !Q_WS_WIN */
+                        captureKeyboard(theListOfViewIds[i]);
+                    /* Reset the single-time disable capture flag: */
+                    if (isAutoCaptureDisabled())
+                        setAutoCaptureDisabled(false);
+                    break;
+                }
+            }
             break;
         }
@@ -789 +826 @@
         switch (pEvent->type())
         {
+            case QEvent::FocusIn:
+                if (isSessionRunning())
+                {
+                    /* Capture keyboard: */
+#ifdef Q_WS_WIN
+                    if (!isAutoCaptureDisabled() && autoCaptureSetGlobally() &&
+                        GetAncestor(pWatchedView->winId(), GA_ROOT) == GetForegroundWindow())
+#else /* Q_WS_WIN */
+                    if (!isAutoCaptureDisabled() && autoCaptureSetGlobally())
+#endif /* !Q_WS_WIN */
+                        captureKeyboard(uScreenId);
+                    /* Reset the single-time disable capture flag: */
+                    if (isAutoCaptureDisabled())
+                        setAutoCaptureDisabled(false);
+                }
+                break;
             case QEvent::FocusOut:
                 /* Release keyboard: */
@@ -1088 +1141 @@
 /**
  * Handle a non-special (C-A-D, pause, print) key press or release
- * @returns true if handling should stop here (spurious event), false otherwise
+ * @returns true if handling should stop here, false otherwise
  */
 bool UIKeyboardHandler::keyEventHandleNormal(int iKey, uint8_t uScan, int fFlags, LONG *pCodes, uint *puCodesCount)
@@ -1137 +1190 @@
         return true;
     return false;
-}
-
-/** Capture the keyboard if a non-modifier key was pressed. */
-void UIKeyboardHandler::keyEventHandleCapturing(uint8_t uScan, int fFlags,
-                                                ulong uScreenId)
-{
-    if (   (fFlags & KeyPressed)
-        && uScan != 0x1d /* ctrl */ && uScan != 0x2a /* left shift */
-        && uScan != 0x36 /* right shift */ && uScan != 0x38 /* alt */
-        && uScan != 0x5b /* left win */ && uScan != 0x5c /* right win */)
-    {
-        /* Capture keyboard by chosen view number: */
-        if (!isAutoCaptureDisabled() && autoCaptureSetGlobally())
-            captureKeyboard(uScreenId);
-        /* Reset the single-time disable capture flag: */
-        if (isAutoCaptureDisabled())
-            setAutoCaptureDisabled(false);
-    }
 }
 
@@ -1359 +1394 @@
     }
 
-    /* This must come before host key handling */
-    keyEventHandleCapturing(uScan, fFlags, uScreenId);
-
     /* Process the host-combo funtionality: */
     if (fFlags & KeyPressed)

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

@@ -126 +126 @@
     bool keyEventCADHandled(uint8_t uScan);
     bool keyEventHandleNormal(int iKey, uint8_t uScan, int fFlags, LONG *pCodes, uint *puCodesCount);
-    void keyEventHandleCapturing(uint8_t uScan, int fFlags, ulong uScreenId);
     bool keyEventHostComboHandled(int iKey, wchar_t *pUniKey, bool isHostComboStateChanged, bool *pfResult);
     void keyEventHandleHostComboRelease(ulong uScreenId);

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.ui

@@ -82 +82 @@
     <widget class="QCheckBox" name="m_pEnableAutoGrabCheckbox">
      <property name="whatsThis">
-      <string>When checked, the keyboard will be captured automatically when you start typing into the virtual machine, preventing the host system from reacting to key combinations such as Alt-Tab.  When the keyboard is not captured the virtual machine may not see certain key combinations.</string>
+      <string>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</string>
      </property>
      <property name="text">