Changeset 47067 in vbox for trunk

Timestamp:

Jul 10, 2013 11:11:20 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Frame-buffers: Visible-region update optimization.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIFrameBuffer.cpp (modified) (1 diff)
• UIFrameBuffer.h (modified) (1 diff)
• UIFrameBufferQImage.cpp (modified) (1 diff)
• UIFrameBufferQImage.h (modified) (1 diff)
• UIFrameBufferQuartz2D.cpp (modified) (1 diff)
• UIFrameBufferQuartz2D.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -354 +354 @@
 }
 
+void UIFrameBuffer::applyVisibleRegion(const QRegion &region)
+{
+    /* Make sure async visible-region has changed: */
+    if (m_asyncVisibleRegion == region)
+        return;
+
+    /* We are accounting async visible-regions one-by-one
+     * to keep corresponding viewport area always updated! */
+    if (!m_asyncVisibleRegion.isEmpty())
+        m_pMachineView->viewport()->update(m_asyncVisibleRegion - region);
+
+    /* Remember last visible region: */
+    m_asyncVisibleRegion = region;
+
+#ifdef Q_WS_X11
+    /* Qt 4.8.3 under X11 has Qt::WA_TranslucentBackground window attribute broken,
+     * so we are also have to use async visible-region to apply to [Q]Widget [set]Mask
+     * which internally wraps old one known (approved) Xshape extension: */
+    m_pMachineView->machineWindow()->setMask(m_asyncVisibleRegion);
+#endif /* Q_WS_X11 */
+}
+
 #ifdef VBOX_WITH_VIDEOHWACCEL
 void UIFrameBuffer::doProcessVHWACommand(QEvent *pEvent)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h

@@ -190 +190 @@
     virtual void resizeEvent(UIResizeEvent *pEvent) = 0;
     virtual void paintEvent(QPaintEvent *pEvent) = 0;
-    virtual void applyVisibleRegion(const QRegion &region) = 0;
+    virtual void applyVisibleRegion(const QRegion &region);
 
 #ifdef VBOX_WITH_VIDEOHWACCEL

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp

@@ -178 +178 @@
 }
 
-void UIFrameBufferQImage::applyVisibleRegion(const QRegion &region)
-{
-    /* Make sure async visible-region changed: */
-    if (m_asyncVisibleRegion == region)
-        return;
-
-    /* We are accounting async visible-regions one-by-one
-     * to keep corresponding viewport area always updated! */
-    m_pMachineView->viewport()->update(region + m_asyncVisibleRegion);
-    m_asyncVisibleRegion = region;
-
-#ifdef Q_WS_X11
-    /* Qt 4.8.3 under X11 has Qt::WA_TranslucentBackground window attribute broken,
-     * so we are also have to use async visible-region to apply to [Q]Widget [set]Mask
-     * which internally wraps old one known (approved) Xshape extension: */
-    m_pMachineView->machineWindow()->setMask(m_asyncVisibleRegion);
-#endif /* Q_WS_X11 */
-}
-
 void UIFrameBufferQImage::paintDefault(QPaintEvent *pEvent)
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.h

@@ -47 +47 @@
     void resizeEvent(UIResizeEvent *pEvent);
     void paintEvent(QPaintEvent *pEvent);
-    void applyVisibleRegion(const QRegion &region);
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp

@@ -468 +468 @@
 }
 
-void UIFrameBufferQuartz2D::applyVisibleRegion(const QRegion &region)
-{
-    /* Make sure async visible-region changed: */
-    if (m_asyncVisibleRegion == region)
-        return;
-
-    /* We are handling the fact of async visible-region change
-     * to invalidate whole the viewport area! */
-    ::darwinWindowInvalidateShape(m_pMachineView->viewport());
-    m_asyncVisibleRegion = region;
-}
-
 void UIFrameBufferQuartz2D::clean(bool fPreserveRegions)
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.h

@@ -50 +50 @@
     void resizeEvent(UIResizeEvent *pEvent);
     void paintEvent(QPaintEvent *pEvent);
-    void applyVisibleRegion(const QRegion &region);
 
 #ifdef VBOX_WITH_VIDEOHWACCEL