Changeset 52903 in vbox

Timestamp:

Sep 30, 2014 5:10:24 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI rework/cleanup for 7115 (part #2): Some frame-buffer rework related to r96322.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (3 diffs)

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

@@ -317 +317 @@
                                               ComSafeArrayIn(BYTE, image))
 {
-    // TODO: Retina handling..
-
-    /* Copying received data (is it shallow?): */
+    /* Retina screens with physical-to-logical scaling requires
+     * odd/even pixel updates to be taken into account,
+     * otherwise we have artifacts on the borders of incoming rectangle. */
+    uX = qMax(0, (int)uX - 1);
+    uY = qMax(0, (int)uY - 1);
+    uWidth = qMin(m_iWidth, (int)uWidth + 2);
+    uHeight = qMin(m_iHeight, (int)uHeight + 2);
+
+    /* Wrapping received data: */
     com::SafeArray<BYTE> imageData(ComSafeArrayInArg(image));
 
@@ -325 +331 @@
     lock();
 
-    // TODO: Why does this handling so different from UIFrameBuffer::NotifyUpdate?
-    //       And where is the part about m_fUnused?
-
+    /* Make sure frame-buffer is used: */
+    if (m_fUnused)
+    {
+        LogRel2(("UIFrameBuffer::NotifyUpdateImage: Origin=%lux%lu, Size=%lux%lu, Ignored!\n",
+                 (unsigned long)uX, (unsigned long)uY,
+                 (unsigned long)uWidth, (unsigned long)uHeight));
+
+        /* Unlock access to frame-buffer: */
+        unlock();
+
+        /* Ignore NotifyUpdate: */
+        return E_FAIL;
+    }
+
+    /* Directly update m_image: */
     if (m_fUpdatesAllowed)
     {
@@ -340 +358 @@
             pu8Src += uWidth * 4;
         }
+
+        /* Widget update is NOT thread-safe and *seems* never will be,
+         * We have to notify machine-view with the async-signal to perform update operation. */
         LogRel2(("UIFrameBuffer::NotifyUpdateImage: Origin=%lux%lu, Size=%lux%lu, Sending to async-handler\n",
                  (unsigned long)uX, (unsigned long)uY,