Changeset 37366 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 7, 2011 8:37:25 PM (14 years ago)

Author:

vboxsync

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

72136

Message:

FE/Qt: remove the grab-the-keyboard-50-times hack

File:

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

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

@@ -191 +191 @@
             case UIVisualStateType_Seamless:
             {
-                /* 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; }
+                /* 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;
                 break;
             }
@@ -212 +210 @@
 
         /* Notify all the listeners: */
-        emit keyboardStateChanged(keyboardState());
+        if (m_fIsKeyboardCaptured)
+            emit keyboardStateChanged(keyboardState());
     }
 }