Changeset 26964 in vbox for trunk/src/VBox

Timestamp:

Mar 2, 2010 5:53:21 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: multi-monitor absolute mouse issue fix.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (5 diffs)
• Frontends/VirtualBox/src/runtime/UISession.h (modified) (2 diffs)
• Main/MouseImpl.cpp (modified) (1 diff)

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

@@ -1100 +1100 @@
     if (uisession()->isMouseSupportsAbsolute())
     {
-        /* Should we hide/show pointer? */
-        if (uisession()->isHidingHostPointer())
+        /* Should we use guest pointer shape? */
+        if (uisession()->isValidPointerShapePresent())
+            viewport()->setCursor(uisession()->cursor());
+        /* Should we hide pointer at all? */
+        else if (uisession()->isHidingHostPointer())
             viewport()->setCursor(Qt::BlankCursor);
-        else
-            viewport()->setCursor(uisession()->cursor());
     }
 }

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

@@ -554 +554 @@
     , m_fIsMouseCaptured(false)
     , m_fIsMouseIntegrated(true)
+    , m_fIsValidPointerShapePresent(false)
     , m_fIsHideHostPointer(true)
 {
@@ -973 +974 @@
     AssertMsg(pShapeData, ("Shape data must not be NULL!\n"));
 
+    m_fIsValidPointerShapePresent = false;
     const uchar *srcAndMaskPtr = pShapeData;
     uint andMaskSize = (uWidth + 7) / 8 * uHeight;
@@ -1095 +1097 @@
                 DestroyIcon(m_alphaCursor);
             m_alphaCursor = hAlphaCursor;
+            m_fIsValidPointerShapePresent = true;
         }
     }
@@ -1151 +1154 @@
         /* Set the new cursor: */
         m_cursor = QCursor(XcursorImageLoadCursor(QX11Info::display(), img));
+        m_fIsValidPointerShapePresent = true;
 
         XcursorImageDestroy(img);
@@ -1190 +1194 @@
     /* Set the new cursor: */
     m_cursor = QCursor(QPixmap::fromImage(image), uXHot, uYHot);
+    m_fIsValidPointerShapePresent = true;
     NOREF(srcShapePtrScan);
 

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

@@ -114 +114 @@
     bool isMouseCaptured() const { return m_fIsMouseCaptured; }
     bool isMouseIntegrated() const { return m_fIsMouseIntegrated; }
+    bool isValidPointerShapePresent() const { return m_fIsValidPointerShapePresent; }
     bool isHidingHostPointer() const { return m_fIsMouseCaptured || (m_fIsMouseSupportsAbsolute && m_fIsHideHostPointer); }
 
@@ -211 +212 @@
     bool m_fIsMouseCaptured : 1;
     bool m_fIsMouseIntegrated : 1;
+    bool m_fIsValidPointerShapePresent : 1;
     bool m_fIsHideHostPointer : 1;
 

trunk/src/VBox/Main/MouseImpl.cpp

@@ -428 +428 @@
     HRESULT rc = convertDisplayWidth(x, &mouseXAbs);
     ComAssertComRCRet(rc, rc);
-    if (mouseXAbs > 0xffff)
-        mouseXAbs = mLastAbsX;
+    /// TODO: Remove those strings?
+    //if (mouseXAbs > 0xffff)
+    //    mouseXAbs = mLastAbsX;
 
     uint32_t mouseYAbs;
     rc = convertDisplayHeight(y, &mouseYAbs);
     ComAssertComRCRet(rc, rc);
-    if (mouseYAbs > 0xffff)
-        mouseYAbs = mLastAbsY;
+    /// TODO: Remove those strings?
+    //if (mouseYAbs > 0xffff)
+    //    mouseYAbs = mLastAbsY;
 
     uint32_t fButtons = mouseButtonsToPDM(buttonState);