Changeset 72678 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 25, 2018 2:25:49 PM (7 years ago)

Author:

vboxsync

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

123193

Message:

FE/Qt: bugref:9197 In X11 check the RENDER extension before setting cursor

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QISplitter.cpp (modified) (4 diffs)
• globals/VBoxGlobal.cpp (modified) (4 diffs)
• globals/VBoxGlobal.h (modified) (4 diffs)
• platform/x11/VBoxX11Helper.cpp (modified) (1 diff)
• platform/x11/VBoxX11Helper.h (modified) (1 diff)
• runtime/UIMouseHandler.cpp (modified) (4 diffs)
• selector/UISnapshotDetailsWidget.cpp (modified) (1 diff)
• selector/graphics/details/UIGDetailsElement.cpp (modified) (2 diffs)
• widgets/UIPopupStack.cpp (modified) (2 diffs)
• widgets/graphics/UIGraphicsTextPane.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp

@@ -261 +261 @@
                             {
                                 m_fHandleGrabbed = true;
-                                setCursor(Qt::SplitHCursor);
+                                VBoxGlobal::setCursor(this, Qt::SplitHCursor);
                                 qApp->postEvent(pHandle, new QMouseEvent(newME));
                                 return true;
@@ -273 +273 @@
                                     && pMouseEvent->buttons().testFlag(Qt::LeftButton)))
                             {
-                                setCursor(Qt::SplitHCursor);
+                                VBoxGlobal::setCursor(this, Qt::SplitHCursor);
                                 qApp->postEvent(pHandle, new QMouseEvent(newME));
                                 return true;
@@ -281 +281 @@
                                 /* If not, reset the state. */
                                 m_fHandleGrabbed = false;
-                                setCursor(Qt::ArrowCursor);
+                                VBoxGlobal::setCursor(this, Qt::ArrowCursor);
                             }
                         }
@@ -292 +292 @@
             {
                 m_fHandleGrabbed = false;
-                setCursor(Qt::ArrowCursor);
+                VBoxGlobal::setCursor(this, Qt::ArrowCursor);
                 break;
             }

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

@@ -24 +24 @@
 # include <QDir>
 # include <QFileDialog>
+# include <QGraphicsWidget>
 # include <QLocale>
 # include <QMenu>
@@ -76 +77 @@
 # ifdef VBOX_WS_X11
 #  include "UIHostComboEditor.h"
+#  include "VBoxX11Helper.h"
 # endif
 # ifdef VBOX_WS_MAC
@@ -346 +348 @@
 
 /* static */
+uint VBoxGlobal::qtRTMajorVersion()
+{
+    QString rt_ver_str("5.11");// = VBoxGlobal::qtRTVersionString();
+    return rt_ver_str.section ('.', 0, 0).toInt();
+}
+
+/* static */
+uint VBoxGlobal::qtRTMinorVersion()
+{
+    QString rt_ver_str("5.11");// = VBoxGlobal::qtRTVersionString();
+    return rt_ver_str.section ('.', 1, 1).toInt();
+}
+
+/* static */
+uint VBoxGlobal::qtRTRevisionNumber()
+{
+    QString rt_ver_str("5.11");// = VBoxGlobal::qtRTVersionString();
+    return rt_ver_str.section ('.', 2, 2).toInt();
+}
+
+/* static */
 QString VBoxGlobal::qtRTVersionString()
 {
@@ -1784 +1807 @@
 
 /* static */
+void VBoxGlobal::setCursor(QWidget *pWidget, const QCursor &cursor)
+{
+    if (!pWidget)
+        return;
+
+#ifdef VBOX_WS_X11
+    /* As reported in #9197, in X11 QWidget::setCursor(..) call uses RENDER
+     * extension. Qt (before 5.11) fails to handle the case where the mentioned extension
+     * is missing. Please see https://codereview.qt-project.org/#/c/225665/ for Qt patch: */
+    if ((VBoxGlobal::qtRTMajorVersion() < 5) ||
+        (VBoxGlobal::qtRTMajorVersion() == 5 && VBoxGlobal::qtRTMinorVersion() < 11))
+    {
+        if (X11CheckExtension("RENDER"))
+            pWidget->setCursor(cursor);
+    }
+    else
+    {
+        pWidget->setCursor(cursor);
+    }
+#else
+    pWidget->setCursor(cursor);
+#endif
+}
+
+/* static */
+void VBoxGlobal::setCursor(QGraphicsWidget *pWidget, const QCursor &cursor)
+{
+
+    if (!pWidget)
+        return;
+
+#ifdef VBOX_WS_X11
+    /* As reported in #9197, in X11 QGraphicsWidget::setCursor(..) call uses RENDER
+     * extension. Qt (before 5.11) fails to handle the case where the mentioned extension
+     * is missing. Please see https://codereview.qt-project.org/#/c/225665/ for Qt patch: */
+    if ((VBoxGlobal::qtRTMajorVersion() < 5) ||
+        (VBoxGlobal::qtRTMajorVersion() == 5 && VBoxGlobal::qtRTMinorVersion() < 11))
+    {
+        if (X11CheckExtension("RENDER"))
+            pWidget->setCursor(cursor);
+    }
+    else
+    {
+        pWidget->setCursor(cursor);
+    }
+#else
+    pWidget->setCursor(cursor);
+#endif
+}
+
+
+/* static */
 bool VBoxGlobal::supportsFullScreenMonitorsProtocolX11()
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -45 +45 @@
 
 /* Forward declarations: */
+class QGraphicsWidget;
 class QMenu;
-class QToolButton;
 class QSessionManager;
 class QSpinBox;
+class QToolButton;
 class CHostVideoInputDevice;
 class CMachine;
@@ -150 +151 @@
         /** Returns Qt runtime version. */
         static uint qtRTVersion();
+        /** Returns Qt runtime major version. */
+        static uint qtRTMajorVersion();
+        /** Returns Qt runtime minor version. */
+        static uint qtRTMinorVersion();
+        /** Returns Qt runtime revision number. */
+        static uint qtRTRevisionNumber();
+
         /** Returns Qt compiled version string. */
         static QString qtCTVersionString();
@@ -360 +368 @@
     /** @} */
 
-    /** @name Window/widget geometry stuff.
+    /** @name Window/widget stuff.
      * @{ */
         /** Search position for @a rectangle to make sure it is fully contained @a boundRegion. */
@@ -383 +391 @@
         /** Activates the specified window with given @a wId. Can @a fSwitchDesktop if requested. */
         static bool activateWindow(WId wId, bool fSwitchDesktop = true);
+        /** Does some checks on certain platforms before calling QWidget::setCursor(...). */
+        static void setCursor(QWidget *pWidget, const QCursor &cursor);
+        static void setCursor(QGraphicsWidget *pWidget, const QCursor &cursor);
 
 #ifdef VBOX_WS_X11

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp

@@ -147 +147 @@
 }
 
