Changeset 46283 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 27, 2013 11:22:29 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86027

Message:

FE/Qt: Runtime UI: QImage frame-buffer stuff: Experimental try to fix seamless-region flicker.

Location:

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

Files:

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

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

@@ -264 +264 @@
     }
     lock(); /* See comment in setView(). */
+    m_syncVisibleRegion = reg;
     if (m_pMachineView)
         QApplication::postEvent(m_pMachineView, new UISetRegionEvent(reg));

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

@@ -237 +237 @@
     ulong m_width;
     ulong m_height;
-    QRegion m_visibleRegion;
     QSize m_scaledSize;
     int64_t m_WinId;
     bool m_fIsDeleted;
 
+    /* To avoid a seamless flicker,
+     * which caused by the latency between the
+     * initial visible-region arriving from EMT thread
+     * and actual visible-region application on GUI thread
+     * it was decided to use two visible-region instances:
+     * 1. 'Sync-one' which being updated synchronously by locking EMT thread,
+     *               and used for immediate manual clipping of the painting operations.
+     * 2. 'Async-one' which updated asynchronously by posting async-event from EMT to GUI thread,
+                      which is used to update viewport parts for visible-region changes,
+                      because NotifyUpdate doesn't take into account these changes. */
+    QRegion m_syncVisibleRegion;
+    QRegion m_asyncVisibleRegion;
+
 #if defined (Q_OS_WIN32)
 private:

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

@@ -56 +56 @@
 {
     /* Invalidate visible-region if necessary: */
-    if (m_width != pEvent->width() ||
-        m_height != pEvent->height())
-        m_visibleRegion = QRegion();
+    if (m_pMachineView->machineLogic()->visualStateType() == UIVisualStateType_Seamless &&
+        (m_width != pEvent->width() || m_height != pEvent->height()))
+    {
+        lock();
+        m_syncVisibleRegion = QRegion();
+        m_asyncVisibleRegion = QRegion();
+        unlock();
+    }
 
     /* Remember new width/height: */
@@ -175 +180 @@
 void UIFrameBufferQImage::applyVisibleRegionEvent(UISetRegionEvent *pEvent)
 {
-    /* Make sure visible-region changed: */
-    if (m_visibleRegion == pEvent->region())
-        return;
-
-    /* Compose viewport region to update: */
-    QRegion toUpdate = pEvent->region() + m_visibleRegion;
-    /* Remember new visible-region: */
-    m_visibleRegion = pEvent->region();
-    /* Update viewport region finally: */
-    m_pMachineView->viewport()->update(toUpdate);
+    /* Make sure async visible-region changed: */
+    if (m_asyncVisibleRegion == pEvent->region())
+        return;
+
+    /* We are accounting async visible-regions one-by-one
+     * to keep corresponding viewport area always updated! */
+    m_pMachineView->viewport()->update(pEvent->region() + m_asyncVisibleRegion);
+    m_asyncVisibleRegion = pEvent->region();
+
 #ifdef Q_WS_X11
     /* Qt 4.8.3 under X11 has Qt::WA_TranslucentBackground window attribute broken,
-     * so we are still have to use old one known Xshape extension wrapped by the widget setMask API: */
-    m_pMachineView->machineWindow()->setMask(m_visibleRegion);
+     * 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 */
 }
@@ -226 +231 @@
     painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
 
+    /* Manually clip paint rectangle using visible-region: */
+    lock();
+    QRegion visiblePaintRegion = m_syncVisibleRegion & paintRect;
+    unlock();
+
     /* Repaint all the rectangles of visible-region: */
-    QRegion visiblePaintRegion = m_visibleRegion & paintRect;
     foreach (const QRect &rect, visiblePaintRegion.rects())
     {

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

@@ -465 +465 @@
 void UIFrameBufferQuartz2D::applyVisibleRegionEvent(UISetRegionEvent *pEvent)
 {
-    /* Make sure visible-region changed: */
-    if (m_visibleRegion == pEvent->region())
+    /* Make sure async visible-region changed: */
+    if (m_asyncVisibleRegion == pEvent->region())
         return;
 
-    /* Remember new visible-region: */
-    m_visibleRegion = pEvent->region();
-    /* Invalidate whole the viewport: */
+    /* We are handling the fact of async visible-region change
+     * to invalidate whole the viewport area! */
     ::darwinWindowInvalidateShape(m_pMachineView->viewport());
+    m_asyncVisibleRegion = pEvent->region();
 }