Changeset 35266 in vbox

Timestamp:

Dec 20, 2010 9:00:44 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: clear video memory before resizing the virtual framebuffer

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c (modified) (4 diffs)

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

@@ -58 +58 @@
 #include "product-generated.h"
 #include <xf86.h>
+#include <misc.h>
 
 /* All drivers initialising the SW cursor need this */
@@ -1288 +1289 @@
      * too large for VRAM as we sometimes have to do this - see comments in
      * VBOXPreInit. */
-    if (offStart + pVBox->cbLine * cHeight > pVBox->cbFramebuffer)
+    if (   offStart + pVBox->cbLine * cHeight > pVBox->cbFramebuffer
+        || pVBox->cbLine * pScrn->virtualY > pVBox->cbFramebuffer)
         fActive = FALSE;
     /* Deactivate the screen if it is outside of the virtual framebuffer and
@@ -1327 +1329 @@
     VBOXPtr pVBox = VBOXGetRec(pScrn);
     uint64_t cbLine = vboxLineLength(pScrn, width);
+    uint32_t cbOldPixmap;
 
     TRACE_LOG("width=%d, height=%d\n", width, height);
@@ -1344 +1347 @@
                                 pScrn->depth, vboxBPP(pScrn), cbLine,
                                 pVBox->base);
+    cbOldPixmap = pVBox->cbLine * pScrn->virtualY;
+    if (cbOldPixmap > pVBox->cbFramebuffer)
+        cbOldPixmap = 0;
     pScrn->virtualX = width;
     pScrn->virtualY = height;
     pScrn->displayWidth = vboxDisplayPitch(pScrn, cbLine);
     pVBox->cbLine = cbLine;
+    /* Clear video RAM for esthetic reasons */
+    memset(pVBox->base, 0, max(cbLine * height, cbOldPixmap));
 #ifdef VBOX_DRI
     if (pVBox->useDRI)