+SHARED_LIBRARY_STUFF bool X11CheckExtension(const char *extensionName)
+{
+    Display *pDisplay = QX11Info::display();
+    int major_opcode;
+    int first_event;
+    int first_error;
+    return XQueryExtension(pDisplay, extensionName, &major_opcode, &first_event, &first_error);
+}

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h

@@ -48 +48 @@
 /** X11: Restores previously saved screen saver settings. */
 SHARED_LIBRARY_STUFF void X11ScreenSaverSettingsRestore();
-
+/** X11: Returns true if XLib extension with name @p extensionName is avaible, false otherwise. */
+SHARED_LIBRARY_STUFF bool X11CheckExtension(const char *extensionName);
 
 #endif /* !___VBoxX11Helpers_h___ */
-

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

@@ -68 +68 @@
 /* External includes: */
 #ifdef VBOX_WS_X11
+#include "VBoxX11Helper.h"
 # include <xcb/xcb.h>
 #endif
@@ -474 +475 @@
         QList<ulong> screenIds = m_viewports.keys();
         for (int i = 0; i < screenIds.size(); ++i)
-            m_viewports[screenIds[i]]->setCursor(Qt::BlankCursor);
+            VBoxGlobal::setCursor(m_viewports[screenIds[i]], Qt::BlankCursor);
     }
 
@@ -488 +489 @@
         QList<ulong> screenIds = m_viewports.keys();
         for (int i = 0; i < screenIds.size(); ++i)
-            m_viewports[screenIds[i]]->setCursor(uisession()->cursor());
+            VBoxGlobal::setCursor(m_viewports[screenIds[i]], uisession()->cursor());
     }
 
@@ -1251 +1252 @@
 }
 #endif /* VBOX_WS_WIN */
-

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotDetailsWidget.cpp

@@ -417 +417 @@
     setWindowModality(Qt::ApplicationModal);
     /* With the pointing-hand cursor: */
-    setCursor(Qt::PointingHandCursor);
+    VBoxGlobal::setCursor(this, Qt::PointingHandCursor);
     /* And it's being deleted when closed: */
     setAttribute(Qt::WA_DeleteOnClose);

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp

@@ -681 +681 @@
 {
     if (m_fNameHovered)
-        setCursor(Qt::PointingHandCursor);
+        VBoxGlobal::setCursor(this, Qt::PointingHandCursor);
     else
         unsetCursor();
@@ -699 +699 @@
     m_pButton->setAnimationRange(0, iAdditionalHeight);
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp

@@ -253 +253 @@
         {
             /* Configure scroll-area: */
-            m_pScrollArea->setCursor(Qt::ArrowCursor);
+            VBoxGlobal::setCursor(m_pScrollArea, Qt::ArrowCursor);
             m_pScrollArea->setWidgetResizable(true);
             m_pScrollArea->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
@@ -265 +265 @@
             {
                 /* Configure scroll-viewport: */
-                m_pScrollViewport->setCursor(Qt::ArrowCursor);
+                VBoxGlobal::setCursor(m_pScrollViewport, Qt::ArrowCursor);
                 /* Connect scroll-viewport: */
                 connect(this, &UIPopupStack::sigProposeStackViewportSize,

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp

@@ -31 +31 @@
 # include "UIGraphicsTextPane.h"
 # include "UIRichTextString.h"
+# include "VBoxGlobal.h"
 
 /* Other VBox includes: */
@@ -392 +393 @@
         unsetCursor();
     else
-        setCursor(Qt::PointingHandCursor);
+        VBoxGlobal::setCursor(this, Qt::PointingHandCursor);
 
     /* Update text-layout: */
@@ -522 +523 @@
     return QString();
 }
-