Changeset 23899 in vbox

Timestamp:

Oct 20, 2009 11:42:26 AM (16 years ago)

Author:

vboxsync

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

53690

Message:

FE/Qt4-OSX: fix redraw problem on Snow Leopard/Carbon in a dual screen setup (public bug #4942)

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFrameBuffer.h (modified) (2 diffs)
• src/VBoxFBQuartz2D.cpp (modified) (7 diffs)

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

@@ -475 +475 @@
     void resizeEvent (VBoxResizeEvent *re);
 
+#ifndef QT_MAC_USE_COCOA
+    void testAndSetSNCarbonFix();
+#endif /* QT_MAC_USE_COCOA */
+
 private:
 
@@ -506 +510 @@
      * This is operated with atomic cmpxchg and atomic xchg. */
     RegionRects volatile *mRegionUnused;
+
+#ifndef QT_MAC_USE_COCOA
+    bool mSnowLeoCarbonFix;
+    EventHandlerRef mDarwinSNWindowHandlerRef;
+#endif /* QT_MAC_USE_COCOA */
 };
 

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

@@ -34 +34 @@
 #include "VBoxIChatTheaterWrapper.h"
 
+#include <QDesktopWidget>
+
+#include "iprt/system.h"
+
 //#define COMP_WITH_SHADOW
+//#define OVERLAY_CLIPRECTS
 
 /** @class VBoxQuartz2DFrameBuffer
@@ -42 +47 @@
  */
 
-VBoxQuartz2DFrameBuffer::VBoxQuartz2DFrameBuffer (VBoxConsoleView *aView) :
-    VBoxFrameBuffer(aView),
-    mDataAddress(NULL),
-    mBitmapData(NULL),
-    mPixelFormat(FramebufferPixelFormat_FOURCC_RGB),
-    mImage(NULL),
-    mRegion (NULL),
-    mRegionUnused (NULL)
+#ifndef QT_MAC_USE_COCOA
+static OSStatus darwinSNWindowHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData)
+{
+    if (     aInUserData
+        && ::GetEventClass (aInEvent) == kEventClassWindow
+        && ::GetEventKind (aInEvent) == kEventWindowBoundsChanged)
+        static_cast<VBoxQuartz2DFrameBuffer *> (aInUserData)->testAndSetSNCarbonFix();
+
+    return ::CallNextEventHandler (aInHandlerCallRef, aInEvent);
+}
+#endif /* QT_MAC_USE_COCOA */
+
+VBoxQuartz2DFrameBuffer::VBoxQuartz2DFrameBuffer (VBoxConsoleView *aView)
+    : VBoxFrameBuffer(aView)
+    , mDataAddress(NULL)
+    , mBitmapData(NULL)
+    , mPixelFormat(FramebufferPixelFormat_FOURCC_RGB)
+    , mImage(NULL)
+    , mRegion (NULL)
+    , mRegionUnused (NULL)
+#ifndef QT_MAC_USE_COCOA
+    , mSnowLeoCarbonFix (false)
+    , mDarwinSNWindowHandlerRef (NULL)
+#endif /* QT_MAC_USE_COCOA */
 {
     Log (("Quartz2D: Creating\n"));
+
+#ifndef QT_MAC_USE_COCOA
+    /* There seems to be a big bug on Snow Leopard regarding hardware
+     * accelerated image handling in Carbon. If our VM image is used on a
+     * second monitor it seems not really to be valid. (maybe the OpenGL
+     * texture is not properly shared between the two contexts). As a
+     * workaround we make a deep copy on every paint event. This workaround
+     * should only be in place if we are firstly on Snow Leopard and secondly
+     * on any screen beside the primary one. To track the current screen, we
+     * install a event handler for the window move event. Whenever the user
+     * drag the window around we recheck the current screen of the window. */
+    char szInfo[64];
+    int rc = RTSystemQueryOSInfo (RTSYSOSINFO_RELEASE, szInfo, sizeof(szInfo));
+    if (RT_SUCCESS (rc) &&
+        szInfo[0] == '1') /* higher than 1x.x.x */
+    {
+        EventTypeSpec eventTypes[] =
+        {
+            { kEventClassWindow, kEventWindowBoundsChanged }
+        };
+        ::InstallWindowEventHandler (::darwinToNativeWindow (mView->viewport()), darwinSNWindowHandler, RT_ELEMENTS (eventTypes), &eventTypes[0],
+                                     this, &mDarwinSNWindowHandlerRef);
+        /* Initialize it now */
+        testAndSetSNCarbonFix();
+    }
+#endif /* QT_MAC_USE_COCOA */
 
     VBoxResizeEvent event(FramebufferPixelFormat_Opaque,
@@ -62 +109 @@
     Log (("Quartz2D: Deleting\n"));
     clean();
+#ifndef QT_MAC_USE_COCOA
+    if (mDarwinSNWindowHandlerRef)
+    {
+       ::RemoveEventHandler (mDarwinSNWindowHandlerRef);
+       mDarwinSNWindowHandlerRef = NULL;
+    }
+#endif /* QT_MAC_USE_COCOA */
 }
 
@@ -187 +241 @@
         }
         else
