Changeset 64181 in vbox

Timestamp:

Oct 9, 2016 8:43:26 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8151: FE/Qt: improve X11 keyboard capturing: a user reported in ticketref:16046 that right-click context menus were broken in a number of panel tools when keyboard capturing was enabled. Quick investigation showed that we were only grabbing the first mouse button for the purposes of doing a quick release of the keyboard capture when it was pressed. This change makes us grab all mouse buttons instead. I was able to verify locally that the user-described problem was reproducible before but not after the change.

File:

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

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

@@ -374 +374 @@
              xcb_grab_button_checked(QX11Info::connection(), 0, QX11Info::appRootWindow(),
                                      XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
-                                     XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_1, XCB_MOD_MASK_ANY);
+                                     XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_ANY, XCB_MOD_MASK_ANY);
         /* And grab the keyboard, using XCB directly, as Qt does not report failure. */
         xcb_grab_keyboard_cookie_t xcbGrabCookie = xcb_grab_keyboard(QX11Info::connection(), false, m_views[m_iKeyboardCaptureViewIndex]->winId(),
@@ -383 +383 @@
             /* Release the mouse button grab.
              * We do not check for failure as we do not currently implement a back-up plan. */
-            xcb_ungrab_button_checked(QX11Info::connection(), XCB_BUTTON_INDEX_1,
+            xcb_ungrab_button_checked(QX11Info::connection(), XCB_BUTTON_INDEX_ANY,
                                       QX11Info::appRootWindow(), XCB_MOD_MASK_ANY);
             /* Try again later: */
@@ -485 +485 @@
         /* Release the mouse button grab.
          * We do not check for failure as we do not currently implement a back-up plan. */
-        xcb_ungrab_button_checked(QX11Info::connection(), XCB_BUTTON_INDEX_1,
+        xcb_ungrab_button_checked(QX11Info::connection(), XCB_BUTTON_INDEX_ANY,
                                   QX11Info::appRootWindow(), XCB_MOD_MASK_ANY);
 
@@ -1779 +1779 @@
                 /* Release the mouse button grab.
                  * We do not check for failure as we do not currently implement a back-up plan. */
-                xcb_ungrab_button_checked(QX11Info::connection(), XCB_BUTTON_INDEX_1,
+                xcb_ungrab_button_checked(QX11Info::connection(), XCB_BUTTON_INDEX_ANY,
                                           QX11Info::appRootWindow(), XCB_MOD_MASK_ANY);
 
@@ -1791 +1791 @@
                     xcb_grab_button_checked(QX11Info::connection(), 0, QX11Info::appRootWindow(),
                                             XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
-                                            XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_1, XCB_MOD_MASK_ANY);
+                                            XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_ANY, XCB_MOD_MASK_ANY);
 
                 break;