Changeset 83142 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 24, 2020 7:24:26 PM (5 years ago)

Author:

vboxsync

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

136260

Message:

bugref:9637. Sending monitor positions (offsets) from GAs to svga device since vmwgfx fails to do so.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/VBoxGuest.cpp (modified) (2 diffs)
• common/VBoxGuest/lib/VBoxGuestR0LibGenericRequest.cpp (modified) (2 diffs)
• common/VBoxGuest/lib/VBoxGuestR3LibSeamless.cpp (modified) (1 diff)
• x11/VBoxClient/display-svga-x11.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -2388 +2388 @@
         case VMMDevReq_VideoAccelFlush:
         case VMMDevReq_VideoSetVisibleRegion:
+        case VMMDevReq_VideoUpdateMonitorPositions:
         case VMMDevReq_GetDisplayChangeRequestEx:
         case VMMDevReq_GetDisplayChangeRequestMulti:
@@ -4504 +4505 @@
     return fOurIrq;
 }
-

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibGenericRequest.cpp

@@ -96 +96 @@
         || pReq->requestType == VMMDevReq_LogString
         || pReq->requestType == VMMDevReq_SetPointerShape
-        || pReq->requestType == VMMDevReq_VideoSetVisibleRegion)
+        || pReq->requestType == VMMDevReq_VideoSetVisibleRegion
+        || pReq->requestType == VMMDevReq_VideoUpdateMonitorPositions)
     {
         if (RT_UNLIKELY(cbReq > VMMDEV_MAX_VMMDEVREQ_SIZE))
@@ -181 +182 @@
         VbglR0PhysHeapFree(pReq);
 }
-

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibSeamless.cpp

@@ -171 +171 @@
 }
 
+VBGLR3DECL(int) VbglR3SeamlessSendMonitorPositions(uint32_t cPositions, PRTPOINT pPositions)
+{
+    VMMDevVideoUpdateMonitorPositions *pReq;
+    int rc;
+
+    AssertReturn(cPositions || cPositions == 0, VERR_INVALID_PARAMETER);
+    //AssertMsgReturn(cRects <= _1M, ("%u\n", cRects), VERR_OUT_OF_RANGE);
+
+    rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq,
+                         sizeof(VMMDevVideoUpdateMonitorPositions)
+                       + cPositions * sizeof(RTPOINT)
+                       - sizeof(RTPOINT),
+                       VMMDevReq_VideoUpdateMonitorPositions);
+    if (RT_SUCCESS(rc))
+    {
+        pReq->cPositions = cPositions;
+        if (cPositions)
+            memcpy(&pReq->aPositions, pPositions, cPositions * sizeof(RTPOINT));
+        rc = vbglR3GRPerform(&pReq->header);
+        LogFunc(("Monitor position update request returned %Rrc, internal %Rrc.\n",
+                 rc, pReq->header.rc));
+        if (RT_SUCCESS(rc))
+            rc = pReq->header.rc;
+        vbglR3GRFree(&pReq->header);
+    }
+    LogFunc(("Sending monitor positions (%u of them)  to the host: %Rrc\n", cPositions, rc));
+    return rc;
+}

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -142 +142 @@
 }
 
+static void sendMonitorPositions(RTPOINT *pPositions, size_t cPositions)
+{
+    if (cPositions && !pPositions)
+    {
+        VBClLogError(("Monitor position update called with NULL pointer!\n"));
+        return;
+    }
+    VbglR3SeamlessSendMonitorPositions(cPositions, pPositions);
+}
+
 static void queryMonitorPositions()
 {
@@ -181 +191 @@
             mpMonitorPositions[iMonitorID].y = pMonitorInfo[i].y;
         }
-        // if (iMonitorCount > 0)
-        //     mHostMonitorPositionSendCallback(mpMonitorPositions, x11Context.hOutputCount);
+        if (iMonitorCount > 0)
+            mHostMonitorPositionSendCallback(mpMonitorPositions, x11Context.hOutputCount);
     }
     XRRFreeMonitors(pMonitorInfo);