Changeset 63601 in vbox

Timestamp:

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

Author:

vboxsync

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

110304

Message:

FE/Qt: bugref:8151: X11: Runtime UI: Move mouse-related logic from keyboard-handler to mouse-handler (became possible since r110268).

Location:

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

Files:

• UIKeyboardHandler.cpp (modified) (1 diff)
• UIMachineView.cpp (modified) (1 diff)
• UIMouseHandler.cpp (modified) (3 diffs)

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

@@ -1437 +1437 @@
             fResult = keyEvent(ks, uScan, iflags, uScreenId);
 
-            break;
-        }
-        /* Watch for mouse-events: */
-        case XCB_BUTTON_PRESS:
-        {
-            /* Do nothing if mouse is actively grabbed: */
-            if (uisession()->isMouseCaptured())
-                break;
-
-            /* If we see a mouse press outside of our views while the mouse is not
-             * captured, release the keyboard before letting the event owner see it.
-             * This is because some owners cannot deal with failures to grab the
-             * keyboard themselves (e.g. window managers dragging windows).
-             * Only works if we have passively grabbed the mouse button. */
-
-            /* Cast to XCB key-event: */
-            xcb_button_press_event_t *pButtonEvent = static_cast<xcb_button_press_event_t*>(pMessage);
-
-            /* Detect the widget which should receive the event actually: */
-            const QWidget *pWidget = qApp->widgetAt(pButtonEvent->root_x, pButtonEvent->root_y);
-            if (pWidget)
-            {
-                /* Redirect the event to corresponding widget: */
-                const QPoint pos = pWidget->mapFromGlobal(QPoint(pButtonEvent->root_x, pButtonEvent->root_y));
-                pButtonEvent->event = pWidget->effectiveWinId();
-                pButtonEvent->event_x = pos.x();
-                pButtonEvent->event_y = pos.y();
-                xcb_ungrab_pointer_checked(QX11Info::connection(), pButtonEvent->time);
-                break;
-            }
-            /* Else if the event happened outside of our view areas then release the keyboard,
-             * but capture it again (delayed) immediately. If the event causes us to loose the
-             * focus then the delayed capture will not happen: */
-            releaseKeyboard();
-            captureKeyboard(uScreenId);
-            /* And re-send the event so that the window which it was meant for actually gets it: */
-            xcb_allow_events_checked(QX11Info::connection(), XCB_ALLOW_REPLAY_POINTER, pButtonEvent->time);
             break;
         }

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

@@ -2012 +2012 @@
         case XCB_KEY_PRESS:
         case XCB_KEY_RELEASE:
-        case XCB_BUTTON_PRESS: // TODO: Move to mouse-filter case!
         {
             /* Delegate key-event handling to the keyboard-handler: */
             return machineLogic()->keyboardHandler()->nativeEventFilter(pMessage, screenId());
+        }
+        /* Watch for button-events: */
+        case XCB_BUTTON_PRESS:
+        case XCB_BUTTON_RELEASE:
+        {
+            /* Delegate button-event handling to the mouse-handler: */
+            return machineLogic()->mouseHandler()->nativeEventFilter(pMessage, screenId());
         }
         default:

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

@@ -23 +23 @@
 # include <QMouseEvent>
 # include <QTimer>
+# if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+#  include <QX11Info>
+# endif
 
 /* GUI includes: */
@@ -71 +74 @@
 #   undef FocusOut
 #  endif /* FocusOut */
-# endif /* QT_VERSION < 0x050000 */
-#endif /* VBOX_WS_X11 */
+# else
+#  include <xcb/xcb.h>
+# endif
+#endif
 
 
@@ -357 +362 @@
 # elif defined(VBOX_WS_X11)
 
-    /* Nothing for now. */
-    RT_NOREF(pMessage, uScreenId);
+    /* Cast to XCB event: */
+    xcb_generic_event_t *pEvent = static_cast<xcb_generic_event_t*>(pMessage);
+
+    /* Depending on event type: */
+    switch (pEvent->response_type & ~0x80)
+    {
+        /* Watch for button-events: */
+        case XCB_BUTTON_PRESS:
+        {
+            /* Do nothing if mouse is actively grabbed: */
+            if (uisession()->isMouseCaptured())
+                break;
+
+            /* If we see a mouse press outside of our views while the mouse is not
+             * captured, release the keyboard before letting the event owner see it.
+             * This is because some owners cannot deal with failures to grab the
+             * keyboard themselves (e.g. window managers dragging windows).
+             * Only works if we have passively grabbed the mouse button. */
+
+            /* Cast to XCB button-event: */
+            xcb_button_press_event_t *pButtonEvent = static_cast<xcb_button_press_event_t*>(pMessage);
+
+            /* Detect the widget which should receive the event actually: */
+            const QWidget *pWidget = qApp->widgetAt(pButtonEvent->root_x, pButtonEvent->root_y);
+            if (pWidget)
+            {
+                /* Redirect the event to corresponding widget: */
+                const QPoint pos = pWidget->mapFromGlobal(QPoint(pButtonEvent->root_x, pButtonEvent->root_y));
+                pButtonEvent->event = pWidget->effectiveWinId();
+                pButtonEvent->event_x = pos.x();
+                pButtonEvent->event_y = pos.y();
+                xcb_ungrab_pointer_checked(QX11Info::connection(), pButtonEvent->time);
+                break;
+            }
+            /* Else if the event happened outside of our view areas then release the keyboard,
+             * but capture it again (delayed) immediately. If the event causes us to loose the
+             * focus then the delayed capture will not happen: */
+            machineLogic()->keyboardHandler()->releaseKeyboard();
+            machineLogic()->keyboardHandler()->captureKeyboard(uScreenId);
+            /* And re-send the event so that the window which it was meant for actually gets it: */
+            xcb_allow_events_checked(QX11Info::connection(), XCB_ALLOW_REPLAY_POINTER, pButtonEvent->time);
+            break;
+        }
+        default:
+            break;
+    }
 
 # else