Ticket #22096: svga_mouse_svn_3.patch

src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -4606 +4606 @@
      */
     if (   *pxLast == x
         && *pyLast == y
-        && (idScreen != SVGA_ID_INVALID || *pfLastVisible == fVisible))
+        && *pfLastVisible == fVisible)
         STAM_REL_COUNTER_INC(&pSVGAState->StatFifoCursorNoChange);
     else
     {
@@ -4616 +4616 @@
          * We handle global, not per-screen visibility information by sending
          * pfnVBVAMousePointerShape without shape data.
          */
+        if (fVisible != *pfLastVisible)
+        {
+            LogRel2(("vmsvgaR3FifoUpdateCursor: fVisible %d fLastVisible %d (%d,%d)\n",
+                    fVisible, *pfLastVisible, x, y));
+            STAM_REL_COUNTER_INC(&pSVGAState->StatFifoCursorVisiblity);
+        }
         *pxLast = x;
         *pyLast = y;
+        *pfLastVisible = fVisible;
+
         uint32_t fFlags = VBVA_CURSOR_VALID_DATA;
         if (idScreen != SVGA_ID_INVALID)
             fFlags |= VBVA_CURSOR_SCREEN_RELATIVE;
-        else if (*pfLastVisible != fVisible)
-        {
-            LogRel2(("vmsvgaR3FifoUpdateCursor: fVisible %d fLastVisible %d (%d,%d)\n", fVisible, *pfLastVisible, x, y));
-            *pfLastVisible = fVisible;
+
+        if (fVisible)
+            pThisCC->pDrv->pfnVBVAReportCursorPosition(pThisCC->pDrv, fFlags, idScreen, x, y);
+        else
             pThisCC->pDrv->pfnVBVAMousePointerShape(pThisCC->pDrv, RT_BOOL(fVisible), false, 0, 0, 0, 0, NULL);
-            STAM_REL_COUNTER_INC(&pSVGAState->StatFifoCursorVisiblity);
-        }
-        pThisCC->pDrv->pfnVBVAReportCursorPosition(pThisCC->pDrv, fFlags, idScreen, x, y);
+
         STAM_REL_COUNTER_INC(&pSVGAState->StatFifoCursorPosition);
     }