Changeset 56468 in vbox for trunk

Timestamp:

Jun 17, 2015 7:12:16 AM (10 years ago)

Author:

vboxsync

Message:

Main/Display: update seamless rectangles if window origin changes.

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (2 diffs)
• src-client/DisplayImpl.cpp (modified) (10 diffs)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -179 +179 @@
     int i_notifyCroglResize(const PVBVAINFOVIEW pView, const PVBVAINFOSCREEN pScreen, void *pvVRAM);
 
+    int  i_saveVisibleRegion(uint32_t cRect, PRTRECT pRect);
     int  i_handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect);
     int  i_handleQueryVisibleRegion(uint32_t *pcRect, PRTRECT pRect);
@@ -397 +398 @@
     bool volatile fVGAResizing;
 
+    /** Are we in seamless mode?  Not saved, as we exit seamless on saving. */
+    bool        mfSeamlessEnabled;
+    /** Last set seamless visible region, number of rectangles. */
+    uint32_t    mcRectVisibleRegion;
+    /** Last set seamless visible region, data.  Freed on final clean-up. */
+    PRTRECT     mpRectVisibleRegion;
+
     bool        mfVideoAccelVRDP;
     uint32_t    mfu32SupportedOrders;

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

@@ -109 +109 @@
     mfu32SupportedOrders = 0;
     mcVideoAccelVRDPRefs = 0;
+
+    mfSeamlessEnabled = false;
+    mpRectVisibleRegion = NULL;
 
 #ifdef VBOX_WITH_CROGL
@@ -157 +160 @@
 
     videoAccelDestroy(&mVideoAccelLegacy);
+    i_saveVisibleRegion(0, NULL);
 
     if (RTCritSectIsInitialized(&mVideoAccelLock))
@@ -954 +958 @@
     mParent->i_consoleVRDPServer()->SendResize();
 
+    /* And re-send the seamless rectangles if necessary. */
+    if (mfSeamlessEnabled)
+        i_handleSetVisibleRegion(mcRectVisibleRegion, mpRectVisibleRegion);
+
     LogRelFlowFunc(("[%d]: default format %d\n", uScreenId, pFBInfo->fDefaultFormat));
 
@@ -1125 +1133 @@
     cxInputMapping      = cx;
     cyInputMapping      = cy;
+
+    /* Re-send the seamless rectangles if necessary. */
+    if (mfSeamlessEnabled)
+        i_handleSetVisibleRegion(mcRectVisibleRegion, mpRectVisibleRegion);
 }
 
@@ -1249 +1261 @@
 }
 
+int Display::i_saveVisibleRegion(uint32_t cRect, PRTRECT pRect)
+{
+    RTRECT *pRectVisibleRegion = NULL;
+
+    if (pRect == mpRectVisibleRegion)
+        return VINF_SUCCESS;
+    if (cRect != 0)
+    {
+        pRectVisibleRegion = (RTRECT *)RTMemAlloc(cRect * sizeof(RTRECT));
+        if (!pRectVisibleRegion)
+        {
+            return VERR_NO_MEMORY;
+        }
+        memcpy(pRectVisibleRegion, pRect, cRect * sizeof(RTRECT));
+    }
+    if (mpRectVisibleRegion)
+        RTMemFree(mpRectVisibleRegion);
+    mcRectVisibleRegion = cRect;
+    mpRectVisibleRegion = pRectVisibleRegion;
+    return VINF_SUCCESS;
+}
+
 int Display::i_handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect)
 {
@@ -1257 +1291 @@
         return VERR_NO_TMP_MEMORY;
     }
+    int rc = i_saveVisibleRegion(cRect, pRect);
+    if (RT_FAILURE(rc))
+    {
+        RTMemTmpFree(pVisibleRegion);
+        return rc;
+    }
 
     unsigned uScreenId;
@@ -1269 +1309 @@
              */
             RTRECT rectFramebuffer;
-            rectFramebuffer.xLeft   = pFBInfo->xOrigin;
-            rectFramebuffer.yTop    = pFBInfo->yOrigin;
-            rectFramebuffer.xRight  = pFBInfo->xOrigin + pFBInfo->w;
-            rectFramebuffer.yBottom = pFBInfo->yOrigin + pFBInfo->h;
+            rectFramebuffer.xLeft   = pFBInfo->xOrigin - xInputMappingOrigin;
+            rectFramebuffer.yTop    = pFBInfo->yOrigin - yInputMappingOrigin;
+            rectFramebuffer.xRight  = rectFramebuffer.xLeft + pFBInfo->w;
+            rectFramebuffer.yBottom = rectFramebuffer.yTop  + pFBInfo->h;
 
             uint32_t cRectVisibleRegion = 0;
@@ -1281 +1321 @@
                 if (displayIntersectRect(&pVisibleRegion[cRectVisibleRegion], &pRect[i], &rectFramebuffer))
                 {
-                    pVisibleRegion[cRectVisibleRegion].xLeft -= pFBInfo->xOrigin;
-                    pVisibleRegion[cRectVisibleRegion].yTop -= pFBInfo->yOrigin;
-                    pVisibleRegion[cRectVisibleRegion].xRight -= pFBInfo->xOrigin;
-                    pVisibleRegion[cRectVisibleRegion].yBottom -= pFBInfo->yOrigin;
+                    pVisibleRegion[cRectVisibleRegion].xLeft -= rectFramebuffer.xLeft;
+                    pVisibleRegion[cRectVisibleRegion].yTop -= rectFramebuffer.yTop;
+                    pVisibleRegion[cRectVisibleRegion].xRight -= rectFramebuffer.xLeft;
+                    pVisibleRegion[cRectVisibleRegion].yBottom -= rectFramebuffer.yTop;
 
                     cRectVisibleRegion++;
@@ -1313 +1353 @@
                 pCtl->aParms[0].u.pointer.size = cRect * sizeof(RTRECT);
 
-                int rc = i_crCtlSubmit(&pCtl->Hdr, sizeof(*pCtl), i_displayCrCmdFree, pCtl);
+                rc = i_crCtlSubmit(&pCtl->Hdr, sizeof(*pCtl), i_displayCrCmdFree, pCtl);
                 if (!RT_SUCCESS(rc))
                 {
@@ -1766 +1806 @@
             pVMMDevPort->pfnRequestSeamlessChange(pVMMDevPort, !!enabled);
     }
+    mfSeamlessEnabled = enabled;
 
 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)