-            subImage = CGImageCreateWithImageInRect (mImage, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
+        {
+
+#ifndef QT_MAC_USE_COCOA
+            /* For the reason of this see the constructor. */
+            if (mSnowLeoCarbonFix)
+            {
+                CGImageRef copy = CGImageCreateCopy (mImage);
+                subImage = CGImageCreateWithImageInRect (copy, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
+                CGImageRelease (copy);
+            }else
+#endif /* QT_MAC_USE_COCOA */
+                subImage = CGImageCreateWithImageInRect (mImage, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
+        }
         Assert (VALID_PTR (subImage));
         /* Clear the background (Make the rect fully transparent) */
         CGContextClearRect (ctx, viewRect);
+#ifdef OVERLAY_CLIPRECTS
+        CGContextSetRGBFillColor (ctx, 0.0, 0.0, 5.0, 0.7);
+        CGContextFillRect (ctx, viewRect);
+#endif
 #ifdef COMP_WITH_SHADOW
         /* Enable shadows */
@@ -222 +292 @@
 #endif
         CGImageRelease (subImage);
+#ifdef OVERLAY_CLIPRECTS
+        if (rgnRcts && rgnRcts->used > 0)
+        {
+            CGContextBeginPath (ctx);
+            CGContextAddRects (ctx, rgnRcts->rcts, rgnRcts->used);
+            CGContextSetRGBStrokeColor (ctx, 1.0, 0.0, 0.0, 0.7);
+            CGContextDrawPath (ctx, kCGPathStroke);
+        }
+        CGContextSetRGBStrokeColor (ctx, 0.0, 1.0, 0.0, 0.7);
+        CGContextStrokeRect (ctx, viewRect);
+#endif
     }
     else
@@ -239 +320 @@
         }
         else
-            subImage = CGImageCreateWithImageInRect (mImage, ::darwinToCGRect (is));
+        {
+#ifndef QT_MAC_USE_COCOA
+            /* For the reason of this see the constructor. */
+            if (mSnowLeoCarbonFix)
+            {
+                CGImageRef copy = CGImageCreateCopy (mImage);
+                subImage = CGImageCreateWithImageInRect (copy, ::darwinToCGRect (is));
+                CGImageRelease (copy);
+            }else
+#endif /* QT_MAC_USE_COCOA */
+                subImage = CGImageCreateWithImageInRect (mImage, ::darwinToCGRect (is));
+        }
         Assert (VALID_PTR (subImage));
         /* Ok, for more performance we set a clipping path of the
@@ -361 +453 @@
 }
 
+#ifndef QT_MAC_USE_COCOA
+void VBoxQuartz2DFrameBuffer::testAndSetSNCarbonFix()
+{
+    QWidget* viewport = mView->viewport();
+    Assert (VALID_PTR (viewport));
+    QDesktopWidget dw;
+    mSnowLeoCarbonFix = dw.primaryScreen() != dw.screenNumber (viewport);
+}
+#endif /* QT_MAC_USE_COCOA */
+
 #endif /* defined (VBOX_GUI_USE_QUARTZ2D) */