Changeset 99434 in vbox

Timestamp:

Apr 18, 2023 6:51:53 AM (2 years ago)

Author:

vboxsync

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

156893

Message:

FE/Qt: bugref:10407. More fixes to prevent crashes in pure Wayland case.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (2 diffs)
• globals/UICursor.cpp (modified) (4 diffs)
• globals/UIDesktopWidgetWatchdog.cpp (modified) (1 diff)
• main.cpp (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• platform/x11/VBoxUtils-x11.cpp (modified) (10 diffs)
• platform/x11/VBoxUtils-x11.h (modified) (7 diffs)
• runtime/UIKeyboardHandler.cpp (modified) (2 diffs)
• runtime/UIMachineWindow.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -245 +245 @@
 #ifdef VBOX_WS_X11
     /* Detect display server type: */
-    m_enmDisplayServerType = NativeWindowSubsystem::X11DetectDisplayServerType();
+    m_enmDisplayServerType = NativeWindowSubsystem::detectDisplayServerType();
 #endif
 
@@ -331 +331 @@
 #ifdef VBOX_WS_X11
     /* Check whether we have compositing manager running: */
-    m_fCompositingManagerRunning = NativeWindowSubsystem::IsCompositingManagerRunning(X11XServerAvailable());
+    m_fCompositingManagerRunning = NativeWindowSubsystem::isCompositingManagerRunning(X11XServerAvailable());
 
     /* Acquire current Window Manager type: */
-    m_enmWindowManagerType = NativeWindowSubsystem::WindowManagerType(X11XServerAvailable());
+    m_enmWindowManagerType = NativeWindowSubsystem::windowManagerType(X11XServerAvailable());
 #endif /* VBOX_WS_X11 */
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICursor.cpp

@@ -49 +49 @@
         (UICommon::qtRTMajorVersion() == 5 && UICommon::qtRTMinorVersion() < 11))
     {
-        if (NativeWindowSubsystem::X11CheckExtension("RENDER"))
+        if (NativeWindowSubsystem::checkExtension(uiCommon().X11XServerAvailable(), "RENDER"))
             pWidget->setCursor(cursor);
     }
@@ -75 +75 @@
         (UICommon::qtRTMajorVersion() == 5 && UICommon::qtRTMinorVersion() < 11))
     {
-        if (NativeWindowSubsystem::X11CheckExtension("RENDER"))
+        if (NativeWindowSubsystem::checkExtension(uiCommon().X11XServerAvailable(), "RENDER"))
             pWidget->setCursor(cursor);
     }
@@ -101 +101 @@
         (UICommon::qtRTMajorVersion() == 5 && UICommon::qtRTMinorVersion() < 11))
     {
-        if (NativeWindowSubsystem::X11CheckExtension("RENDER"))
+        if (NativeWindowSubsystem::checkExtension(uiCommon().X11XServerAvailable(), "RENDER"))
             pWidget->unsetCursor();
     }
@@ -127 +127 @@
         (UICommon::qtRTMajorVersion() == 5 && UICommon::qtRTMinorVersion() < 11))
     {
-        if (NativeWindowSubsystem::X11CheckExtension("RENDER"))
+        if (NativeWindowSubsystem::checkExtension(uiCommon().X11XServerAvailable(), "RENDER"))
             pWidget->unsetCursor();
     }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp

@@ -861 +861 @@
 
 #elif defined(VBOX_WS_X11)
-    if (uiCommon().X11XServerAvailable())
-        fResult &= NativeWindowSubsystem::X11ActivateWindow(wId, fSwitchDesktop);
+
+    fResult &= NativeWindowSubsystem::activateWindow(uiCommon().X11XServerAvailable(), wId, fSwitchDesktop);
 
 #else

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -396 +396 @@
         if (!MakeSureMultiThreadingIsSafe())
             break;
