Changeset 77485 in vbox

Timestamp:

Feb 27, 2019 1:25:37 PM (6 years ago)

Author:

vboxsync

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

129075

Message:

Main: add out-of-range to host-side pointer reporting.
bugref:9376: Complete hardware cursor implementation in VMSVGA
Clean-ups from previous changes after testing with local GUI changes.

File:

• trunk/src/VBox/Main/src-client/MouseImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -668 +668 @@
     ComAssertRet(pDisplay, E_FAIL);
 
-    if (x == -1 || y == -1)  /* Report only. */
-        return S_OK;
-    if (x != mcLastX || y != mcLastY)  /* This covers out-of-range too. */
-    {
-        if (x < 0x7fffffff && y < 0x7fffffff)
-            pDisplay->i_reportHostCursorPosition(x - 1, y - 1, false);
-        else  /* Out of range. */
-            pDisplay->i_reportHostCursorPosition(0, 0, true);
+    if (x != mcLastX || y != mcLastY)
+    {
+        pDisplay->i_reportHostCursorPosition(x - 1, y - 1, false);
     }
     return S_OK;
@@ -855 +850 @@
              __PRETTY_FUNCTION__, x, y, dz, dw, aButtonState));
 
+    DisplayMouseInterface *pDisplay = mParent->i_getDisplayMouseInterface();
+    ComAssertRet(pDisplay, E_FAIL);
     int32_t xAdj, yAdj;
     uint32_t fButtonsAdj;
     bool fValid;
 
+    /* If we are doing old-style (IRQ-less) absolute reporting to the VMM
+     * device then make sure the guest is aware of it, so that it knows to
+     * ignore relative movement on the PS/2 device. */
+    i_updateVMMDevMouseCaps(VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE, 0);
+    /* Detect out-of-range. */
+    if (x == 0x7FFFFFFF && y == 0x7FFFFFFF)
+    {
+        pDisplay->i_reportHostCursorPosition(0, 0, true);
+        return S_OK;
+    }
+    /* Detect "report-only" (-1, -1).  This is not ideal, as in theory the
+     * front-end could be sending negative values relative to the primary
+     * screen. */
+    if (x == -1 && y == -1)
+        return S_OK;
     /** @todo the front end should do this conversion to avoid races */
     /** @note Or maybe not... races are pretty inherent in everything done in
@@ -866 +878 @@
 
     fButtonsAdj = i_mouseButtonsToPDM(aButtonState);
-    /* If we are doing old-style (IRQ-less) absolute reporting to the VMM
-     * device then make sure the guest is aware of it, so that it knows to
-     * ignore relative movement on the PS/2 device. */
-    i_updateVMMDevMouseCaps(VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE, 0);
     if (fValid)
     {