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

Timestamp:

Nov 20, 2019 11:53:25 AM (5 years ago)

Author:

vboxsync

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

134825

Message:

FE/Qt: bugref:9598: UISession: Expose mouse pointer mask pixmap along with the shape pixmap previously available.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (2 diffs)
• UISession.cpp (modified) (6 diffs)
• UISession.h (modified) (2 diffs)

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

@@ -1517 +1517 @@
             || !m_pMachineView->uisession()->isMouseSupportsAbsolute()))
     {
-        /* Acquire session cursor pixmap: */
-        QPixmap cursorPixmap = m_pMachineView->uisession()->cursorPixmap();
+        /* Acquire session cursor shape pixmap: */
+        QPixmap cursorPixmap = m_pMachineView->uisession()->cursorShapePixmap();
 
         /* Take the device-pixel-ratio into account: */
@@ -1626 +1626 @@
             || !m_pMachineView->uisession()->isMouseSupportsAbsolute()))
     {
-        /* Acquire session cursor pixmap: */
-        QPixmap cursorPixmap = m_pMachineView->uisession()->cursorPixmap();
+        /* Acquire session cursor shape pixmap: */
+        QPixmap cursorPixmap = m_pMachineView->uisession()->cursorShapePixmap();
 
         /* Take the device-pixel-ratio into account: */

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

@@ -1667 +1667 @@
     /* Invalidate mouse pointer shape initially: */
     m_fIsValidPointerShapePresent = false;
+    m_cursorShapePixmap = QPixmap();
+    m_cursorMaskPixmap = QPixmap();
 
     /* Parse incoming shape data: */
@@ -1695 +1697 @@
             memcpy(image.scanLine(y), pu32SrcShapeScanline, uWidth * sizeof(uint32_t));
 
-        m_cursorPixmap = QPixmap::fromImage(image);
-        updateMousePointerPixmapScaling(m_cursorPixmap, uXHot, uYHot);
-        m_cursor = QCursor(m_cursorPixmap, uXHot, uYHot);
+        m_cursorShapePixmap = QPixmap::fromImage(image);
+        updateMousePointerPixmapScaling(m_cursorShapePixmap, uXHot, uYHot);
+        m_cursor = QCursor(m_cursorShapePixmap, uXHot, uYHot);
     }
     else
@@ -1786 +1788 @@
             }
 
-            m_cursorPixmap = QBitmap::fromImage(bitmap);
-            updateMousePointerPixmapScaling(m_cursorPixmap, uXHot, uYHot);
-            m_cursor = QCursor(m_cursorPixmap, QBitmap::fromImage(mask), uXHot, uYHot);
+            m_cursorShapePixmap = QBitmap::fromImage(bitmap);
+            m_cursorMaskPixmap = QBitmap::fromImage(mask);
+            updateMousePointerPixmapScaling(m_cursorShapePixmap, uXHot, uYHot);
+            updateMousePointerPixmapScaling(m_cursorMaskPixmap, uXHot, uYHot);
+            m_cursor = QCursor(m_cursorShapePixmap, m_cursorMaskPixmap, uXHot, uYHot);
         }
         else
@@ -1818 +1822 @@
             }
 
-            m_cursorPixmap = QPixmap::fromImage(image);
-            updateMousePointerPixmapScaling(m_cursorPixmap, uXHot, uYHot);
-            m_cursor = QCursor(m_cursorPixmap, uXHot, uYHot);
+            m_cursorShapePixmap = QPixmap::fromImage(image);
+            updateMousePointerPixmapScaling(m_cursorShapePixmap, uXHot, uYHot);
+            m_cursor = QCursor(m_cursorShapePixmap, uXHot, uYHot);
         }
     }
@@ -1843 +1847 @@
 
     /* Create cursor-pixmap from the image: */
-    m_cursorPixmap = QPixmap::fromImage(image);
-    updateMousePointerPixmapScaling(m_cursorPixmap, uXHot, uYHot);
-    m_cursor = QCursor(m_cursorPixmap, uXHot, uYHot);
+    m_cursorShapePixmap = QPixmap::fromImage(image);
+    updateMousePointerPixmapScaling(m_cursorShapePixmap, uXHot, uYHot);
+    m_cursor = QCursor(m_cursorShapePixmap, uXHot, uYHot);
     m_fIsValidPointerShapePresent = true;
 
@@ -1855 +1859 @@
 
     /* Cache cursor pixmap size: */
-    m_cursorSize = m_cursorPixmap.size();
+    m_cursorSize = m_cursorShapePixmap.size();
 }
 

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

@@ -137 +137 @@
     /** Returns currently cached mouse cursor. */
     QCursor cursor() const { return m_cursor; }
-    /** Returns currently cached mouse cursor pixmap. */
-    QPixmap cursorPixmap() const { return m_cursorPixmap; }
+    /** Returns currently cached mouse cursor shape pixmap. */
+    QPixmap cursorShapePixmap() const { return m_cursorShapePixmap; }
+    /** Returns currently cached mouse cursor mask pixmap. */
+    QPixmap cursorMaskPixmap() const { return m_cursorMaskPixmap; }
     /** Returns currently cached mouse cursor size. */
     QSize cursorSize() const { return m_cursorSize; }
@@ -512 +514 @@
     /** Holds cached mouse cursor. */
     QCursor  m_cursor;
-    /** Holds cached mouse cursor pixmap. */
-    QPixmap  m_cursorPixmap;
+    /** Holds cached mouse cursor shape pixmap. */
+    QPixmap  m_cursorShapePixmap;
+    /** Holds cached mouse cursor mask pixmap. */
+    QPixmap  m_cursorMaskPixmap;
     /** Holds cached mouse cursor size. */
     QSize    m_cursorSize;