Changeset 59360 in vbox

Timestamp:

Jan 15, 2016 12:02:21 PM (9 years ago)

Author:

vboxsync

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

105048

Message:

FE/Qt: Qt5 migration (part 57): Reworking keyboard-handler: Update keyboard capture states after it's done, not before.

File:

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

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

@@ -232 +232 @@
     if (m_views.contains(uScreenId))
     {
-        /* Store new keyboard-captured state value: */
-        m_fIsKeyboardCaptured = true;
-
-        /* Remember which screen had captured keyboard: */
-        m_iKeyboardCaptureViewIndex = uScreenId;
-
 #if defined(Q_WS_MAC)
 
@@ -251 +245 @@
         // TODO: Is that really needed?
         ::DarwinDisableGlobalHotKeys(true);
-        m_views[m_iKeyboardCaptureViewIndex]->grabKeyboard();
+        m_views[uScreenId]->grabKeyboard();
 
 #elif defined(Q_WS_WIN)
@@ -274 +268 @@
             {
 # if QT_VERSION >= 0x050000
-                xcb_grab_key_checked(QX11Info::connection(), 0, m_views.value(m_iKeyboardCaptureViewIndex)->viewport()->winId(), XCB_MOD_MASK_ANY, XCB_GRAB_ANY, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
+                xcb_grab_key_checked(QX11Info::connection(), 0, m_views.value(uScreenId)->viewport()->winId(), XCB_MOD_MASK_ANY, XCB_GRAB_ANY, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
 # else /* QT_VERSION < 0x050000 */
-                XGrabKey(QX11Info::display(), AnyKey, AnyModifier, m_windows[m_iKeyboardCaptureViewIndex]->winId(), False, GrabModeAsync, GrabModeAsync);
+                XGrabKey(QX11Info::display(), AnyKey, AnyModifier, m_windows[uScreenId]->winId(), False, GrabModeAsync, GrabModeAsync);
 # endif /* QT_VERSION < 0x050000 */
                 break;
@@ -285 +279 @@
             {
 # if QT_VERSION >= 0x050000
-                xcb_grab_keyboard(QX11Info::connection(), 0, m_views.value(m_iKeyboardCaptureViewIndex)->viewport()->winId(), XCB_CURRENT_TIME, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
+                xcb_grab_keyboard(QX11Info::connection(), 0, m_views.value(uScreenId)->viewport()->winId(), XCB_CURRENT_TIME, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
 # else /* QT_VERSION < 0x050000 */
                 /* Keyboard grabbing can fail because of some keyboard shortcut is still grabbed by window manager.
@@ -296 +290 @@
                  * for this window on the queue.  This can prevent problems
                  * including two windows fighting to grab the keyboard. */
-                hWindow = m_windows[m_iKeyboardCaptureViewIndex]->winId();
+                hWindow = m_windows[uScreenId]->winId();
                 if (!checkForX11FocusEvents(hWindow))
                     while (cTriesLeft && XGrabKeyboard(QX11Info::display(),
@@ -313 +307 @@
 
         /* On other platforms we are just praying Qt method to work: */
-        m_views[m_iKeyboardCaptureViewIndex]->grabKeyboard();
+        m_views[uScreenId]->grabKeyboard();
 
 #endif
+
+        /* Remember which screen had captured keyboard: */
+        m_iKeyboardCaptureViewIndex = uScreenId;
+
+        /* Store new keyboard-captured state value: */
+        m_fIsKeyboardCaptured = true;
 
         /* Notify all the listeners: */
@@ -331 +331 @@
     if (m_views.contains(m_iKeyboardCaptureViewIndex))
     {
-        /* Store new keyboard-captured state value: */
-        m_fIsKeyboardCaptured = false;
-
 #if defined(Q_WS_MAC)
 
@@ -401 +398 @@
         /* Forget which screen had captured keyboard: */
         m_iKeyboardCaptureViewIndex = -1;
+
+        /* Store new keyboard-captured state value: */
+        m_fIsKeyboardCaptured = false;
 
         /* Notify all the listeners: */