Changeset 23766 in vbox

Timestamp:

Oct 14, 2009 3:06:33 PM (15 years ago)

Author:

vboxsync

Message:

2dvideo: bugfixing for overlay (widget) move/resize

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFBOverlay.h (modified) (6 diffs)
• src/VBoxFBOverlay.cpp (modified) (12 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h

@@ -373 +373 @@
     bool performDisplay(VBoxVHWASurfaceBase *pPrimary, bool bForce);
 
-    void setRects(VBoxVHWASurfaceBase *pPrimary, const QRect & aTargRect, const QRect & aSrcRect, const QRect & aVisibleTargRect, bool bForceReinit);
-    void setTargRectPosition(VBoxVHWASurfaceBase *pPrimary, const QPoint & aPoint, const QRect & aVisibleTargRect);
-    void updateVisibleTargRect(VBoxVHWASurfaceBase *pPrimary, const QRect & aVisibleTargRect);
+    void setRects (const QRect & aTargRect, const QRect & aSrcRect);
+    void setTargRectPosition (const QPoint & aPoint);
+    void setVisibilityReinitFlag() { mNeedVisibilityReinit = true; }
+    void updateVisibility (VBoxVHWASurfaceBase *pPrimary, const QRect & aVisibleTargRect, bool bForce);
 
     static ulong calcBytesPerPixel(GLenum format, GLenum type);
@@ -514 +515 @@
     const VBoxVHWADirtyRect & getDirtyRect() { return mUpdateMem2TexRect; }
 private:
-    void doSetRectValuesInternal(const QRect & aTargRect, const QRect & aSrcRect, const QRect & aVisTargRect);
+    void setRectValues (const QRect & aTargRect, const QRect & aSrcRect);
+    void setVisibleRectValues (const QRect & aVisTargRect);
 
     void setComplexList(VBoxVHWASurfList *aComplexList) { mComplexList = aComplexList; }
@@ -542 +544 @@
 
     bool mVisibleDisplayInitialized;
+    bool mNeedVisibilityReinit;
 
     uchar * mAddress;
@@ -1020 +1023 @@
             mpfnOp = NULL;
         }
+        VBOXQGLLOG(("paintGL\n"));
 //        else
 //        {
@@ -1188 +1192 @@
             mNeedOverlayRepaint = false;
             performDisplayOverlay();
+        }
+        if(mNeedSetVisible)
+        {
+            mNeedSetVisible = false;
+            mpOverlayWidget->setVisible(true);
         }
     }
@@ -1248 +1257 @@
     bool mProcessingCommands;
     bool mNeedOverlayRepaint;
+    bool mNeedSetVisible;
     QRect mOverlayViewport;
     VBoxVHWADirtyRect mMainDirtyRect;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -1183 +1183 @@
                 mpProgram(NULL),
                 mVisibleDisplayInitialized(false),
+                mNeedVisibilityReinit(true),
                 mAddress(NULL),
                 mColorFormat(aColorFormat),
@@ -1219 +1220 @@
     }
 
-    doSetRectValuesInternal(aTargRect, aSrcRect, aVisTargRect);
+    setRectValues(aTargRect, aSrcRect);
+    setVisibleRectValues(aVisTargRect);
 //    mTargSize = QRect(0, 0, aTargSize->width(), aTargSize->height());
 
@@ -2103 +2105 @@
 }
 
