Changeset 98379 in vbox

Timestamp:

Feb 1, 2023 12:38:42 PM (2 years ago)

Author:

vboxsync

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

155623

Message:

Merging r155205 and r155228 from gui4 branch: FE/Qt: Runtime UI: Move mouse stuff from UISession to UIMachine; Quite a heavy and dangerous rework.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Frontends (modified) (1 prop)
• src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (7 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp (modified) (6 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h (modified) (7 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (5 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp (modified) (19 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (7 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UISession.h (modified) (10 diffs)

trunk

@@ -19 +19 @@
 /branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3:79645-79692
-/branches/dsen/gui4:155183-155185,155187,155198,155200-155201
+/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228
 /trunk/src:92342,154921

@@ -19 +19 @@
 /branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3:79645-79692
-/branches/dsen/gui4:155183-155185,155187,155198,155200-155201
+/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228
 /trunk/src:92342,154921

trunk/src/VBox

@@ -19 +19 @@
 /branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox:79645-79692
-/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201
+/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228

@@ -19 +19 @@
 /branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox:79645-79692
-/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201
+/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228

trunk/src/VBox/Frontends

@@ -16 +16 @@
 /branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox/Frontends:79645-79692
-/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201
+/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228

@@ -16 +16 @@
 /branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox/Frontends:79645-79692
-/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201
+/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228

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

@@ -37 +37 @@
 #include "UIFrameBuffer.h"
 #include "UISession.h"
+#include "UIMachine.h"
 #include "UIMachineLogic.h"
 #include "UIMachineWindow.h"
@@ -1944 +1945 @@
      * framebuffer cursor if mouse integration is supported and enabled. */
     if (   m_pMachineView
-        && !m_pMachineView->uisession()->isHidingHostPointer()
-        && m_pMachineView->uisession()->isValidPointerShapePresent()
-        && m_pMachineView->uisession()->isValidCursorPositionPresent()
-        && (   !m_pMachineView->uisession()->isMouseIntegrated()
-            || !m_pMachineView->uisession()->isMouseSupportsAbsolute()))
+        && !m_pMachineView->uimachine()->isHidingHostPointer()
+        && m_pMachineView->uimachine()->isValidPointerShapePresent()
+        && m_pMachineView->uimachine()->isValidCursorPositionPresent()
+        && (   !m_pMachineView->uimachine()->isMouseIntegrated()
+            || !m_pMachineView->uimachine()->isMouseSupportsAbsolute()))
     {
         /* Acquire cursor hotspot: */
-        QPoint cursorHotspot = m_pMachineView->uisession()->cursorHotspot();
+        QPoint cursorHotspot = m_pMachineView->uimachine()->cursorHotspot();
         /* Apply the scale-factor if necessary: */
         cursorHotspot /= scaleFactor();
@@ -1959 +1960 @@
 
         /* Acquire cursor position and size: */
-        QPoint cursorPosition = m_pMachineView->uisession()->cursorPosition() - cursorHotspot;
-        QSize cursorSize = m_pMachineView->uisession()->cursorSize();
+        QPoint cursorPosition = m_pMachineView->uimachine()->cursorPosition() - cursorHotspot;
+        QSize cursorSize = m_pMachineView->uimachine()->cursorSize();
         /* Apply the scale-factor if necessary: */
         cursorPosition *= scaleFactor();
@@ -2004 +2005 @@
 
     /* Attach GUI connections: */
-    connect(m_pMachineView->uisession(), &UISession::sigMousePointerShapeChange,
+    connect(m_pMachineView->uimachine(), &UIMachine::sigMousePointerShapeChange,
             this, &UIFrameBufferPrivate::sltMousePointerShapeOrPositionChange);
-    connect(m_pMachineView->uisession(), &UISession::sigCursorPositionChange,
+    connect(m_pMachineView->uimachine(), &UIMachine::sigCursorPositionChange,
             this, &UIFrameBufferPrivate::sltMousePointerShapeOrPositionChange);
 }
@@ -2021 +2022 @@
 
     /* Detach GUI connections: */
-    disconnect(m_pMachineView->uisession(), &UISession::sigMousePointerShapeChange,
+    disconnect(m_pMachineView->uimachine(), &UIMachine::sigMousePointerShapeChange,
                this, &UIFrameBufferPrivate::sltMousePointerShapeOrPositionChange);
-    disconnect(m_pMachineView->uisession(), &UISession::sigCursorPositionChange,
+    disconnect(m_pMachineView->uimachine(), &UIMachine::sigCursorPositionChange,
                this, &UIFrameBufferPrivate::sltMousePointerShapeOrPositionChange);
 }
@@ -2143 +2144 @@
      * framebuffer cursor if mouse integration is supported and enabled. */
     if (   !m_cursorRectangle.isNull()
-        && !m_pMachineView->uisession()->isHidingHostPointer()
-        && m_pMachineView->uisession()->isValidPointerShapePresent()
-        && m_pMachineView->uisession()->isValidCursorPositionPresent()
-        && (   !m_pMachineView->uisession()->isMouseIntegrated()
-            || !m_pMachineView->uisession()->isMouseSupportsAbsolute()))
+        && !m_pMachineView->uimachine()->isHidingHostPointer()
+        && m_pMachineView->uimachine()->isValidPointerShapePresent()
+        && m_pMachineView->uimachine()->isValidCursorPositionPresent()
+        && (   !m_pMachineView->uimachine()->isMouseIntegrated()
+            || !m_pMachineView->uimachine()->isMouseSupportsAbsolute()))
     {
         /* Acquire session cursor shape pixmap: */
-        QPixmap cursorPixmap = m_pMachineView->uisession()->cursorShapePixmap();
+        QPixmap cursorPixmap = m_pMachineView->uimachine()->cursorShapePixmap();
 
         /* Take the device-pixel-ratio into account: */
@@ -2253 +2254 @@
      * framebuffer cursor if mouse integration is supported and enabled. */
     if (   !m_cursorRectangle.isNull()
-        && !m_pMachineView->uisession()->isHidingHostPointer()
-        && m_pMachineView->uisession()->isValidPointerShapePresent()
-        && m_pMachineView->uisession()->isValidCursorPositionPresent()
-        && (   !m_pMachineView->uisession()->isMouseIntegrated()
-            || !m_pMachineView->uisession()->isMouseSupportsAbsolute()))
+        && !m_pMachineView->uimachine()->isHidingHostPointer()
+        && m_pMachineView->uimachine()->isValidPointerShapePresent()
+        && m_pMachineView->uimachine()->isValidCursorPositionPresent()
+        && (   !m_pMachineView->uimachine()->isMouseIntegrated()
+            || !m_pMachineView->uimachine()->isMouseSupportsAbsolute()))
     {
         /* Acquire session cursor shape pixmap: */
-        QPixmap cursorPixmap = m_pMachineView->uisession()->cursorShapePixmap();
+        QPixmap cursorPixmap = m_pMachineView->uimachine()->cursorShapePixmap();
 
         /* Take the device-pixel-ratio into account: */

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

@@ -1181 +1181 @@
         setStateIcon(4, UIIconPool::iconSet(":/mouse_can_seamless_uncaptured_16px.png"));
         /* Configure connection: */
-        connect(pSession, &UISession::sigMouseStateChange,
+        connect(m_pMachine, &UIMachine::sigMouseStateChange,
                 this, static_cast<void(UIIndicatorMouse::*)(int)>(&UIIndicatorMouse::setState));
-        setState(pSession->mouseState());
+        setState(m_pMachine->mouseState());
         /* Translate finally: */
         retranslateUi();

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

@@ -1430 +1430 @@
         {
             releaseKeyboard();
-            if (!uisession()->isMouseSupportsAbsolute() || !uisession()->isMouseIntegrated())
+            if (!uimachine()->isMouseSupportsAbsolute() || !uimachine()->isMouseIntegrated())
                 machineLogic()->mouseHandler()->releaseMouse();
         }
@@ -1563 +1563 @@
                 {
                     /* Determine whether the mouse can be captured: */
-                    bool fCaptureMouse =    !uisession()->isMouseSupportsAbsolute()
-                                         || !uisession()->isMouseIntegrated();
+                    bool fCaptureMouse =    !uimachine()->isMouseSupportsAbsolute()
+                                         || !uimachine()->isMouseIntegrated();
 
                     if (m_fIsKeyboardCaptured)

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

@@ -26 +26 @@
  */
 
+/* Qt includes: */
+#ifdef VBOX_WS_WIN
+# include <QBitmap>
+#endif
+
 /* GUI includes: */
 #include "UICommon.h"
@@ -214 +219 @@
 }
 
+void UIMachine::sltMousePointerShapeChange(const UIMousePointerShapeData &shapeData)
+{
+    LogRelFlow(("GUI: UIMachine::sltMousePointerShapeChange: "
+                "Is visible: %s, Has alpha: %s, "
+                "Hot spot: %dx%d, Shape size: %dx%d, "
+                "Shape data: %s\n",
+                shapeData.isVisible() ? "TRUE" : "FALSE",
+                shapeData.hasAlpha() ? "TRUE" : "FALSE",
+                shapeData.hotSpot().x(), shapeData.hotSpot().y(),
+                shapeData.shapeSize().width(), shapeData.shapeSize().height(),
+                shapeData.shape().isEmpty() ? "EMPTY" : "PRESENT"));
+
+    /* In case if shape itself is present: */
+    if (shapeData.shape().size() > 0)
+    {
+        /* We are ignoring visibility flag: */
+        m_fIsHidingHostPointer = false;
+
+        /* And updating current shape data: */
+        m_shapeData = shapeData;
+        updateMousePointerShape();
+    }
+    /* In case if shape itself is NOT present: */
+    else
+    {
+        /* Remember if we should hide the cursor: */
+        m_fIsHidingHostPointer = !shapeData.isVisible();
+    }
+
+    /* Notify listeners: */
+    emit sigMousePointerShapeChange();
+}
+
+void UIMachine::sltMouseCapabilityChange(bool fSupportsAbsolute, bool fSupportsRelative,
+                                         bool fSupportsTouchScreen, bool fSupportsTouchPad,
+                                         bool fNeedsHostCursor)
+{
+    LogRelFlow(("GUI: UIMachine::sltMouseCapabilityChange: "
+                "Supports absolute: %s, Supports relative: %s, "
+                "Supports touchscreen: %s, Supports touchpad: %s, "
+                "Needs host cursor: %s\n",
+                fSupportsAbsolute ? "TRUE" : "FALSE", fSupportsRelative ? "TRUE" : "FALSE",
+                fSupportsTouchScreen ? "TRUE" : "FALSE", fSupportsTouchPad ? "TRUE" : "FALSE",
+                fNeedsHostCursor ? "TRUE" : "FALSE"));
+
+    /* Check if something had changed: */
+    if (   m_fIsMouseSupportsAbsolute != fSupportsAbsolute
+        || m_fIsMouseSupportsRelative != fSupportsRelative
+        || m_fIsMouseSupportsTouchScreen != fSupportsTouchScreen
+        || m_fIsMouseSupportsTouchPad != fSupportsTouchPad
+        || m_fIsMouseHostCursorNeeded != fNeedsHostCursor)
+    {
+        /* Store new data: */
+        m_fIsMouseSupportsAbsolute = fSupportsAbsolute;
+        m_fIsMouseSupportsRelative = fSupportsRelative;
+        m_fIsMouseSupportsTouchScreen = fSupportsTouchScreen;
+        m_fIsMouseSupportsTouchPad = fSupportsTouchPad;
+        m_fIsMouseHostCursorNeeded = fNeedsHostCursor;
+
+        /* Notify listeners: */
+        emit sigMouseCapabilityChange();
+    }
+}
+
+void UIMachine::sltCursorPositionChange(bool fContainsData, unsigned long uX, unsigned long uY)
+{
+    LogRelFlow(("GUI: UIMachine::sltCursorPositionChange: "
+                "Cursor position valid: %d, Cursor position: %dx%d\n",
+                fContainsData ? "TRUE" : "FALSE", uX, uY));
+
+    /* Check if something had changed: */
+    if (   m_fIsValidCursorPositionPresent != fContainsData
+        || m_cursorPosition.x() != (int)uX
+        || m_cursorPosition.y() != (int)uY)
+    {
+        /* Store new data: */
+        m_fIsValidCursorPositionPresent = fContainsData;
+        m_cursorPosition = QPoint(uX, uY);
+
+        /* Notify listeners: */
+        emit sigCursorPositionChange();
+    }
+}
+
 UIMachine::UIMachine()
     : QObject(0)
@@ -223 +312 @@
     , m_pMachineLogic(0)
     , m_pMachineWindowIcon(0)
+    , m_fIsHidingHostPointer(true)
+    , m_fIsValidPointerShapePresent(false)
+    , m_fIsValidCursorPositionPresent(false)
+    , m_fIsMouseSupportsAbsolute(false)
+    , m_fIsMouseSupportsRelative(false)
+    , m_fIsMouseSupportsTouchScreen(false)
+    , m_fIsMouseSupportsTouchPad(false)
+    , m_fIsMouseHostCursorNeeded(false)
+    , m_fIsMouseCaptured(false)
+    , m_fIsMouseIntegrated(true)
+    , m_iMouseState(0)
 {
     m_spInstance = this;
@@ -246 +346 @@
 
     /* Prepare stuff: */
+    prepareSessionConnections();
     prepareMachineWindowIcon();
     prepareMachineLogic();
@@ -256 +357 @@
         return false;
 
+    /* Update stuff: */
+    updateMouseState();
+
     /* True by default: */
     return true;
+}
+
+void UIMachine::prepareSessionConnections()
+{
+    connect(uisession(), &UISession::sigMousePointerShapeChange,
+            this, &UIMachine::sltMousePointerShapeChange);
+    connect(uisession(), &UISession::sigMouseCapabilityChange,
+            this, &UIMachine::sltMouseCapabilityChange);
+    connect(uisession(), &UISession::sigCursorPositionChange,
+            this, &UIMachine::sltCursorPositionChange);
 }
 
@@ -362 +476 @@
     sltChangeVisualState(m_initialVisualState);
 }
+
+void UIMachine::updateMousePointerShape()
+{
+    /* Fetch incoming shape data: */
+    const bool fHasAlpha = m_shapeData.hasAlpha();
+    const uint uWidth = m_shapeData.shapeSize().width();
+    const uint uHeight = m_shapeData.shapeSize().height();
+    const uchar *pShapeData = m_shapeData.shape().constData();
+    AssertMsgReturnVoid(pShapeData, ("Shape data must not be NULL!\n"));
+
+    /* Invalidate mouse pointer shape initially: */
+    m_fIsValidPointerShapePresent = false;
+    m_cursorShapePixmap = QPixmap();
+    m_cursorMaskPixmap = QPixmap();
+
+    /* Parse incoming shape data: */
+    const uchar *pSrcAndMaskPtr = pShapeData;
+    const uint uAndMaskSize = (uWidth + 7) / 8 * uHeight;
+    const uchar *pSrcShapePtr = pShapeData + ((uAndMaskSize + 3) & ~3);
+
+#if defined (VBOX_WS_WIN)
+
+    /* Create an ARGB image out of the shape data: */
+
+    // WORKAROUND:
+    // Qt5 QCursor recommends 32 x 32 cursor, therefore the original data is copied to
+    // a larger QImage if necessary. Cursors like 10x16 did not work correctly (Solaris 10 guest).
+    // Align the cursor dimensions to 32 bit pixels, because for example a 56x56 monochrome cursor
+    // did not work correctly on Windows host.
+    const uint uCursorWidth = RT_ALIGN_32(uWidth, 32);
+    const uint uCursorHeight = RT_ALIGN_32(uHeight, 32);
+
+    if (fHasAlpha)
+    {
+        QImage image(uCursorWidth, uCursorHeight, QImage::Format_ARGB32);
+        memset(image.bits(), 0, image.byteCount());
+
+        const uint32_t *pu32SrcShapeScanline = (uint32_t *)pSrcShapePtr;
+        for (uint y = 0; y < uHeight; ++y, pu32SrcShapeScanline += uWidth)
+            memcpy(image.scanLine(y), pu32SrcShapeScanline, uWidth * sizeof(uint32_t));
+
+        m_cursorShapePixmap = QPixmap::fromImage(image);
+    }
+    else
+    {
+        if (isPointer1bpp(pSrcShapePtr, uWidth, uHeight))
+        {
+            // Incoming data consist of 32 bit BGR XOR mask and 1 bit AND mask.
+            // XOR pixels contain either 0x00000000 or 0x00FFFFFF.
+            //
+            // Originally intended result (F denotes 0x00FFFFFF):
+            // XOR AND
+            //   0   0 black
+            //   F   0 white
+            //   0   1 transparent
+            //   F   1 xor'd
+            //
+            // Actual Qt5 result for color table 0:0xFF000000, 1:0xFFFFFFFF
+            // (tested on Windows 7 and 10 64 bit hosts):
+            // Bitmap Mask
+            //  0   0 black
+            //  1   0 white
+            //  0   1 xor
+            //  1   1 transparent
+
+            QVector<QRgb> colors(2);
+            colors[0] = UINT32_C(0xFF000000);
+            colors[1] = UINT32_C(0xFFFFFFFF);
+
+            QImage bitmap(uCursorWidth, uCursorHeight, QImage::Format_Mono);
+            bitmap.setColorTable(colors);
+            memset(bitmap.bits(), 0xFF, bitmap.byteCount());
+
+            QImage mask(uCursorWidth, uCursorHeight, QImage::Format_Mono);
+            mask.setColorTable(colors);
+            memset(mask.bits(), 0xFF, mask.byteCount());
+
+            const uint8_t *pu8SrcAndScanline = pSrcAndMaskPtr;
+            const uint32_t *pu32SrcShapeScanline = (uint32_t *)pSrcShapePtr;
+            for (uint y = 0; y < uHeight; ++y)
+            {
+                for (uint x = 0; x < uWidth; ++x)
+                {
+                    const uint8_t u8Bit = (uint8_t)(1 << (7 - x % 8));
+
+                    const uint8_t u8SrcMaskByte = pu8SrcAndScanline[x / 8];
+                    const uint8_t u8SrcMaskBit = u8SrcMaskByte & u8Bit;
+                    const uint32_t u32SrcPixel = pu32SrcShapeScanline[x] & UINT32_C(0xFFFFFF);
+
+                    uint8_t *pu8DstMaskByte = &mask.scanLine(y)[x / 8];
+                    uint8_t *pu8DstBitmapByte = &bitmap.scanLine(y)[x / 8];
+
+                    if (u8SrcMaskBit == 0)
+                    {
+                        if (u32SrcPixel == 0)
+                        {
+                            /* Black: Qt Bitmap = 0, Mask = 0 */
+                            *pu8DstMaskByte &= ~u8Bit;
+                            *pu8DstBitmapByte &= ~u8Bit;
+                        }
+                        else
+                        {
+                            /* White: Qt Bitmap = 1, Mask = 0 */
+                            *pu8DstMaskByte &= ~u8Bit;
+                            *pu8DstBitmapByte |= u8Bit;
+                        }
+                    }
+                    else
+                    {
+                        if (u32SrcPixel == 0)
+                        {
+                            /* Transparent: Qt Bitmap = 1, Mask = 1 */
+                            *pu8DstMaskByte |= u8Bit;
+                            *pu8DstBitmapByte |= u8Bit;
+                        }
+                        else
+                        {
+                            /* Xor'ed: Qt Bitmap = 0, Mask = 1 */
+                            *pu8DstMaskByte |= u8Bit;
+                            *pu8DstBitmapByte &= ~u8Bit;
+                        }
+                    }
+                }
+
+                pu8SrcAndScanline += (uWidth + 7) / 8;
+                pu32SrcShapeScanline += uWidth;
+            }
+
+            m_cursorShapePixmap = QBitmap::fromImage(bitmap);
+            m_cursorMaskPixmap = QBitmap::fromImage(mask);
+        }
+        else
+        {
+            /* Assign alpha channel values according to the AND mask: 1 -> 0x00, 0 -> 0xFF: */
+            QImage image(uCursorWidth, uCursorHeight, QImage::Format_ARGB32);
+            memset(image.bits(), 0, image.byteCount());
+
+            const uint8_t *pu8SrcAndScanline = pSrcAndMaskPtr;
+            const uint32_t *pu32SrcShapeScanline = (uint32_t *)pSrcShapePtr;
+
+            for (uint y = 0; y < uHeight; ++y)
+            {
+                uint32_t *pu32DstPixel = (uint32_t *)image.scanLine(y);
+
+                for (uint x = 0; x < uWidth; ++x)
+                {
+                    const uint8_t u8Bit = (uint8_t)(1 << (7 - x % 8));
+                    const uint8_t u8SrcMaskByte = pu8SrcAndScanline[x / 8];
+
+                    if (u8SrcMaskByte & u8Bit)
+                        *pu32DstPixel++ = pu32SrcShapeScanline[x] & UINT32_C(0x00FFFFFF);
+                    else
+                        *pu32DstPixel++ = pu32SrcShapeScanline[x] | UINT32_C(0xFF000000);
+                }
+
+                pu32SrcShapeScanline += uWidth;
+                pu8SrcAndScanline += (uWidth + 7) / 8;
+            }
+
+            m_cursorShapePixmap = QPixmap::fromImage(image);
+        }
+    }
+
+    /* Mark mouse pointer shape valid: */
+    m_fIsValidPointerShapePresent = true;
+
+#elif defined(VBOX_WS_X11) || defined(VBOX_WS_MAC)
+
+    /* Create an ARGB image out of the shape data: */
+    QImage image(uWidth, uHeight, QImage::Format_ARGB32);
+
+    if (fHasAlpha)
+    {
+        memcpy(image.bits(), pSrcShapePtr, uHeight * uWidth * 4);
+    }
+    else
+    {
+        renderCursorPixels((uint32_t *)pSrcShapePtr, pSrcAndMaskPtr,
+                           uWidth, uHeight,
+                           (uint32_t *)image.bits(), uHeight * uWidth * 4);
+    }
+
+    /* Create cursor-pixmap from the image: */
+    m_cursorShapePixmap = QPixmap::fromImage(image);
+
+    /* Mark mouse pointer shape valid: */
+    m_fIsValidPointerShapePresent = true;
+
+#else
+
+# warning "port me"
+
+#endif
+
+    /* Cache cursor pixmap size and hotspot: */
+    m_cursorSize = m_cursorShapePixmap.size();
+    m_cursorHotspot = m_shapeData.hotSpot();
+}
+
+void UIMachine::updateMouseState()
+{
+    m_fIsMouseSupportsAbsolute = uisession()->mouse().GetAbsoluteSupported();
+    m_fIsMouseSupportsRelative = uisession()->mouse().GetRelativeSupported();
+    m_fIsMouseSupportsTouchScreen = uisession()->mouse().GetTouchScreenSupported();
+    m_fIsMouseSupportsTouchPad = uisession()->mouse().GetTouchPadSupported();
+    m_fIsMouseHostCursorNeeded = uisession()->mouse().GetNeedsHostCursor();
+}
+
+#if defined(VBOX_WS_X11) || defined(VBOX_WS_MAC)
+/* static */
+void UIMachine::renderCursorPixels(const uint32_t *pu32XOR, const uint8_t *pu8AND,
+                                   uint32_t u32Width, uint32_t u32Height,
+                                   uint32_t *pu32Pixels, uint32_t cbPixels)
+{
+    /* Output pixels set to 0 which allow to not write transparent pixels anymore. */
+    memset(pu32Pixels, 0, cbPixels);
+
+    const uint32_t *pu32XORSrc = pu32XOR;  /* Iterator for source XOR pixels. */
+    const uint8_t *pu8ANDSrcLine = pu8AND; /* The current AND mask scanline. */
+    uint32_t *pu32Dst = pu32Pixels;        /* Iterator for all destination BGRA pixels. */
+
+    /* Some useful constants. */
+    const int cbANDLine = ((int)u32Width + 7) / 8;
+
+    int y;
+    for (y = 0; y < (int)u32Height; ++y)
+    {
+        int x;
+        for (x = 0; x < (int)u32Width; ++x)
+        {
+            const uint32_t u32Pixel = *pu32XORSrc; /* Current pixel at (x,y) */
+            const uint8_t *pu8ANDSrc = pu8ANDSrcLine + x / 8; /* Byte which containt current AND bit. */
+
+            if ((*pu8ANDSrc << (x % 8)) & 0x80)
+            {
+                if (u32Pixel)
+                {
+                    const uint32_t u32PixelInverted = ~u32Pixel;
+
+                    /* Scan neighbor pixels and assign them if they are transparent. */
+                    int dy;
+                    for (dy = -1; dy <= 1; ++dy)
+                    {
+                        const int yn = y + dy;
+                        if (yn < 0 || yn >= (int)u32Height)
+                            continue; /* Do not cross the bounds. */
+
+                        int dx;
+                        for (dx = -1; dx <= 1; ++dx)
+                        {
+                            const int xn = x + dx;
+                            if (xn < 0 || xn >= (int)u32Width)
+                                continue;  /* Do not cross the bounds. */
+
+                            if (dx != 0 || dy != 0)
+                            {
+                                /* Check if the neighbor pixel is transparent. */
+                                const uint32_t *pu32XORNeighborSrc = &pu32XORSrc[dy * (int)u32Width + dx];
+                                const uint8_t *pu8ANDNeighborSrc = pu8ANDSrcLine + dy * cbANDLine + xn / 8;
+                                if (   *pu32XORNeighborSrc == 0
+                                    && ((*pu8ANDNeighborSrc << (xn % 8)) & 0x80) != 0)
+                                {
+                                    /* Transparent neighbor pixels are replaced with the source pixel value. */
+                                    uint32_t *pu32PixelNeighborDst = &pu32Dst[dy * (int)u32Width + dx];
+                                    *pu32PixelNeighborDst = u32Pixel | 0xFF000000;
+                                }
+                            }
+                            else
+                            {
+                                /* The pixel itself is replaced with inverted value. */
+                                *pu32Dst = u32PixelInverted | 0xFF000000;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    /* The pixel does not affect the screen.
+                     * Do nothing. Do not touch destination which can already contain generated pixels.
+                     */
+                }
+            }
+            else
+            {
+                /* AND bit is 0, the pixel will be just drawn. */
+                *pu32Dst = u32Pixel | 0xFF000000;
+            }
+
+            ++pu32XORSrc; /* Next source pixel. */
+            ++pu32Dst;    /* Next destination pixel. */
+        }
+
+        /* Next AND scanline. */
+        pu8ANDSrcLine += cbANDLine;
+    }
+}
+#endif /* VBOX_WS_X11 || VBOX_WS_MAC */
+
+#ifdef VBOX_WS_WIN
+/* static */
+bool UIMachine::isPointer1bpp(const uint8_t *pu8XorMask,
+                              uint uWidth,
+                              uint uHeight)
+{
+    /* Check if the pointer has only 0 and 0xFFFFFF pixels, ignoring the alpha channel. */
+    const uint32_t *pu32Src = (uint32_t *)pu8XorMask;
+
+    uint y;
+    for (y = 0; y < uHeight ; ++y)
+    {
+        uint x;
+        for (x = 0; x < uWidth; ++x)
+        {
+            const uint32_t u32Pixel = pu32Src[x] & UINT32_C(0xFFFFFF);
+            if (u32Pixel != 0 && u32Pixel != UINT32_C(0xFFFFFF))
+                return false;
+        }
+
+        pu32Src += uWidth;
+    }
+
+    return true;
+}
+#endif /* VBOX_WS_WIN */

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

@@ -34 +34 @@
 /* Qt includes: */
 #include <QObject>
+#include <QPixmap>
 
 /* GUI includes: */
 #include "UIExtraDataDefs.h"
 #include "UIMachineDefs.h"
+#include "UIMousePointerShapeData.h"
 
 /* COM includes: */
@@ -57 +59 @@
     /** Requests async visual-state change. */
     void sigRequestAsyncVisualStateChange(UIVisualStateType visualStateType);
+
+    /** @name Mouse cursor stuff.
+     ** @{ */
+        /** Notifies listeners about mouse pointer shape change. */
+        void sigMousePointerShapeChange();
+        /** Notifies listeners about mouse capability change. */
+        void sigMouseCapabilityChange();
+        /** Notifies listeners about cursor position change. */
+        void sigCursorPositionChange();
+
+        /** Notifies listeners about mouse state-change. */
+        void sigMouseStateChange(int iState);
+    /** @} */
 
 public:
@@ -98 +113 @@
     /** @} */
 
+    /** @name Mouse cursor stuff.
+     ** @{ */
+        /** Returns whether we should hide host mouse pointer. */
+        bool isHidingHostPointer() const { return m_fIsHidingHostPointer; }
+        /** Returns whether there is valid mouse pointer shape present. */
+        bool isValidPointerShapePresent() const { return m_fIsValidPointerShapePresent; }
+        /** Returns whether the @a cursorPosition() is valid and could be used by the GUI now. */
+        bool isValidCursorPositionPresent() const { return m_fIsValidCursorPositionPresent; }
+
+        /** Returns whether mouse supports absolute coordinates. */
+        bool isMouseSupportsAbsolute() const { return m_fIsMouseSupportsAbsolute; }
+        /** Returns whether mouse supports relative coordinates. */
+        bool isMouseSupportsRelative() const { return m_fIsMouseSupportsRelative; }
+        /** Returns whether touch screen is supported. */
+        bool isMouseSupportsTouchScreen() const { return m_fIsMouseSupportsTouchScreen; }
+        /** Returns whether touch pad is supported. */
+        bool isMouseSupportsTouchPad() const { return m_fIsMouseSupportsTouchPad; }
+        /** Returns whether guest requires host cursor to be shown. */
+        bool isMouseHostCursorNeeded() const { return m_fIsMouseHostCursorNeeded; }
+
+        /** Returns whether mouse is captured. */
+        bool isMouseCaptured() const { return m_fIsMouseCaptured; }
+        /** Returns whether mouse is integrated. */
+        bool isMouseIntegrated() const { return m_fIsMouseIntegrated; }
+        /** Defines whether mouse is @a fCaptured. */
+        void setMouseCaptured(bool fCaptured) { m_fIsMouseCaptured = fCaptured; }
+        /** Defines whether mouse is @a fIntegrated. */
+        void setMouseIntegrated(bool fIntegrated) { m_fIsMouseIntegrated = fIntegrated; }
+
+        /** 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; }
+        /** Returns currently cached mouse cursor hotspot. */
+        QPoint cursorHotspot() const { return m_cursorHotspot; }
+        /** Returns currently cached mouse cursor position. */
+        QPoint cursorPosition() const { return m_cursorPosition; }
+
+        /** Returns mouse-state. */
+        int mouseState() const { return m_iMouseState; }
+    /** @} */
+
 public slots:
+
+    /** @name Mouse cursor stuff.
+     ** @{ */
+        /** Defines @a iMouseState. */
+        void setMouseState(int iMouseState) { m_iMouseState = iMouseState; emit sigMouseStateChange(m_iMouseState); }
+    /** @} */
 
     /** Closes Runtime UI. */
@@ -107 +172 @@
     /** Visual state-change handler. */
     void sltChangeVisualState(UIVisualStateType visualStateType);
+
+    /** @name Mouse cursor stuff.
+     ** @{ */
+        /** Handles signal about mouse pointer shape data change.
+          * @param  shapeData  Brings complex struct describing mouse pointer shape aspects. */
+        void sltMousePointerShapeChange(const UIMousePointerShapeData &shapeData);
+        /** Handles signal about mouse capability change.
+          * @param  fSupportsAbsolute     Brings whether mouse supports absolute coordinates.
+          * @param  fSupportsRelative     Brings whether mouse supports relative coordinates.
+          * @param  fSupportsTouchScreen  Brings whether touch screen is supported.
+          * @param  fSupportsTouchPad     Brings whether touch pad is supported.
+          * @param  fNeedsHostCursor      Brings whether guest requires host cursor to be shown. */
+        void sltMouseCapabilityChange(bool fSupportsAbsolute, bool fSupportsRelative,
+                                      bool fSupportsTouchScreen, bool fSupportsTouchPad,
+                                      bool fNeedsHostCursor);
+        /** Handles signal about guest request to change the cursor position to @a uX * @a uY.
+          * @param  fContainsData  Brings whether the @a uX and @a uY values are valid and could be used by the GUI now.
+          * @param  uX             Brings cursor position X origin.
+          * @param  uY             Brings cursor position Y origin. */
+        void sltCursorPositionChange(bool fContainsData,
+                                     unsigned long uX,
+                                     unsigned long uY);
+    /** @} */
 
 private:
@@ -117 +205 @@
     /** Prepare routine. */
     bool prepare();
+    /** Prepare routine: Session connection stuff. */
+    void prepareSessionConnections();
     /** Prepare routine: Machine-window icon. */
     void prepareMachineWindowIcon();
@@ -136 +226 @@
     /** Moves VM to initial state. */
     void enterInitialVisualState();
+
+    /** @name Mouse cursor stuff.
+     ** @{ */
+        /** Updates mouse pointer shape. */
+        void updateMousePointerShape();
+
+        /** Updates mouse states. */
+        void updateMouseState();
+
+#if defined(VBOX_WS_X11) || defined(VBOX_WS_MAC)
+        /** Generate a BGRA bitmap which approximates a XOR/AND mouse pointer.
+          *
+          * Pixels which has 1 in the AND mask and not 0 in the XOR mask are replaced by
+          * the inverted pixel and 8 surrounding pixels with the original color.
+          * Fort example a white pixel (W) is replaced with a black (B) pixel:
+          *         WWW
+          *  W   -> WBW
+          *         WWW
+          * The surrounding pixels are written only if the corresponding source pixel
+          * does not affect the screen, i.e. AND bit is 1 and XOR value is 0. */
+        static void renderCursorPixels(const uint32_t *pu32XOR, const uint8_t *pu8AND,
+                                       uint32_t u32Width, uint32_t u32Height,
+                                       uint32_t *pu32Pixels, uint32_t cbPixels);
+#endif /* VBOX_WS_X11 || VBOX_WS_MAC */
+
+#ifdef VBOX_WS_WIN
+        static bool isPointer1bpp(const uint8_t *pu8XorMask,
+                                  uint uWidth,
+                                  uint uHeight);
+#endif /* VBOX_WS_WIN */
+    /** @} */
 
     /** Static instance. */
@@ -164 +285 @@
 #endif
     /** @} */
+
+    /** @name Mouse cursor stuff.
+     ** @{ */
+        /** Holds whether we should hide host mouse pointer. */
+        bool  m_fIsHidingHostPointer;
+        /** Holds whether there is valid mouse pointer shape present. */
+        bool  m_fIsValidPointerShapePresent;
+        /** Holds whether the @a m_cursorPosition is valid and could be used by the GUI now. */
+        bool  m_fIsValidCursorPositionPresent;
+
+        /** Holds whether mouse supports absolute coordinates. */
+        bool  m_fIsMouseSupportsAbsolute;
+        /** Holds whether mouse supports relative coordinates. */
+        bool  m_fIsMouseSupportsRelative;
+        /** Holds whether touch screen is supported. */
+        bool  m_fIsMouseSupportsTouchScreen;
+        /** Holds whether touch pad is supported. */
+        bool  m_fIsMouseSupportsTouchPad;
+        /** Holds whether guest requires host cursor to be shown. */
+        bool  m_fIsMouseHostCursorNeeded;
+
+        /** Holds whether mouse is captured. */
+        bool  m_fIsMouseCaptured;
+        /** Holds whether mouse is integrated. */
+        bool  m_fIsMouseIntegrated;
+
+        /** Holds the mouse pointer shape data. */
+        UIMousePointerShapeData  m_shapeData;
+
+        /** 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;
+        /** Holds cached mouse cursor hotspot. */
+        QPoint   m_cursorHotspot;
+        /** Holds cached mouse cursor position. */
+        QPoint   m_cursorPosition;
+
+        /** Holds the mouse-state. */
+        int  m_iMouseState;
+    /** @} */
 };
 

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

@@ -592 +592 @@
 {
     /* Variable falgs: */
-    bool fIsMouseSupportsAbsolute = uisession()->isMouseSupportsAbsolute();
-    bool fIsMouseSupportsRelative = uisession()->isMouseSupportsRelative();
-    bool fIsMouseSupportsTouchScreen = uisession()->isMouseSupportsTouchScreen();
-    bool fIsMouseSupportsTouchPad = uisession()->isMouseSupportsTouchPad();
-    bool fIsMouseHostCursorNeeded = uisession()->isMouseHostCursorNeeded();
+    bool fIsMouseSupportsAbsolute = uimachine()->isMouseSupportsAbsolute();
+    bool fIsMouseSupportsRelative = uimachine()->isMouseSupportsRelative();
+    bool fIsMouseSupportsTouchScreen = uimachine()->isMouseSupportsTouchScreen();
+    bool fIsMouseSupportsTouchPad = uimachine()->isMouseSupportsTouchPad();
+    bool fIsMouseHostCursorNeeded = uimachine()->isMouseHostCursorNeeded();
 
     /* For now MT stuff is not important for MI action: */
@@ -822 +822 @@
     /* Connect to session: */
     connect(m_pMouseHandler, &UIMouseHandler::sigStateChange,
-            uisession(), &UISession::setMouseState);
+            uimachine(), &UIMachine::setMouseState);
 }
 
@@ -888 +888 @@
     connect(uisession(), &UISession::sigMachineStateChange, this, &UIMachineLogic::sltMachineStateChanged);
     connect(uisession(), &UISession::sigAdditionsStateActualChange, this, &UIMachineLogic::sltAdditionsStateChanged);
-    connect(uisession(), &UISession::sigMouseCapabilityChange, this, &UIMachineLogic::sltMouseCapabilityChanged);
+    connect(uimachine(), &UIMachine::sigMouseCapabilityChange, this, &UIMachineLogic::sltMouseCapabilityChanged);
     connect(uisession(), &UISession::sigKeyboardLedsChange, this, &UIMachineLogic::sltKeyboardLedsChanged);
     connect(uisession(), &UISession::sigUSBDeviceStateChange, this, &UIMachineLogic::sltUSBDeviceStateChange);
@@ -1149 +1149 @@
     /* Update UI session values with current: */
     uisession()->setKeyboardState(keyboardHandler()->state());
-    uisession()->setMouseState(mouseHandler()->state());
+    uimachine()->setMouseState(mouseHandler()->state());
 }
 
@@ -1438 +1438 @@
     disconnect(uisession(), &UISession::sigMachineStateChange, this, &UIMachineLogic::sltMachineStateChanged);
     disconnect(uisession(), &UISession::sigAdditionsStateActualChange, this, &UIMachineLogic::sltAdditionsStateChanged);
-    disconnect(uisession(), &UISession::sigMouseCapabilityChange, this, &UIMachineLogic::sltMouseCapabilityChanged);
+    disconnect(uimachine(), &UIMachine::sigMouseCapabilityChange, this, &UIMachineLogic::sltMouseCapabilityChanged);
     disconnect(uisession(), &UISession::sigKeyboardLedsChange, this, &UIMachineLogic::sltKeyboardLedsChanged);
     disconnect(uisession(), &UISession::sigUSBDeviceStateChange, this, &UIMachineLogic::sltUSBDeviceStateChange);

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

@@ -1118 +1118 @@
 {
     /* Fetch the shape and the mask: */
-    QPixmap pixmapShape = uisession()->cursorShapePixmap();
-    QPixmap pixmapMask = uisession()->cursorMaskPixmap();
-    const QPoint hotspot = uisession()->cursorHotspot();
+    QPixmap pixmapShape = uimachine()->cursorShapePixmap();
+    QPixmap pixmapMask = uimachine()->cursorMaskPixmap();
+    const QPoint hotspot = uimachine()->cursorHotspot();
     uint uXHot = hotspot.x();
     uint uYHot = hotspot.y();
@@ -1387 +1387 @@
     connect(uisession(), &UISession::sigMachineStateChange, this, &UIMachineView::sltMachineStateChanged);
     /* Mouse pointer shape updater: */
-    connect(uisession(), &UISession::sigMousePointerShapeChange, this, &UIMachineView::sltMousePointerShapeChange);
+    connect(uimachine(), &UIMachine::sigMousePointerShapeChange, this, &UIMachineView::sltMousePointerShapeChange);
 }
 

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

@@ -162 +162 @@
 {
     /* Do not try to capture mouse if its captured already: */
-    if (uisession()->isMouseCaptured())
+    if (uimachine()->isMouseCaptured())
         return;
 
@@ -169 +169 @@
     {
         /* Store mouse-capturing state value: */
-        uisession()->setMouseCaptured(true);
+        uimachine()->setMouseCaptured(true);
 
         /* Memorize the index of machine-view-viewport captured mouse: */
@@ -212 +212 @@
 {
     /* Do not try to release mouse if its released already: */
-    if (!uisession()->isMouseCaptured())
+    if (!uimachine()->isMouseCaptured())
         return;
 
@@ -219 +219 @@
     {
         /* Store mouse-capturing state value: */
-        uisession()->setMouseCaptured(false);
+        uimachine()->setMouseCaptured(false);
 
         /* Return the cursor to where it was when we captured it: */
@@ -245 +245 @@
 {
     /* Do not do anything if its already done: */
-    if (uisession()->isMouseIntegrated() == fEnabled)
+    if (uimachine()->isMouseIntegrated() == fEnabled)
         return;
 
     /* Store mouse-integration state value: */
-    uisession()->setMouseIntegrated(fEnabled);
+    uimachine()->setMouseIntegrated(fEnabled);
 
     /* Reuse sltMouseCapabilityChanged() to update mouse state: */
@@ -258 +258 @@
 int UIMouseHandler::state() const
 {
-    return (uisession()->isMouseCaptured() ? UIMouseStateType_MouseCaptured : 0) |
-           (uisession()->isMouseSupportsAbsolute() ? UIMouseStateType_MouseAbsolute : 0) |
-           (uisession()->isMouseIntegrated() ? 0 : UIMouseStateType_MouseAbsoluteDisabled);
+    return (uimachine()->isMouseCaptured() ? UIMouseStateType_MouseCaptured : 0) |
+           (uimachine()->isMouseSupportsAbsolute() ? UIMouseStateType_MouseAbsolute : 0) |
+           (uimachine()->isMouseIntegrated() ? 0 : UIMouseStateType_MouseAbsoluteDisabled);
 }
 
@@ -327 +327 @@
         {
             /* Do nothing if mouse is actively grabbed: */
-            if (uisession()->isMouseCaptured())
+            if (uimachine()->isMouseCaptured())
                 break;
 
@@ -404 +404 @@
 {
     /* If mouse supports absolute pointing and mouse-integration activated: */
-    if (uisession()->isMouseSupportsAbsolute() && uisession()->isMouseIntegrated())
+    if (uimachine()->isMouseSupportsAbsolute() && uimachine()->isMouseIntegrated())
     {
         /* Release the mouse: */
@@ -448 +448 @@
         /* Do not annoy user while restoring VM: */
         if (uisession()->machineState() != KMachineState_Restoring)
-            UINotificationMessage::remindAboutMouseIntegration(uisession()->isMouseSupportsAbsolute());
+            UINotificationMessage::remindAboutMouseIntegration(uimachine()->isMouseSupportsAbsolute());
     }
 
@@ -462 +462 @@
      * 1. mouse is 'captured' or
      * 2. machine is NOT 'paused' and mouse is NOT 'captured' and 'integrated' and 'absolute' but host pointer is 'hidden' by the guest. */
-    if (uisession()->isMouseCaptured() ||
+    if (uimachine()->isMouseCaptured() ||
         (!uisession()->isPaused() &&
-         uisession()->isMouseIntegrated() &&
-         uisession()->isMouseSupportsAbsolute() &&
-         uisession()->isHidingHostPointer()))
+         uimachine()->isMouseIntegrated() &&
+         uimachine()->isMouseSupportsAbsolute() &&
+         uimachine()->isHidingHostPointer()))
     {
         QList<ulong> screenIds = m_viewports.keys();
@@ -478 +478 @@
      * machine is NOT 'paused', mouse is 'integrated' and 'absolute' and valid pointer shape is present. */
     if (!uisession()->isPaused() &&
-        uisession()->isMouseIntegrated() &&
-        uisession()->isMouseSupportsAbsolute() &&
-        uisession()->isValidPointerShapePresent())
+        uimachine()->isMouseIntegrated() &&
+        uimachine()->isMouseSupportsAbsolute() &&
+        uimachine()->isValidPointerShapePresent())
     {
         QList<ulong> screenIds = m_viewports.keys();
@@ -530 +530 @@
 
     /* Mouse capability state-change updater: */
-    connect(uisession(), &UISession::sigMouseCapabilityChange, this, &UIMouseHandler::sltMouseCapabilityChanged);
+    connect(uimachine(), &UIMachine::sigMouseCapabilityChange, this, &UIMouseHandler::sltMouseCapabilityChanged);
+    /* Mouse cursor position state-change updater: */
+    connect(uimachine(), &UIMachine::sigCursorPositionChange, this, &UIMouseHandler::sltMousePointerShapeChanged);
 
     /* Mouse pointer shape state-change updater: */
     connect(this, &UIMouseHandler::sigStateChange, this, &UIMouseHandler::sltMousePointerShapeChanged);
-
-    /* Mouse cursor position state-change updater: */
-    connect(uisession(), &UISession::sigCursorPositionChange, this, &UIMouseHandler::sltMousePointerShapeChanged);
 
     /* Initialize: */
@@ -709 +708 @@
                     /* Check if we should activate window under cursor: */
                     if (gEDataManager->activateHoveredMachineWindow() &&
-                        !uisession()->isMouseCaptured() &&
+                        !uimachine()->isMouseCaptured() &&
                         QApplication::activeWindow() &&
                         m_windows.values().contains(QApplication::activeWindow()) &&
@@ -758 +757 @@
                 case QEvent::TouchEnd:
                 {
-                    if (uisession()->isMouseSupportsTouchScreen() || uisession()->isMouseSupportsTouchPad())
+                    if (uimachine()->isMouseSupportsTouchScreen() || uimachine()->isMouseSupportsTouchPad())
                         return multiTouchEvent(static_cast<QTouchEvent*>(pEvent), uScreenId);
                     break;
@@ -923 +922 @@
 {
     /* Ignore fake mouse events. */
-    if (   (uisession()->isMouseSupportsTouchScreen() || uisession()->isMouseSupportsTouchPad())
+    if (   (uimachine()->isMouseSupportsTouchScreen() || uimachine()->isMouseSupportsTouchPad())
         && mouseIsTouchSource(iEventType, mouseButtons))
         return true;
@@ -967 +966 @@
         iWheelHorizontal = wheelDelta / 120;
 
-    if (uisession()->isMouseCaptured())
+    if (uimachine()->isMouseCaptured())
     {
 #ifdef VBOX_WS_WIN
@@ -1066 +1065 @@
         return true; /* stop further event handling */
     }
-    else /* !uisession()->isMouseCaptured() */
-    {
-        if (uisession()->isMouseSupportsAbsolute() && uisession()->isMouseIntegrated())
+    else /* !uimachine()->isMouseCaptured() */
+    {
+        if (uimachine()->isMouseSupportsAbsolute() && uimachine()->isMouseIntegrated())
         {
             int iCw = m_views[uScreenId]->contentsWidth(), iCh = m_views[uScreenId]->contentsHeight();
@@ -1219 +1218 @@
     /* Compatibility with previous behavior. If there is no touchpad configured
      * then treat all multitouch events as touchscreen ones: */
-    fTouchScreen |= !uisession()->isMouseSupportsTouchPad();
+    fTouchScreen |= !uimachine()->isMouseSupportsTouchPad();
 
     if (fTouchScreen)
@@ -1298 +1297 @@
         return;
 
-    if (uisession()->isMouseCaptured())
+    if (uimachine()->isMouseCaptured())
     {
         /* Get full-viewport-rectangle in global coordinates: */

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

@@ -28 +28 @@
 /* Qt includes: */
 #include <QApplication>
-#include <QBitmap>
 #include <QMenuBar>
 #include <QWidget>
@@ -218 +217 @@
     if (uiCommon().isSeparateProcess())
     {
-        m_fIsMouseSupportsAbsolute = mouse().GetAbsoluteSupported();
-        m_fIsMouseSupportsRelative = mouse().GetRelativeSupported();
-        m_fIsMouseSupportsTouchScreen = mouse().GetTouchScreenSupported();
-        m_fIsMouseSupportsTouchPad = mouse().GetTouchPadSupported();
-        m_fIsMouseHostCursorNeeded = mouse().GetNeedsHostCursor();
         sltAdditionsChange();
     }
@@ -500 +494 @@
 }
 #endif /* RT_OS_DARWIN */
-
-void UISession::sltMousePointerShapeChange(const UIMousePointerShapeData &shapeData)
-{
-    /* In case if shape itself is present: */
-    if (shapeData.shape().size() > 0)
-    {
-        /* We are ignoring visibility flag: */
-        m_fIsHidingHostPointer = false;
-
-        /* And updating current shape data: */
-        m_shapeData = shapeData;
-        updateMousePointerShape();
-    }
-    /* In case if shape itself is NOT present: */
-    else
-    {
-        /* Remember if we should hide the cursor: */
-        m_fIsHidingHostPointer = !shapeData.isVisible();
-    }
-
-    /* Notify listeners about mouse capability changed: */
-    emit sigMousePointerShapeChange();
-}
-
-void UISession::sltMouseCapabilityChange(bool fSupportsAbsolute, bool fSupportsRelative,
-                                         bool fSupportsTouchScreen, bool fSupportsTouchPad,
-                                         bool fNeedsHostCursor)
-{
-    LogRelFlow(("GUI: UISession::sltMouseCapabilityChange: "
-                "Supports absolute: %s, Supports relative: %s, "
-                "Supports touchscreen: %s, Supports touchpad: %s, "
-                "Needs host cursor: %s\n",
-                fSupportsAbsolute ? "TRUE" : "FALSE", fSupportsRelative ? "TRUE" : "FALSE",
-                fSupportsTouchScreen ? "TRUE" : "FALSE", fSupportsTouchPad ? "TRUE" : "FALSE",
-                fNeedsHostCursor ? "TRUE" : "FALSE"));
-
-    /* Check if something had changed: */
-    if (   m_fIsMouseSupportsAbsolute != fSupportsAbsolute
-        || m_fIsMouseSupportsRelative != fSupportsRelative
-        || m_fIsMouseSupportsTouchScreen != fSupportsTouchScreen
-        || m_fIsMouseSupportsTouchPad != fSupportsTouchPad
-        || m_fIsMouseHostCursorNeeded != fNeedsHostCursor)
-    {
-        /* Store new data: */
-        m_fIsMouseSupportsAbsolute = fSupportsAbsolute;
-        m_fIsMouseSupportsRelative = fSupportsRelative;
-        m_fIsMouseSupportsTouchScreen = fSupportsTouchScreen;
-        m_fIsMouseSupportsTouchPad = fSupportsTouchPad;
-        m_fIsMouseHostCursorNeeded = fNeedsHostCursor;
-
-        /* Notify listeners about mouse capability changed: */
-        emit sigMouseCapabilityChange();
-    }
-}
-
-void UISession::sltCursorPositionChange(bool fContainsData, unsigned long uX, unsigned long uY)
-{
-    LogRelFlow(("GUI: UISession::sltCursorPositionChange: "
-                "Cursor position valid: %d, Cursor position: %dx%d\n",
-                fContainsData ? "TRUE" : "FALSE", uX, uY));
-
-    /* Check if something had changed: */
-    if (   m_fIsValidCursorPositionPresent != fContainsData
-        || m_cursorPosition.x() != (int)uX
-        || m_cursorPosition.y() != (int)uY)
-    {
-        /* Store new data: */
-        m_fIsValidCursorPositionPresent = fContainsData;
-        m_cursorPosition = QPoint(uX, uY);
-
-        /* Notify listeners about cursor position changed: */
-        emit sigCursorPositionChange();
-    }
-}
 
 void UISession::sltKeyboardLedsChangeEvent(bool fNumLock, bool fCapsLock, bool fScrollLock)
@@ -913 +833 @@
     , m_uNumLockAdaptionCnt(2)
     , m_uCapsLockAdaptionCnt(2)
-    /* Mouse flags: */
-    , m_fIsMouseSupportsAbsolute(false)
-    , m_fIsMouseSupportsRelative(false)
-    , m_fIsMouseSupportsTouchScreen(false)
-    , m_fIsMouseSupportsTouchPad(false)
-    , m_fIsMouseHostCursorNeeded(false)
-    , m_fIsMouseCaptured(false)
-    , m_fIsMouseIntegrated(true)
-    , m_fIsValidPointerShapePresent(false)
-    , m_fIsHidingHostPointer(true)
-    , m_fIsValidCursorPositionPresent(false)
+    /* CPU hardware virtualization features for VM: */
     , m_enmVMExecutionEngine(KVMExecutionEngine_NotSet)
-    /* CPU hardware virtualization features for VM: */
     , m_fIsHWVirtExNestedPagingEnabled(false)
     , m_fIsHWVirtExUXEnabled(false)
@@ -1026 +935 @@
     /* Add console event connections: */
     connect(m_pConsoleEventhandler, &UIConsoleEventHandler::sigMousePointerShapeChange,
-            this, &UISession::sltMousePointerShapeChange);
+            this, &UISession::sigMousePointerShapeChange);
     connect(m_pConsoleEventhandler, &UIConsoleEventHandler::sigMouseCapabilityChange,
-            this, &UISession::sltMouseCapabilityChange);
+            this, &UISession::sigMouseCapabilityChange);
     connect(m_pConsoleEventhandler, &UIConsoleEventHandler::sigCursorPositionChange,
-            this, &UISession::sltCursorPositionChange);
+            this, &UISession::sigCursorPositionChange);
     connect(m_pConsoleEventhandler, &UIConsoleEventHandler::sigKeyboardLedsChangeEvent,
             this, &UISession::sltKeyboardLedsChangeEvent);
@@ -1259 +1168 @@
 
         /* Input options: */
-        actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration)->setChecked(isMouseIntegrated());
+        actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration)->setChecked(uimachine()->isMouseIntegrated());
 
         /* Devices options: */
@@ -1404 +1313 @@
 }
 #endif /* VBOX_WS_MAC */
-
-/** Generate a BGRA bitmap which approximates a XOR/AND mouse pointer.
- *
- * Pixels which has 1 in the AND mask and not 0 in the XOR mask are replaced by
- * the inverted pixel and 8 surrounding pixels with the original color.
- * Fort example a white pixel (W) is replaced with a black (B) pixel:
- *         WWW
- *  W   -> WBW
- *         WWW
- * The surrounding pixels are written only if the corresponding source pixel
- * does not affect the screen, i.e. AND bit is 1 and XOR value is 0.
- */
-static void renderCursorPixels(const uint32_t *pu32XOR, const uint8_t *pu8AND,
-                               uint32_t u32Width, uint32_t u32Height,
-                               uint32_t *pu32Pixels, uint32_t cbPixels)
-{
-    /* Output pixels set to 0 which allow to not write transparent pixels anymore. */
-    memset(pu32Pixels, 0, cbPixels);
-
-    const uint32_t *pu32XORSrc = pu32XOR;  /* Iterator for source XOR pixels. */
-    const uint8_t *pu8ANDSrcLine = pu8AND; /* The current AND mask scanline. */
-    uint32_t *pu32Dst = pu32Pixels;        /* Iterator for all destination BGRA pixels. */
-
-    /* Some useful constants. */
-    const int cbANDLine = ((int)u32Width + 7) / 8;
-
-    int y;
-    for (y = 0; y < (int)u32Height; ++y)
-    {
-        int x;
-        for (x = 0; x < (int)u32Width; ++x)
-        {
-            const uint32_t u32Pixel = *pu32XORSrc; /* Current pixel at (x,y) */
-            const uint8_t *pu8ANDSrc = pu8ANDSrcLine + x / 8; /* Byte which containt current AND bit. */
-
-            if ((*pu8ANDSrc << (x % 8)) & 0x80)
-            {
-                if (u32Pixel)
-                {
-                    const uint32_t u32PixelInverted = ~u32Pixel;
-
-                    /* Scan neighbor pixels and assign them if they are transparent. */
-                    int dy;
-                    for (dy = -1; dy <= 1; ++dy)
-                    {
-                        const int yn = y + dy;
-                        if (yn < 0 || yn >= (int)u32Height)
-                            continue; /* Do not cross the bounds. */
-
-                        int dx;
-                        for (dx = -1; dx <= 1; ++dx)
-                        {
-                            const int xn = x + dx;
-                            if (xn < 0 || xn >= (int)u32Width)
-                                continue;  /* Do not cross the bounds. */
-
-                            if (dx != 0 || dy != 0)
-                            {
-                                /* Check if the neighbor pixel is transparent. */
-                                const uint32_t *pu32XORNeighborSrc = &pu32XORSrc[dy * (int)u32Width + dx];
-                                const uint8_t *pu8ANDNeighborSrc = pu8ANDSrcLine + dy * cbANDLine + xn / 8;
-                                if (   *pu32XORNeighborSrc == 0
-                                    && ((*pu8ANDNeighborSrc << (xn % 8)) & 0x80) != 0)
-                                {
-                                    /* Transparent neighbor pixels are replaced with the source pixel value. */
-                                    uint32_t *pu32PixelNeighborDst = &pu32Dst[dy * (int)u32Width + dx];
-                                    *pu32PixelNeighborDst = u32Pixel | 0xFF000000;
-                                }
-                            }
-                            else
-                            {
-                                /* The pixel itself is replaced with inverted value. */
-                                *pu32Dst = u32PixelInverted | 0xFF000000;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    /* The pixel does not affect the screen.
-                     * Do nothing. Do not touch destination which can already contain generated pixels.
-                     */
-                }
-            }
-            else
-            {
-                /* AND bit is 0, the pixel will be just drawn. */
-                *pu32Dst = u32Pixel | 0xFF000000;
-            }
-
-            ++pu32XORSrc; /* Next source pixel. */
-            ++pu32Dst;    /* Next destination pixel. */
-        }
-
-        /* Next AND scanline. */
-        pu8ANDSrcLine += cbANDLine;
-    }
-}
-
-#ifdef VBOX_WS_WIN
-static bool isPointer1bpp(const uint8_t *pu8XorMask,
-                          uint uWidth,
-                          uint uHeight)
-{
-    /* Check if the pointer has only 0 and 0xFFFFFF pixels, ignoring the alpha channel. */
-    const uint32_t *pu32Src = (uint32_t *)pu8XorMask;
-
-    uint y;
-    for (y = 0; y < uHeight ; ++y)
-    {
-        uint x;
-        for (x = 0; x < uWidth; ++x)
-        {
-            const uint32_t u32Pixel = pu32Src[x] & UINT32_C(0xFFFFFF);
-            if (u32Pixel != 0 && u32Pixel != UINT32_C(0xFFFFFF))
-                return false;
-        }
-
-        pu32Src += uWidth;
-    }
-
-    return true;
-}
-#endif /* VBOX_WS_WIN */
-
-void UISession::updateMousePointerShape()
-{
-    /* Fetch incoming shape data: */
-    const bool fHasAlpha = m_shapeData.hasAlpha();
-    const uint uWidth = m_shapeData.shapeSize().width();
-    const uint uHeight = m_shapeData.shapeSize().height();
-    const uchar *pShapeData = m_shapeData.shape().constData();
-    AssertMsgReturnVoid(pShapeData, ("Shape data must not be NULL!\n"));
-
-    /* Invalidate mouse pointer shape initially: */
-    m_fIsValidPointerShapePresent = false;
-    m_cursorShapePixmap = QPixmap();
-    m_cursorMaskPixmap = QPixmap();
-
-    /* Parse incoming shape data: */
-    const uchar *pSrcAndMaskPtr = pShapeData;
-    const uint uAndMaskSize = (uWidth + 7) / 8 * uHeight;
-    const uchar *pSrcShapePtr = pShapeData + ((uAndMaskSize + 3) & ~3);
-
-#if defined (VBOX_WS_WIN)
-
-    /* Create an ARGB image out of the shape data: */
-
-    // WORKAROUND:
-    // Qt5 QCursor recommends 32 x 32 cursor, therefore the original data is copied to
-    // a larger QImage if necessary. Cursors like 10x16 did not work correctly (Solaris 10 guest).
-    // Align the cursor dimensions to 32 bit pixels, because for example a 56x56 monochrome cursor
-    // did not work correctly on Windows host.
-    const uint uCursorWidth = RT_ALIGN_32(uWidth, 32);
-    const uint uCursorHeight = RT_ALIGN_32(uHeight, 32);
-
-    if (fHasAlpha)
-    {
-        QImage image(uCursorWidth, uCursorHeight, QImage::Format_ARGB32);
-        memset(image.bits(), 0, image.byteCount());
-
-        const uint32_t *pu32SrcShapeScanline = (uint32_t *)pSrcShapePtr;
-        for (uint y = 0; y < uHeight; ++y, pu32SrcShapeScanline += uWidth)
-            memcpy(image.scanLine(y), pu32SrcShapeScanline, uWidth * sizeof(uint32_t));
-
-        m_cursorShapePixmap = QPixmap::fromImage(image);
-    }
-    else
-    {
-        if (isPointer1bpp(pSrcShapePtr, uWidth, uHeight))
-        {
-            /* Incoming data consist of 32 bit BGR XOR mask and 1 bit AND mask.
-             * XOR pixels contain either 0x00000000 or 0x00FFFFFF.
-             *
-             * Originally intended result (F denotes 0x00FFFFFF):
-             * XOR AND
-             *   0   0 black
-             *   F   0 white
-             *   0   1 transparent
-             *   F   1 xor'd
-             *
-             * Actual Qt5 result for color table 0:0xFF000000, 1:0xFFFFFFFF
-             * (tested on Windows 7 and 10 64 bit hosts):
-             * Bitmap Mask
-             *  0   0 black
-             *  1   0 white
-             *  0   1 xor
-             *  1   1 transparent
-             *
-             */
-
-            QVector<QRgb> colors(2);
-            colors[0] = UINT32_C(0xFF000000);
-            colors[1] = UINT32_C(0xFFFFFFFF);
-
-            QImage bitmap(uCursorWidth, uCursorHeight, QImage::Format_Mono);
-            bitmap.setColorTable(colors);
-            memset(bitmap.bits(), 0xFF, bitmap.byteCount());
-
-            QImage mask(uCursorWidth, uCursorHeight, QImage::Format_Mono);
-            mask.setColorTable(colors);
-            memset(mask.bits(), 0xFF, mask.byteCount());
-
-            const uint8_t *pu8SrcAndScanline = pSrcAndMaskPtr;
-            const uint32_t *pu32SrcShapeScanline = (uint32_t *)pSrcShapePtr;
-            for (uint y = 0; y < uHeight; ++y)
-            {
-                for (uint x = 0; x < uWidth; ++x)
-                {
-                    const uint8_t u8Bit = (uint8_t)(1 << (7 - x % 8));
-
-                    const uint8_t u8SrcMaskByte = pu8SrcAndScanline[x / 8];
-                    const uint8_t u8SrcMaskBit = u8SrcMaskByte & u8Bit;
-                    const uint32_t u32SrcPixel = pu32SrcShapeScanline[x] & UINT32_C(0xFFFFFF);
-
-                    uint8_t *pu8DstMaskByte = &mask.scanLine(y)[x / 8];
-                    uint8_t *pu8DstBitmapByte = &bitmap.scanLine(y)[x / 8];
-
-                    if (u8SrcMaskBit == 0)
-                    {
-                        if (u32SrcPixel == 0)
-                        {
-                            /* Black: Qt Bitmap = 0, Mask = 0 */
-                            *pu8DstMaskByte &= ~u8Bit;
-                            *pu8DstBitmapByte &= ~u8Bit;
-                        }
-                        else
-                        {
-                            /* White: Qt Bitmap = 1, Mask = 0 */
-                            *pu8DstMaskByte &= ~u8Bit;
-                            *pu8DstBitmapByte |= u8Bit;
-                        }
-                    }
-                    else
-                    {
-                        if (u32SrcPixel == 0)
-                        {
-                            /* Transparent: Qt Bitmap = 1, Mask = 1 */
-                            *pu8DstMaskByte |= u8Bit;
-                            *pu8DstBitmapByte |= u8Bit;
-                        }
-                        else
-                        {
-                            /* Xor'ed: Qt Bitmap = 0, Mask = 1 */
-                            *pu8DstMaskByte |= u8Bit;
-                            *pu8DstBitmapByte &= ~u8Bit;
-                        }
-                    }
-                }
-
-                pu8SrcAndScanline += (uWidth + 7) / 8;
-                pu32SrcShapeScanline += uWidth;
-            }
-
-            m_cursorShapePixmap = QBitmap::fromImage(bitmap);
-            m_cursorMaskPixmap = QBitmap::fromImage(mask);
-        }
-        else
-        {
-            /* Assign alpha channel values according to the AND mask: 1 -> 0x00, 0 -> 0xFF: */
-            QImage image(uCursorWidth, uCursorHeight, QImage::Format_ARGB32);
-            memset(image.bits(), 0, image.byteCount());
-
-            const uint8_t *pu8SrcAndScanline = pSrcAndMaskPtr;
-            const uint32_t *pu32SrcShapeScanline = (uint32_t *)pSrcShapePtr;
-
-            for (uint y = 0; y < uHeight; ++y)
-            {
-                uint32_t *pu32DstPixel = (uint32_t *)image.scanLine(y);
-
-                for (uint x = 0; x < uWidth; ++x)
-                {
-                    const uint8_t u8Bit = (uint8_t)(1 << (7 - x % 8));
-                    const uint8_t u8SrcMaskByte = pu8SrcAndScanline[x / 8];
-
-                    if (u8SrcMaskByte & u8Bit)
-                        *pu32DstPixel++ = pu32SrcShapeScanline[x] & UINT32_C(0x00FFFFFF);
-                    else
-                        *pu32DstPixel++ = pu32SrcShapeScanline[x] | UINT32_C(0xFF000000);
-                }
-
-                pu32SrcShapeScanline += uWidth;
-                pu8SrcAndScanline += (uWidth + 7) / 8;
-            }
-
-            m_cursorShapePixmap = QPixmap::fromImage(image);
-        }
-    }
-
-    /* Mark mouse pointer shape valid: */
-    m_fIsValidPointerShapePresent = true;
-
-#elif defined(VBOX_WS_X11) || defined(VBOX_WS_MAC)
-
-    /* Create an ARGB image out of the shape data: */
-    QImage image(uWidth, uHeight, QImage::Format_ARGB32);
-
-    if (fHasAlpha)
-    {
-        memcpy(image.bits(), pSrcShapePtr, uHeight * uWidth * 4);
-    }
-    else
-    {
-        renderCursorPixels((uint32_t *)pSrcShapePtr, pSrcAndMaskPtr,
-                           uWidth, uHeight,
-                           (uint32_t *)image.bits(), uHeight * uWidth * 4);
-    }
-
-    /* Create cursor-pixmap from the image: */
-    m_cursorShapePixmap = QPixmap::fromImage(image);
-
-    /* Mark mouse pointer shape valid: */
-    m_fIsValidPointerShapePresent = true;
-
-#else
-
-# warning "port me"
-
-#endif
-
-    /* Cache cursor pixmap size and hotspot: */
-    m_cursorSize = m_cursorShapePixmap.size();
-    m_cursorHotspot = m_shapeData.hotSpot();
-}
 
 bool UISession::preprocessInitialization()

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

@@ -37 +37 @@
 #include <QEvent>
 #include <QMap>
-#include <QPixmap>
 
 /* GUI includes: */
@@ -85 +84 @@
     /** Notifies listeners about keyboard state-change. */
     void sigKeyboardStateChange(int iState);
-    /** Notifies listeners about mouse state-change. */
-    void sigMouseStateChange(int iState);
     /** Notifies listeners about mouse pointer shape change. */
-    void sigMousePointerShapeChange();
+    void sigMousePointerShapeChange(const UIMousePointerShapeData &shapeData);
     /** Notifies listeners about mouse capability change. */
-    void sigMouseCapabilityChange();
+    void sigMouseCapabilityChange(bool fSupportsAbsolute, bool fSupportsRelative,
+                                  bool fSupportsTouchScreen, bool fSupportsTouchPad,
+                                  bool fNeedsHostCursor);
     /** Notifies listeners about cursor position change. */
-    void sigCursorPositionChange();
+    void sigCursorPositionChange(bool fContainsData, unsigned long uX, unsigned long uY);
     void sigKeyboardLedsChange();
     void sigMachineStateChange();
@@ -174 +173 @@
     UIMachineWindow *activeMachineWindow() const;
 
-    /** 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; }
-    /** Returns currently cached mouse cursor hotspot. */
-    QPoint cursorHotspot() const { return m_cursorHotspot; }
-    /** Returns currently cached mouse cursor position. */
-    QPoint cursorPosition() const { return m_cursorPosition; }
-
     /** @name Host-screen configuration variables.
      ** @{ */
@@ -254 +242 @@
     uint capsLockAdaptionCnt() const { return m_uCapsLockAdaptionCnt; }
 
-    /* Mouse getters: */
-    /** Returns mouse-state. */
-    int mouseState() const { return m_iMouseState; }
-    bool isMouseSupportsAbsolute() const { return m_fIsMouseSupportsAbsolute; }
-    bool isMouseSupportsRelative() const { return m_fIsMouseSupportsRelative; }
-    bool isMouseSupportsTouchScreen() const { return m_fIsMouseSupportsTouchScreen; }
-    bool isMouseSupportsTouchPad() const { return m_fIsMouseSupportsTouchPad; }
-    bool isMouseHostCursorNeeded() const { return m_fIsMouseHostCursorNeeded; }
-    bool isMouseCaptured() const { return m_fIsMouseCaptured; }
-    bool isMouseIntegrated() const { return m_fIsMouseIntegrated; }
-    bool isValidPointerShapePresent() const { return m_fIsValidPointerShapePresent; }
-    bool isHidingHostPointer() const { return m_fIsHidingHostPointer; }
-    /** Returns whether the @a cursorPosition() is valid and could be used by the GUI now. */
-    bool isValidCursorPositionPresent() const { return m_fIsValidCursorPositionPresent; }
-
     /* Common setters: */
     bool pause() { return setPause(true); }
@@ -280 +253 @@
     void setNumLockAdaptionCnt(uint uNumLockAdaptionCnt) { m_uNumLockAdaptionCnt = uNumLockAdaptionCnt; }
     void setCapsLockAdaptionCnt(uint uCapsLockAdaptionCnt) { m_uCapsLockAdaptionCnt = uCapsLockAdaptionCnt; }
-
-    /* Mouse setters: */
-    void setMouseCaptured(bool fIsMouseCaptured) { m_fIsMouseCaptured = fIsMouseCaptured; }
-    void setMouseIntegrated(bool fIsMouseIntegrated) { m_fIsMouseIntegrated = fIsMouseIntegrated; }
 
     /* Screen visibility status for host-desires: */
@@ -351 +320 @@
     void setKeyboardState(int iKeyboardState) { m_iKeyboardState = iKeyboardState; emit sigKeyboardStateChange(m_iKeyboardState); }
 
-    /** Defines @a iMouseState. */
-    void setMouseState(int iMouseState) { m_iMouseState = iMouseState; emit sigMouseStateChange(m_iMouseState); }
-
     /** Closes Runtime UI. */
     void closeRuntimeUI();
@@ -368 +334 @@
 
     /* Console events slots */
-    /** Handles signal about mouse pointer @a shapeData change. */
-    void sltMousePointerShapeChange(const UIMousePointerShapeData &shapeData);
-    /** Handles signal about mouse capability change to @a fSupportsAbsolute, @a fSupportsRelative,
-      * @a fSupportsTouchScreen, @a fSupportsTouchPad and @a fNeedsHostCursor. */
-    void sltMouseCapabilityChange(bool fSupportsAbsolute, bool fSupportsRelative,
-                                  bool fSupportsTouchScreen, bool fSupportsTouchPad,
-                                  bool fNeedsHostCursor);
-    /** Handles signal about guest request to change the cursor position to @a uX * @a uY.
-      * @param  fContainsData  Brings whether the @a uX and @a uY values are valid and could be used by the GUI now. */
-    void sltCursorPositionChange(bool fContainsData, unsigned long uX, unsigned long uY);
     void sltKeyboardLedsChangeEvent(bool fNumLock, bool fCapsLock, bool fScrollLock);
     void sltStateChange(KMachineState state);
@@ -456 +412 @@
     void updateMenu();
 #endif /* VBOX_WS_MAC */
-
-    /** Updates mouse pointer shape. */
-    void updateMousePointerShape();
 
     /* Common helpers: */
@@ -527 +480 @@
     KMachineState m_machineState;
 
-    /** 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;
-    /** Holds cached mouse cursor hotspot. */
-    QPoint   m_cursorHotspot;
-    /** Holds cached mouse cursor position. */
-    QPoint   m_cursorPosition;
-
     /** @name Host-screen configuration variables.
      * @{ */
@@ -581 +523 @@
     uint m_uCapsLockAdaptionCnt;
 
-    /* Mouse flags: */
-    /** Holds the mouse-state. */
-    int m_iMouseState;
-    bool m_fIsMouseSupportsAbsolute : 1;
-    bool m_fIsMouseSupportsRelative : 1;
-    bool m_fIsMouseSupportsTouchScreen: 1;
-    bool m_fIsMouseSupportsTouchPad: 1;
-    bool m_fIsMouseHostCursorNeeded : 1;
-    bool m_fIsMouseCaptured : 1;
-    bool m_fIsMouseIntegrated : 1;
-    bool m_fIsValidPointerShapePresent : 1;
-    bool m_fIsHidingHostPointer : 1;
-    /** Holds whether the @a m_cursorPosition is valid and could be used by the GUI now. */
-    bool m_fIsValidCursorPositionPresent : 1;
-    /** Holds the mouse pointer shape data. */
-    UIMousePointerShapeData  m_shapeData;
-
     /** Copy of IMachineDebugger::ExecutionEngine */
     KVMExecutionEngine m_enmVMExecutionEngine;

@@ -19 +19 @@
 /branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3:79645-79692
-/branches/dsen/gui4:155183-155185,155187,155198,155200-155201
+/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228
 /trunk/src:92342,154921

@@ -19 +19 @@
 /branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox:79645-79692
-/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201
+/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228

@@ -16 +16 @@
 /branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox/Frontends:79645-79692
-/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201
+/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228