Changeset 99442 in vbox

Timestamp:

Apr 18, 2023 12:26:53 PM (20 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10407. Some more fixes for guarding XServer calls.

Location:

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

Files:

• UIMachineView.cpp (modified) (1 diff)
• UIMouseHandler.cpp (modified) (1 diff)

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

@@ -540 +540 @@
 # elif defined(VBOX_WS_X11)
 
-    /* Make sure it's generic XCB event: */
-    if (eventType != "xcb_generic_event_t")
-        return false;
-    xcb_generic_event_t *pEvent = static_cast<xcb_generic_event_t*>(pMessage);
-
-    switch (pEvent->response_type & ~0x80)
-    {
-        /* Watch for key-events: */
-        case XCB_KEY_PRESS:
-        case XCB_KEY_RELEASE:
+    if (uiCommon().X11ServerAvailable())
+    {
+        /* Make sure it's generic XCB event: */
+        if (eventType != "xcb_generic_event_t")
+            return false;
+        xcb_generic_event_t *pEvent = static_cast<xcb_generic_event_t*>(pMessage);
+
+        switch (pEvent->response_type & ~0x80)
         {
-            /* Delegate key-event handling to the keyboard-handler: */
-            return machineLogic()->keyboardHandler()->nativeEventFilter(pMessage, screenId());
+            /* Watch for key-events: */
+            case XCB_KEY_PRESS:
+            case XCB_KEY_RELEASE:
+                {
+                    /* 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:
+                break;
         }
-        /* 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:
-            break;
     }
 

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

@@ -313 +313 @@
 # elif defined(VBOX_WS_X11)
 
-    /* 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 (uimachine()->isMouseCaptured())
+    if (uiCommon().X11ServerAvailable())
+    {
+        /* 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 (uimachine()->isMouseCaptured())
+                        break;
+
+                    /* If we see a mouse press from a grab 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). */
+
+                    /* Cast to XCB button-event: */
+                    xcb_button_press_event_t *pButtonEvent = static_cast<xcb_button_press_event_t*>(pMessage);
+
+                    /* If this event is from our button grab then it will be reported relative to the root
+                     * window and not to ours. In that case release the keyboard capture, re-capture it
+                     * delayed, which will fail if we have lost the input focus in the mean-time, replay
+                     * the button event for normal delivery (possibly straight back to us, but not relative
+                     * to root this time) and tell Qt not to further process this event: */
+                    if (pButtonEvent->event == pButtonEvent->root)
+                    {
+                        machineLogic()->keyboardHandler()->releaseKeyboard();
+                        /** @todo It would be nicer to do this in the normal Qt button event
+                         *       handler to avoid avoidable races if the event was not for us. */
+                        machineLogic()->keyboardHandler()->captureKeyboard(uScreenId);
+                        /* Re-send the event so that the window which it was meant for gets it: */
+                        xcb_allow_events_checked(NativeWindowSubsystem::X11GetConnection(), XCB_ALLOW_REPLAY_POINTER, pButtonEvent->time);
+                        /* Do not let Qt see the event: */
+                        return true;
+                    }
+                }
+            default:
                 break;
-
-            /* If we see a mouse press from a grab 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). */
-
-            /* Cast to XCB button-event: */
-            xcb_button_press_event_t *pButtonEvent = static_cast<xcb_button_press_event_t*>(pMessage);
-
-            /* If this event is from our button grab then it will be reported relative to the root
-             * window and not to ours. In that case release the keyboard capture, re-capture it
-             * delayed, which will fail if we have lost the input focus in the mean-time, replay
-             * the button event for normal delivery (possibly straight back to us, but not relative
-             * to root this time) and tell Qt not to further process this event: */
-            if (pButtonEvent->event == pButtonEvent->root)
-            {
-                machineLogic()->keyboardHandler()->releaseKeyboard();
-                /** @todo It would be nicer to do this in the normal Qt button event
-                  *       handler to avoid avoidable races if the event was not for us. */
-                machineLogic()->keyboardHandler()->captureKeyboard(uScreenId);
-                /* Re-send the event so that the window which it was meant for gets it: */
-                xcb_allow_events_checked(NativeWindowSubsystem::X11GetConnection(), XCB_ALLOW_REPLAY_POINTER, pButtonEvent->time);
-                /* Do not let Qt see the event: */
-                return true;
-            }
-        }
-        default:
-            break;
-    }
-
+        }
+    }
 # else