-        DisplayServerType enmDisplayServerType = NativeWindowSubsystem::X11DetectDisplayServerType();
+        DisplayServerType enmDisplayServerType = NativeWindowSubsystem::detectDisplayServerType();
         if (NativeWindowSubsystem::X11XServerAvailable(enmDisplayServerType))
             /* Force using Qt platform plugin 'xcb', we have X11 specific code: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -2146 +2146 @@
 {
 #ifdef VBOX_WS_X11
-    NativeWindowSubsystem::SetWMClass(uiCommon().X11XServerAvailable(), this, "VirtualBox Manager", "VirtualBox Manager");
+    NativeWindowSubsystem::setWMClass(uiCommon().X11XServerAvailable(), this, "VirtualBox Manager", "VirtualBox Manager");
 #endif
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp

@@ -60 +60 @@
 
 
-bool NativeWindowSubsystem::IsCompositingManagerRunning(bool fIsXServerAvailable)
+bool NativeWindowSubsystem::isCompositingManagerRunning(bool fIsXServerAvailable)
 {
     if (fIsXServerAvailable)
@@ -81 +81 @@
 }
 
-X11WMType NativeWindowSubsystem::WindowManagerType(bool fIsXServerAvailable)
+X11WMType NativeWindowSubsystem::windowManagerType(bool fIsXServerAvailable)
 {
     if (fIsXServerAvailable)
@@ -90 +90 @@
 X11WMType NativeWindowSubsystem::WaylandWindowManagerType()
 {
-    /// @todo implement
+    /// @wayland implement
     return X11WMType_Unknown;
 }
@@ -150 +150 @@
 }
 
+bool NativeWindowSubsystem::checkExtension(bool fIsXServerAvailable, const char *pExtensionName)
+{
+    if (fIsXServerAvailable)
+        return X11CheckExtension(pExtensionName);
+    return WaylandCheckExtension(pExtensionName);
+}
+
 bool NativeWindowSubsystem::X11CheckExtension(const char *pExtensionName)
 {
@@ -158 +165 @@
     int first_error;
     return XQueryExtension(pDisplay, pExtensionName, &major_opcode, &first_event, &first_error);
+}
+
+bool NativeWindowSubsystem::WaylandCheckExtension(const char *pExtensionName)
+{
+    Q_UNUSED(pExtensionName);
+    /// @todo implement
+    return false;
 }
 
@@ -385 +399 @@
 }
 
+bool NativeWindowSubsystem::activateWindow(bool fIsXServerAvailable, WId wId, bool fSwitchDesktop)
+{
+    if (fIsXServerAvailable)
+        return X11ActivateWindow(wId, fSwitchDesktop);
+    return WaylandActivateWindow(wId, fSwitchDesktop);
+}
+
 bool NativeWindowSubsystem::X11ActivateWindow(WId wId, bool fSwitchDesktop)
 {
@@ -422 +443 @@
     XRaiseWindow(pDisplay, wId);
     return fResult;
+}
+
+bool NativeWindowSubsystem::WaylandActivateWindow(WId wId, bool fSwitchDesktop)
+{
+    /// @todo implement
+    Q_UNUSED(wId);
+    Q_UNUSED(fSwitchDesktop);
+    return false;
 }
 
@@ -615 +644 @@
 }
 
-void NativeWindowSubsystem::SetWMClass(bool fIsXServerAvailable, QWidget *pWidget, const QString &strNameString, const QString &strClassString)
+void NativeWindowSubsystem::setWMClass(bool fIsXServerAvailable, QWidget *pWidget, const QString &strNameString, const QString &strClassString)
 {
     if (fIsXServerAvailable)
@@ -655 +684 @@
 }
 
-void NativeWindowSubsystem::X11SetXwaylandMayGrabKeyboardFlag(QWidget *pWidget)
-{
-    XXSendClientMessage(NativeWindowSubsystem::X11GetDisplay(), pWidget->window()->winId(),
-                        "_XWAYLAND_MAY_GRAB_KEYBOARD", 1);
+void NativeWindowSubsystem::setXwaylandMayGrabKeyboardFlag(bool fIsXServerAvailable, QWidget *pWidget)
+{
+    if (fIsXServerAvailable)
+        XXSendClientMessage(NativeWindowSubsystem::X11GetDisplay(), pWidget->window()->winId(),
+                            "_XWAYLAND_MAY_GRAB_KEYBOARD", 1);
 }
 
@@ -708 +738 @@
 }
 
-DisplayServerType NativeWindowSubsystem::X11DetectDisplayServerType()
+DisplayServerType NativeWindowSubsystem::detectDisplayServerType()
 {
     const char *pSessionType = RTEnvGet("XDG_SESSION_TYPE");

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h

@@ -105 +105 @@
 {
     /** Wrapper function for X11IsCompositingManagerRunning and WaylandIsCompositingManagerRunning. */
