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

Timestamp:

Nov 26, 2015 1:44:12 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 21): QCursor API changes: No more support for old Xcursor fancy thing, X11 will use cross-platform approach as Mac OS X do.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (2 diffs)

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

@@ -76 +76 @@
 # include <X11/Xlib.h>
 # include <X11/Xutil.h>
-# ifndef VBOX_WITHOUT_XCURSOR
-#  include <X11/Xcursor/Xcursor.h>
-# endif /* VBOX_WITHOUT_XCURSOR */
 #endif /* Q_WS_X11 */
 
@@ -1682 +1679 @@
         DeleteObject(hBitmap);
 
-#elif defined (Q_WS_X11) && !defined (VBOX_WITHOUT_XCURSOR)
-
-    XcursorImage *img = XcursorImageCreate(uWidth, uHeight);
-    Assert(img);
-    if (img)
-    {
-        img->xhot = uXHot;
-        img->yhot = uYHot;
-
-        XcursorPixel *dstShapePtr = img->pixels;
-
-        if (fHasAlpha)
-        {
-            memcpy(dstShapePtr, srcShapePtr, uHeight * srcShapePtrScan);
-        }
-        else
-        {
-            renderCursorPixels((uint32_t *)srcShapePtr, srcAndMaskPtr,
-                               uWidth, uHeight,
-                               dstShapePtr, uHeight * srcShapePtrScan);
-        }
-
-        /* Set the new cursor: */
-        m_cursor = QCursor(XcursorImageLoadCursor(QX11Info::display(), img));
-        m_fIsValidPointerShapePresent = true;
-
-        XcursorImageDestroy(img);
-    }
-
-#elif defined(Q_WS_MAC)
-
-    /* Create a ARGB image out of the shape data. */
-    QImage image  (uWidth, uHeight, QImage::Format_ARGB32);
+#elif defined(Q_WS_X11) || defined(Q_WS_MAC)
+
+    /* Create a ARGB image out of the shape data: */
+    QImage image(uWidth, uHeight, QImage::Format_ARGB32);
 
     if (fHasAlpha)