Changeset 30032 in vbox for trunk/src/VBox/Main/DisplayImpl.cpp

Timestamp:

Jun 4, 2010 12:12:45 PM (15 years ago)

Author:

vboxsync

Message:

DisplayImpl: fixed VRDP multimonitor (xTracker 5014).

File:

• trunk/src/VBox/Main/DisplayImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -3637 +3637 @@
 DECLCALLBACK(void) Display::displayVBVAUpdateProcess(PPDMIDISPLAYCONNECTOR pInterface, unsigned uScreenId, const PVBVACMDHDR pCmd, size_t cbCmd)
 {
-    LogFlowFunc(("uScreenId %d pCmd %p cbCmd %d\n", uScreenId, pCmd, cbCmd));
+    LogFlowFunc(("uScreenId %d pCmd %p cbCmd %d, @%d,%d %dx%d\n", uScreenId, pCmd, cbCmd, pCmd->x, pCmd->y, pCmd->w, pCmd->h));
 
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
@@ -3647 +3647 @@
         if (pFBInfo->fDefaultFormat)
         {
+            /* Make sure that framebuffer contains the same image as the guest VRAM. */
             if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
             {
@@ -3689 +3690 @@
                 }
             }
-            pThis->handleDisplayUpdate (pCmd->x + pFBInfo->xOrigin,
-                                        pCmd->y + pFBInfo->yOrigin, pCmd->w, pCmd->h);
-        }
-
+        }
+
+        VBVACMDHDR hdrSaved = *pCmd;
+
+        VBVACMDHDR *pHdrUnconst = (VBVACMDHDR *)pCmd;
+
+        pHdrUnconst->x -= (int16_t)pFBInfo->xOrigin;
+        pHdrUnconst->y -= (int16_t)pFBInfo->yOrigin;
+
+        /* @todo new SendUpdate entry which can get a separate cmd header or coords. */
         pThis->mParent->consoleVRDPServer()->SendUpdate (uScreenId, pCmd, cbCmd);
+
+        *pHdrUnconst = hdrSaved;
     }
 }
@@ -3810 +3819 @@
     if (!fResize)
     {
-        /* No paramaters of the framebuffer have actually changed. */
+        /* No parameters of the framebuffer have actually changed. */
+        if (fNewOrigin)
+        {
+            /* VRDP server still need this notification. */
+            LogFlowFunc (("Calling VRDP\n"));
+            pThis->mParent->consoleVRDPServer()->SendResize();
+        }
         return VINF_SUCCESS;
     }