-    bool IsCompositingManagerRunning(bool fIsXServerAvailable);
+    bool isCompositingManagerRunning(bool fIsXServerAvailable);
     /** X11: Determines and returns whether the compositing manager is running. */
     bool X11IsCompositingManagerRunning();
@@ -112 +112 @@
 
     /** Wrapper for window manager type functions. */
-    X11WMType WindowManagerType(bool fIsXServerAvailable);
+    X11WMType windowManagerType(bool fIsXServerAvailable);
     /** X11: Determines and returns current Window Manager type. */
     X11WMType X11WindowManagerType();
@@ -118 +118 @@
     X11WMType WaylandWindowManagerType();
 
+    /** Wrapper for X11CheckExtension and WaylandCheckExtension functions. */
+    bool checkExtension(bool fIsXServerAvailable, const char *extensionName);
     /** X11: Returns true if XLib extension with name @p extensionName is avaible, false otherwise. */
-    bool X11CheckExtension(const char *extensionName);
+    bool X11CheckExtension(const char *pExtensionName);
+    bool WaylandCheckExtension(const char *pExtensionName);
+
 
     /** X11: Returns whether there are any DBus services whose name contains the substring 'screensaver'. */
@@ -128 +132 @@
     SHARED_LIBRARY_STUFF void X11InhibitUninhibitScrenSaver(bool fInhibit, QVector<X11ScreenSaverInhibitMethod*> &inOutInhibitMethods);
 
+    /** Wrapper function for X11ActivateWindow or WaylandActivateWindow. */
+    bool activateWindow(bool fIsXServerAvailable, WId wId, bool fSwitchDesktop);
     /** Activates window with certain @a wId, @a fSwitchDesktop if requested. */
     bool X11ActivateWindow(WId wId, bool fSwitchDesktop);
+    /** Activates window with certain @a wId, @a fSwitchDesktop if requested. */
+    bool WaylandActivateWindow(WId wId, bool fSwitchDesktop);
 
     /** X11: Test whether the current window manager supports full screen mode. */
@@ -142 +150 @@
 
     /** Wrapper function for WMClass setters. */
-    SHARED_LIBRARY_STUFF void SetWMClass(bool fIsXServerAvailable, QWidget *pWidget, const QString &strNameString, const QString &strClassString);
+    SHARED_LIBRARY_STUFF void setWMClass(bool fIsXServerAvailable, QWidget *pWidget, const QString &strNameString, const QString &strClassString);
     /** X11: Assigns WM_CLASS property for passed @a pWidget. */
     SHARED_LIBRARY_STUFF void X11SetWMClass(QWidget *pWidget, const QString &strNameString, const QString &strClassString);
@@ -152 +160 @@
       *      so that e.g. alt+tab will get send to the VM instead of moving the
       *      focus away from the VM. */
-    SHARED_LIBRARY_STUFF void X11SetXwaylandMayGrabKeyboardFlag(QWidget *pWidget);
+    SHARED_LIBRARY_STUFF void setXwaylandMayGrabKeyboardFlag(bool fIsXServerAvailable, QWidget *pWidget);
 
     /** X11: Gets the X11 display pointer. */
@@ -161 +169 @@
     SHARED_LIBRARY_STUFF uint32_t X11GetAppRootWindow();
     /** Detects and returns display server type. */
-    SHARED_LIBRARY_STUFF DisplayServerType X11DetectDisplayServerType();
+    SHARED_LIBRARY_STUFF DisplayServerType detectDisplayServerType();
     /** Returns true if @a enmDisplayServerType is either xorg or xwayland. */
     SHARED_LIBRARY_STUFF bool X11XServerAvailable(DisplayServerType enmDisplayServerType);

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

@@ -266 +266 @@
 
 #elif defined(VBOX_WS_X11)
