Changeset 63599 in vbox

Timestamp:

Aug 19, 2016 1:19:42 PM (9 years ago)

Author:

vboxsync

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

110298

Message:

FE/Qt: bugref:8151: X11: Runtime UI: Improve user experience with the delayed capturing mechanism by involving 300ms timer instead of trigger which was not quite obvious.

Location:

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

Files:

• UIKeyboardHandler.cpp (modified) (13 diffs)
• UIKeyboardHandler.h (modified) (2 diffs)

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

@@ -39 +39 @@
 # ifdef VBOX_WS_X11
 #  include <QX11Info>
-# endif /* VBOX_WS_X11 */
+#  if QT_VERSION >= 0x050000
+#   include <QTimer>
+#  endif
+# endif
 
 /* GUI includes: */
@@ -255 +258 @@
     }
 
-    /* If such view exists: */
+    /* If the view exists: */
     if (m_views.contains(uScreenId))
     {
@@ -326 +329 @@
 
         /* On X11, we do not grab the keyboard as soon as it is captured, but delay it
-         * until the first keypress after the capture. We do this for several reasons:
+         * for 300 milliseconds after the formal capture. We do this for several reasons:
          * - First, when several windows are created they all try to capture the keyboard when
          *   they get the focus. Due to the asynchronous nature of X11 the first window may only
@@ -335 +338 @@
          *   by refusing to e.g. drag a window using its title bar. */
 
+        /* Delay finalising capture for 300 milliseconds: */
+        QTimer::singleShot(300, this, SLOT(sltFinaliseCaptureKeyboard()));
+
 # endif /* QT_VERSION >= 0x050000 */
 #else
@@ -343 +349 @@
 #endif
 
-        /* Remember which screen wish to capture the keyboard: */
+        /* Remember which screen wishes to capture the keyboard: */
         m_iKeyboardCaptureViewIndex = uScreenId;
 
 #if !defined(VBOX_WS_X11) || QT_VERSION < 0x050000
-        /* Finalising keyboard capture: */
+        /* Finalise keyboard capture: */
         finaliseCaptureKeyboard();
 #endif
@@ -353 +359 @@
 }
 
-void UIKeyboardHandler::finaliseCaptureKeyboard()
+bool UIKeyboardHandler::finaliseCaptureKeyboard()
 {
     /* Do NOT capture the keyboard if it is already captured: */
     if (m_fIsKeyboardCaptured)
-        return;
+        return true;
 
     /* Make sure capture was really requested: */
     if (m_iKeyboardCaptureViewIndex == -1)
-        return;
-
-    /* If such view exists: */
+        return true;
+
+    /* If the view exists: */
     if (m_views.contains(m_iKeyboardCaptureViewIndex))
     {
@@ -386 +392 @@
             /* Try again later: */
             free(pGrabReply);
-            return;
+            return false;
         }
         free(pGrabReply);
@@ -397 +403 @@
         /* Notify all the listeners: */
         emit sigStateChange(state());
-    }
+
+        return true;
+    }
+
+    return false;
 }
 
@@ -410 +420 @@
     }
 
-    /* If such view exists: */
+    /* If the view exists: */
     if (m_views.contains(m_iKeyboardCaptureViewIndex))
     {
@@ -1356 +1366 @@
         case XCB_KEY_RELEASE:
         {
-            /* If we were asked to grab the keyboard previously but had to delay it
-             * then try again on every key press and release event until we manage: */
-            finaliseCaptureKeyboard();
-
             /* Cast to XCB key-event: */
             xcb_key_press_event_t *pKeyEvent = static_cast<xcb_key_press_event_t*>(pMessage);
@@ -1539 +1545 @@
         popupCenter().forgetAboutPausedVMInput(machineLogic()->activeMachineWindow());
 }
+
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+void UIKeyboardHandler::sltFinaliseCaptureKeyboard()
+{
+    /* Try to finalise keyboard capture: */
+    if (!finaliseCaptureKeyboard())
+    {
+        /* Try again in another 300 milliseconds in case of failure: */
+        QTimer::singleShot(300, this, SLOT(sltFinaliseCaptureKeyboard()));
+    }
+}
+#endif
 
 /* Keyboard-handler constructor: */
@@ -2102 +2120 @@
                     {
                         captureKeyboard(uScreenId);
-                        finaliseCaptureKeyboard();
 #ifdef VBOX_WS_X11
                         /* Make sure that pending FocusOut events from the
@@ -2110 +2127 @@
                         qApp->processEvents();
 #endif /* VBOX_WS_X11 */
+                        finaliseCaptureKeyboard();
                         if (fCaptureMouse)
                         {

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

@@ -83 +83 @@
     /** Captures the keyboard for @a uScreenId. */
     void captureKeyboard(ulong uScreenId);
-    /** Finalises keyboard capturing. */
-    void finaliseCaptureKeyboard();
+    /** Finalises keyboard capture. */
+    bool finaliseCaptureKeyboard();
     /** Releases the keyboard. */
     void releaseKeyboard();
@@ -133 +133 @@
     virtual void sltMachineStateChanged();
 
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+    /** Finalises keyboard capture. */
+    void sltFinaliseCaptureKeyboard();
+#endif
+
 protected: