Changeset 37365 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 7, 2011 8:31:18 PM (14 years ago)

Author:

vboxsync

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

72135

Message:

FE/Qt: only grab the keyboard focus when a non-modifier key (or the host combination) is pressed, remove dead code

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (modified) (4 diffs)

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

@@ -483 +483 @@
          * and this hack is probably not necessary anymore. So disable it for Qt >= 4.5.0. */
         case XFocusOut:
-        case XFocusIn:
         {
             if (isSessionRunning())
@@ -489 +488 @@
                 if (VBoxGlobal::qtRTVersion() < ((4 << 16) | (5 << 8) | 0))
                 {
-                    if (pEvent->type == XFocusIn)
-                    {
-#if 0
-                        /* Capture keyboard by chosen view number: */
-                        captureKeyboard(uScreenId);
-                        /* Reset the single-time disable capture flag: */
-                        if (isAutoCaptureDisabled())
-                            setAutoCaptureDisabled(false);
-#endif
-                    }
-                    else
-                    {
-                        /* Release keyboard: */
-                        releaseKeyboard();
-                        /* And all pressed keys including host-one: */
-                        releaseAllPressedKeys(true);
-                    }
+                    /* Release keyboard: */
+                    releaseKeyboard();
+                    /* And all pressed keys including host-one: */
+                    releaseAllPressedKeys(true);
                 }
             }
@@ -604 +590 @@
             break;
         }
-#if 0
-        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;
-        }
-#endif
         default:
             break;
@@ -830 +790 @@
         switch (pEvent->type())
         {
-#if 0
-            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;
-#endif
             case QEvent::FocusOut:
                 /* Release keyboard: */