-
-        /* On X11, we are using XCB stuff to grab the keyboard.
-         * This stuff is a part of the active keyboard grabbing functionality.
-         * Active keyboard grabbing causes a problems on many window managers - a window cannot
-         * be moved using the mouse. So we additionally grab the mouse buttons as well to detect
-         * that the user is trying to click outside of the internal window geometry and release
-         * the keyboard before the target window sees the click. (GNOME Shell's hot corner has
-         * the same problem. At present we just let that problem be.) */
+        if (uiCommon().X11XServerAvailable())
+        {
+            /* On X11, we are using XCB stuff to grab the keyboard.
+             * This stuff is a part of the active keyboard grabbing functionality.
+             * Active keyboard grabbing causes a problems on many window managers - a window cannot
+             * be moved using the mouse. So we additionally grab the mouse buttons as well to detect
+             * that the user is trying to click outside of the internal window geometry and release
+             * the keyboard before the target window sees the click. (GNOME Shell's hot corner has
+             * the same problem. At present we just let that problem be.) */
 
 # if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
-        /* Make sure we really do still have the focus.  Qt as of version 5.13 started
-         * reporting it with delay, so ask the X server directly.  We could remove the
-         * version check some time in the future.  If we do, remove the comment above
-         * about the focus notification dance, as it will no longer be relevant. */
-        xcb_get_input_focus_cookie_t xcbFocusCookie = xcb_get_input_focus(NativeWindowSubsystem::X11GetConnection());
-        xcb_get_input_focus_reply_t *pFocusReply = xcb_get_input_focus_reply(NativeWindowSubsystem::X11GetConnection(),
-                                                                             xcbFocusCookie, 0);
-        xcb_window_t xcbFocusWindow = pFocusReply->focus;
-        free(pFocusReply);
-        if (xcbFocusWindow != m_windows[m_iKeyboardCaptureViewIndex]->winId())
-            return true;
+            /* Make sure we really do still have the focus.  Qt as of version 5.13 started
+             * reporting it with delay, so ask the X server directly.  We could remove the
+             * version check some time in the future.  If we do, remove the comment above
+             * about the focus notification dance, as it will no longer be relevant. */
+            xcb_get_input_focus_cookie_t xcbFocusCookie = xcb_get_input_focus(NativeWindowSubsystem::X11GetConnection());
+            xcb_get_input_focus_reply_t *pFocusReply = xcb_get_input_focus_reply(NativeWindowSubsystem::X11GetConnection(),
+                                                                                 xcbFocusCookie, 0);
+            xcb_window_t xcbFocusWindow = pFocusReply->focus;
+            free(pFocusReply);
+            if (xcbFocusWindow != m_windows[m_iKeyboardCaptureViewIndex]->winId())
+                return true;
 # endif
 
-        /* Grab the mouse button.
-         * We do not check for failure as we do not currently implement a back-up plan. */
-        /* If any previous grab is still in process, release it. */
-        if (m_hButtonGrabWindow != 0)
-            xcb_ungrab_button_checked(NativeWindowSubsystem::X11GetConnection(), XCB_BUTTON_INDEX_ANY,
-                                      m_hButtonGrabWindow, XCB_MOD_MASK_ANY);
-        m_hButtonGrabWindow = NativeWindowSubsystem::X11GetAppRootWindow();
-        xcb_grab_button_checked(NativeWindowSubsystem::X11GetConnection(), 0, m_hButtonGrabWindow,
-                                XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
-                                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(NativeWindowSubsystem::X11GetConnection(), false,
-                                                                     m_views[m_iKeyboardCaptureViewIndex]->winId(),
-                                                                     XCB_TIME_CURRENT_TIME, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
-        xcb_grab_keyboard_reply_t *pGrabReply = xcb_grab_keyboard_reply(NativeWindowSubsystem::X11GetConnection(),
-                                                                        xcbGrabCookie, NULL);
-        if (pGrabReply == NULL || pGrabReply->status != XCB_GRAB_STATUS_SUCCESS)
-        {
-            /* Release the mouse button grab.
+            /* Grab the mouse button.
              * We do not check for failure as we do not currently implement a back-up plan. */
-            xcb_ungrab_button_checked(NativeWindowSubsystem::X11GetConnection(), XCB_BUTTON_INDEX_ANY,
-                                      m_hButtonGrabWindow, XCB_MOD_MASK_ANY);
-            m_hButtonGrabWindow = 0;
-            /* Try again later: */
+            /* If any previous grab is still in process, release it. */
+            if (m_hButtonGrabWindow != 0)
+                xcb_ungrab_button_checked(NativeWindowSubsystem::X11GetConnection(), XCB_BUTTON_INDEX_ANY,
+                                          m_hButtonGrabWindow, XCB_MOD_MASK_ANY);
+            m_hButtonGrabWindow = NativeWindowSubsystem::X11GetAppRootWindow();
+            xcb_grab_button_checked(NativeWindowSubsystem::X11GetConnection(), 0, m_hButtonGrabWindow,
+                                    XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
+                                    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(NativeWindowSubsystem::X11GetConnection(), false,
+                                                                         m_views[m_iKeyboardCaptureViewIndex]->winId(),
+                                                                         XCB_TIME_CURRENT_TIME, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
+            xcb_grab_keyboard_reply_t *pGrabReply = xcb_grab_keyboard_reply(NativeWindowSubsystem::X11GetConnection(),
+                                                                            xcbGrabCookie, NULL);
+            if (pGrabReply == NULL || pGrabReply->status != XCB_GRAB_STATUS_SUCCESS)
+            {
+                /* 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(NativeWindowSubsystem::X11GetConnection(), XCB_BUTTON_INDEX_ANY,
+                                          m_hButtonGrabWindow, XCB_MOD_MASK_ANY);
+                m_hButtonGrabWindow = 0;
+                /* Try again later: */
+                free(pGrabReply);
+                return false;
+            }
             free(pGrabReply);
-            return false;
-        }
-        free(pGrabReply);
-
+        }
 #else
 
@@ -370 +371 @@
 
 #elif defined(VBOX_WS_X11)
-
-        /* On X11, we are using XCB stuff to grab the keyboard.
-         * This stuff is a part of the active keyboard grabbing functionality.
-         * Active keyboard grabbing causes a problems on many window managers - a window cannot
-         * be moved using the mouse. So we finally releasing additionally grabbed mouse as well
-         * to allow further user interactions. */
-
-        /* Ungrab using XCB: */
-        xcb_ungrab_keyboard(NativeWindowSubsystem::X11GetConnection(), XCB_TIME_CURRENT_TIME);
-        /* 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(NativeWindowSubsystem::X11GetConnection(), XCB_BUTTON_INDEX_ANY,
-                                  m_hButtonGrabWindow, XCB_MOD_MASK_ANY);
-        m_hButtonGrabWindow = 0;
-
+        if (uiCommon().X11XServerAvailable())
+        {
+            /* On X11, we are using XCB stuff to grab the keyboard.
+             * This stuff is a part of the active keyboard grabbing functionality.
+             * Active keyboard grabbing causes a problems on many window managers - a window cannot
+             * be moved using the mouse. So we finally releasing additionally grabbed mouse as well
+             * to allow further user interactions. */
+
+            /* Ungrab using XCB: */
+            xcb_ungrab_keyboard(NativeWindowSubsystem::X11GetConnection(), XCB_TIME_CURRENT_TIME);
+            /* 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(NativeWindowSubsystem::X11GetConnection(), XCB_BUTTON_INDEX_ANY,
+                                      m_hButtonGrabWindow, XCB_MOD_MASK_ANY);
+            m_hButtonGrabWindow = 0;
+        }
 #else
 

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

@@ -149 +149 @@
     if (gEDataManager->distinguishMachineWindowGroups(uiCommon().managedVMUuid()))
         strWindowName = QString("VirtualBox Machine UUID: %1").arg(uiCommon().managedVMUuid().toString());
-    if (uiCommon().X11XServerAvailable())
-    {
-        /* Assign WM_CLASS property: */
-        NativeWindowSubsystem::X11SetWMClass(this, strWindowName, strWindowClass);
-        /* Tell the WM we are well behaved wrt Xwayland keyboard-grabs: */
-        NativeWindowSubsystem::X11SetXwaylandMayGrabKeyboardFlag(this);
-    }
+    /* Assign WM_CLASS property: */
+    NativeWindowSubsystem::setWMClass(uiCommon().X11XServerAvailable(), this, strWindowName, strWindowClass);
+    /* Tell the WM we are well behaved wrt Xwayland keyboard-grabs: */
+    NativeWindowSubsystem::setXwaylandMayGrabKeyboardFlag(uiCommon().X11XServerAvailable(), this);
 #endif
 }