Changeset 34763 in vbox

Timestamp:

Dec 6, 2010 4:55:41 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: fix updates on additional monitors, try to sort-of-fix dynamic resizing

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• vboxutils.c (modified) (1 diff)
• vboxvideo.c (modified) (11 diffs)
• vboxvideo.h (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c

@@ -216 +216 @@
                 continue;
             cmdHdr.x =   (int16_t)aRects[i].x1
-                       - pVBox->aScreenLocation[j].x * 2
-                       + pVBox->aScreenLocation[0].x;
+                       - pVBox->aScreenLocation[0].x;
             cmdHdr.y =   (int16_t)aRects[i].y1
-                       - pVBox->aScreenLocation[j].y * 2
-                       + pVBox->aScreenLocation[0].y;
+                       - pVBox->aScreenLocation[0].y - 1;
             cmdHdr.w = (uint16_t)(aRects[i].x2 - aRects[i].x1);
             cmdHdr.h = (uint16_t)(aRects[i].y2 - aRects[i].y1);

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -297 +297 @@
     (void) mode;
     VBOXPtr pVBox = VBOXGetRec(crtc->scrn);
-    int bpp = crtc->scrn->depth == 24 ? 32 : 16;
 
     TRACE_LOG("name=%s, HDisplay=%d, VDisplay=%d, x=%d, y=%d\n", adjusted_mode->name,
@@ -683 +682 @@
 }
 
+/** Calculate the BPP from the screen depth */
+static uint16_t
+vboxBPP(ScrnInfoPtr pScrn)
+{
+    return pScrn->depth == 24 ? 32 : 16;
+}
+
+/** Calculate the scan line length for a display width */
+static int32_t
+vboxLineLength(ScrnInfoPtr pScrn, int32_t cDisplayWidth)
+{
+    uint64_t cbLine = ((uint64_t)cDisplayWidth * vboxBPP(pScrn) / 8 + 7) & ~7;
+    return cbLine < INT32_MAX ? cbLine : INT32_MAX;
+}
+
+/** Calculate the display pitch from the scan line length */
+static int32_t
+vboxDisplayPitch(ScrnInfoPtr pScrn, int32_t cbLine)
+{
+    return (uint64_t)cbLine * 8 / vboxBPP(pScrn);
+}
+
 /*
  * QUOTE from the XFree86 DESIGN document:
@@ -848 +869 @@
 
     /* Needed before we initialise DRI. */
-    pScrn->displayWidth = pScrn->virtualX;
+    pVBox->cbLine = vboxLineLength(pScrn, pScrn->virtualX);
+    pScrn->displayWidth = vboxDisplayPitch(pScrn, pVBox->cbLine);
 
     xf86PrintModes(pScrn);
@@ -1163 +1185 @@
     pScreen->CloseScreen = pVBox->CloseScreen;
     return pScreen->CloseScreen(scrnIndex, pScreen);
+}
+
+static void
+vboxCalcDisplayDimensions(VBOXPtr pVBox, int32_t *pcWidth, int32_t *pcHeight)
+{
+    int32_t cWidth = 0, cHeight = 0;
+    unsigned i;
+    for (i = 0; i < pVBox->cScreens; ++i)
+    {
+        int32_t cWidthScreen =    pVBox->aScreenLocation[i].x
+                                + pVBox->aScreenLocation[i].cx;
+        int32_t cHeightScreen =   pVBox->aScreenLocation[i].y
+                                + pVBox->aScreenLocation[i].cy;
+        if (cWidthScreen > cWidth)
+            cWidth = cWidthScreen;
+        if (cHeightScreen > cWidth)
+            cWidth = cWidthScreen;
+    }
+    *pcWidth = cWidth;
+    *pcHeight = cHeight;
 }
 
@@ -1184 +1226 @@
     rc = VBOXSetMode(pScrn, 0, pMode->HDisplay, pMode->VDisplay,
                      pScrn->frameX0, pScrn->frameY0);