-void VBoxVHWASurfaceBase::doSetRectValuesInternal(const QRect & aTargRect, const QRect & aSrcRect, const QRect & aVisTargRect)
-{
-    mVisibleTargRect = aVisTargRect.intersected(aTargRect);
+void VBoxVHWASurfaceBase::setRectValues (const QRect & aTargRect, const QRect & aSrcRect)
+{
     mTargRect = aTargRect;
     mSrcRect = aSrcRect;
+}
+
+void VBoxVHWASurfaceBase::setVisibleRectValues (const QRect & aVisTargRect)
+{
+    mVisibleTargRect = aVisTargRect.intersected(mTargRect);
     if(mVisibleTargRect.isEmpty() || mTargRect.isEmpty())
     {
@@ -2140 +2146 @@
 }
 
-void VBoxVHWASurfaceBase::setRects(VBoxVHWASurfaceBase *pPrimary, const QRect & aTargRect, const QRect & aSrcRect, const QRect & aVisTargRect, bool bForceReinit)
-{
-    QRect aVisibleTargRect = aVisTargRect.intersected(mTargRect);
-
-    if(mTargRect != aTargRect || mSrcRect != aSrcRect || mVisibleTargRect != aVisibleTargRect)
-    {
-        doSetRectValuesInternal(aTargRect, aSrcRect, aVisTargRect);
-        bForceReinit = true;
-    }
-
-    if(bForceReinit)
-    {
-        initDisplay(pPrimary);
-    }
-}
-
-void VBoxVHWASurfaceBase::setTargRectPosition(VBoxVHWASurfaceBase *pPrimary, const QPoint & aPoint, const QRect & aVisibleTargRect)
+
+void VBoxVHWASurfaceBase::setRects(const QRect & aTargRect, const QRect & aSrcRect)
+{
+    if(mTargRect != aTargRect || mSrcRect != aSrcRect)
+    {
+        setRectValues(aTargRect, aSrcRect);
+        mNeedVisibilityReinit = true;
+    }
+}
+
+void VBoxVHWASurfaceBase::setTargRectPosition(const QPoint & aPoint)
 {
     QRect tRect = targRect();
     tRect.moveTopLeft(aPoint);
-    setRects(pPrimary, tRect, srcRect(), aVisibleTargRect, false);
-}
-
-void VBoxVHWASurfaceBase::updateVisibleTargRect(VBoxVHWASurfaceBase *pPrimary, const QRect & aVisibleTargRect)
-{
-    setRects(pPrimary, targRect(), srcRect(), aVisibleTargRect, false);
+    setRects(tRect, srcRect());
+}
+
+void VBoxVHWASurfaceBase::updateVisibility (VBoxVHWASurfaceBase *pPrimary, const QRect & aVisibleTargRect, bool bForce)
+{
+    if(mNeedVisibilityReinit || bForce || aVisibleTargRect.intersected(mTargRect) != mVisibleTargRect)
+    {
+        setVisibleRectValues(aVisibleTargRect);
+        initDisplay(pPrimary);
+        mNeedVisibilityReinit = false;
+    }
 }
 
@@ -3302 +3307 @@
         }
 
-        pSrcSurf->setRects(pDstSurf, dstRect, srcRect, mViewport, true);
+        pSrcSurf->setRects(dstRect, srcRect);
+        pSrcSurf->setVisibilityReinitFlag();
     }
 }
@@ -3346 +3352 @@
     if(pCmd->u.in.flags & VBOXVHWA_OVER_HIDE)
     {
-        VBOXQGLLOG(("hide"));
+        VBOXQGLLOG(("hide\n"));
         pList->setCurrentVisible(NULL);
     }
     else if(pCmd->u.in.flags & VBOXVHWA_OVER_SHOW)
     {
-        VBOXQGLLOG(("show"));
+        VBOXQGLLOG(("show\n"));
         pList->setCurrentVisible(pSrcSurf);
     }
@@ -3395 +3401 @@
     {
         VBoxVHWASurfaceBase *pCurSrcSurf = (*it);
-        pCurSrcSurf->setTargRectPosition(pDstSurf, pos, mViewport);
+        pCurSrcSurf->setTargRectPosition(pos);
     }
 
@@ -4137 +4143 @@
     {
         VBoxVHWASurfaceBase *pSurf = *pr;
-        pSurf->updateVisibleTargRect(NULL, aRect);
+        pSurf->updateVisibility(NULL, aRect, false);
     }
 
@@ -4151 +4157 @@
         {
             VBoxVHWASurfaceBase *pSurf = *sit;
-            pSurf->updateVisibleTargRect(mDisplay.getPrimary(), aRect);
+            pSurf->updateVisibility(mDisplay.getPrimary(), aRect, false);
         }
     }
@@ -4678 +4684 @@
       mProcessingCommands(false),
       mNeedOverlayRepaint(false),
+      mNeedSetVisible(false),
       mCmdPipe(aView)
 {
@@ -4961 +4968 @@
 void VBoxQGLOverlay::vboxCheckUpdateOverlay(const QRect & rect)
 {
-    QRect overRect = mpOverlayWidget->rect();
+    QRect overRect(mpOverlayWidget->pos(), mpOverlayWidget->size());
     if(overRect.x() != rect.x() || overRect.y() != rect.y())
     {
+        mpOverlayWidget->setVisible(false);
+        mNeedSetVisible = true;
+        VBOXQGLLOG_QRECT("moving wgt to " , &rect, "\n");
         mpOverlayWidget->move(rect.x(), rect.y());
         mGlCurrent = false;
@@ -4970 +4980 @@
     if(overRect.width() != rect.width() || overRect.height() != rect.height())
     {
+        mpOverlayWidget->setVisible(false);
+        mNeedSetVisible = true;
+        VBOXQGLLOG(("resizing wgt to w(%d) ,h(%d)\n" , rect.width(), rect.height()));
         mpOverlayWidget->resize(rect.width(), rect.height());
         mGlCurrent = false;