+    {
+        int32_t cWidth, cHeight;
+        vboxCalcDisplayDimensions(pVBox, &cWidth, &cHeight);
+        VBOXAdjustScreenPixmap(pScrn, cWidth, cHeight);
+    }
     if (rc)
     {
@@ -1211 +1258 @@
     uint32_t yRel = cDisplay ? y - pVBox->aScreenLocation[0].y : 0;
 
-    int bpp = pScrn->depth == 24 ? 32 : 16;
     TRACE_LOG("cDisplay=%u, cWidth=%u, cHeight=%u, x=%d, y=%d, displayWidth=%d\n",
               cDisplay, cWidth, cHeight, x, y, pScrn->displayWidth);
@@ -1220 +1266 @@
         if (cDisplay == 0)
             VBoxVideoSetModeRegisters(cWidth, cHeight, pScrn->displayWidth,
-                                      bpp, x, y);
+                                      vboxBPP(pScrn), x, y);
         /* Tell the host we support graphics */
         if (vbox_device_available(pVBox))
@@ -1229 +1275 @@
         && !pVBox->vtSwitch)
         VBoxHGSMIProcessDisplayInfo(&pVBox->guestCtx, cDisplay, xRel, yRel,
-                                    (y * pScrn->displayWidth + x) * bpp / 8,
-                                    pScrn->displayWidth * bpp / 8,
-                                    cWidth, cHeight, bpp);
+                                    pVBox->cbLine + x * vboxBPP(pScrn) / 8,
+                                    pVBox->cbLine,
+                                    cWidth, cHeight, vboxBPP(pScrn));
     pVBox->aScreenLocation[cDisplay].cx = cWidth;
     pVBox->aScreenLocation[cDisplay].cy = cHeight;
@@ -1245 +1291 @@
     PixmapPtr pPixmap = pScreen->GetScreenPixmap(pScreen);
     VBOXPtr pVBox = VBOXGetRec(pScrn);
-    int bpp = pScrn->depth == 24 ? 32 : 16;
+    uint64_t cbLine = vboxLineLength(pScrn, width);
 
     TRACE_LOG("width=%d, height=%d\n", width, height);
-    if ((uint64_t)width * height * bpp / 8 >= pVBox->cbFramebuffer)
+    if (!pPixmap) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "Failed to get the screen pixmap.\n");
+        return FALSE;
+    }
+    if (cbLine > UINT32_MAX || cbLine * height >= pVBox->cbFramebuffer)
     {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -1255 +1306 @@
         return FALSE;
     }
-    if (!pPixmap) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                   "Failed to get the screen pixmap.\n");
-        return FALSE;
-    }
     pScreen->ModifyPixmapHeader(pPixmap, width, height,
-                                pScrn->depth, bpp, width * bpp / 8,
+                                pScrn->depth, vboxBPP(pScrn), cbLine,
                                 pVBox->base);
     pScrn->virtualX = width;
     pScrn->virtualY = height;
-    pScrn->displayWidth = width;
+    pScrn->displayWidth = vboxDisplayPitch(pScrn, cbLine);
+    pVBox->cbLine = cbLine;
 #ifdef VBOX_DRI
     if (pVBox->useDRI)
@@ -1273 +1320 @@
     /* Write the new values to the hardware */
     xf86SetDesiredModes(pScrn);
-#else
-    pScrn->EnableDisableFBAccess(pScrn->scrnIndex, FALSE);
-    pScrn->EnableDisableFBAccess(pScrn->scrnIndex, TRUE);
 #endif
     return TRUE;

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -185 +185 @@
     /** The amount of VRAM available for use as a framebuffer */
     unsigned long cbFramebuffer;
+    /** The current line size in bytes */
+    uint32_t cbLine;
     CARD8 *state, *pstate;      /* SVGA state */
     int statePage, stateSize, stateMode;