Changeset 27021 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2010 12:58:38 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: Mac seamless fixes

Location:

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

Files:

• UIFrameBufferQuartz2D.cpp (modified) (12 diffs)
• UIFrameBufferQuartz2D.h (modified) (3 diffs)
• UIMachineView.cpp (modified) (1 diff)
• UIMachineView.h (modified) (2 diffs)

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

@@ -35 +35 @@
 #include "UIFrameBufferQuartz2D.h"
 #include "UIMachineView.h"
+#include "UIMachineLogic.h"
 #include "VBoxUtils.h"
-
-///* Needed for checking against seamless mode */
-//#include "VBoxConsoleWnd.h"
-//#include "VBoxIChatTheaterWrapper.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -52 +49 @@
  */
 
-#ifndef QT_MAC_USE_COCOA
-static OSStatus darwinSNWindowHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData)
-{
-    if (     aInUserData
-        && ::GetEventClass (aInEvent) == kEventClassWindow
-        && ::GetEventKind (aInEvent) == kEventWindowBoundsChanged)
-        static_cast<UIFrameBufferQuartz2D *> (aInUserData)->testAndSetSNCarbonFix();
-
-    return ::CallNextEventHandler (aInHandlerCallRef, aInEvent);
-}
-#endif /* QT_MAC_USE_COCOA */
-
 UIFrameBufferQuartz2D::UIFrameBufferQuartz2D(UIMachineView *pMachineView)
     : UIFrameBuffer(pMachineView)
+    , m_pMachineLogic(pMachineView->machineLogic())
     , m_pDataAddress(NULL)
     , m_pBitmapData(NULL)
     , m_uPixelFormat(FramebufferPixelFormat_FOURCC_RGB)
     , m_image(NULL)
-    , mRegion (NULL)
-    , mRegionUnused (NULL)
-#ifndef QT_MAC_USE_COCOA
-    , mSnowLeoCarbonFix (false)
-    , mDarwinSNWindowHandlerRef (NULL)
-#endif /* QT_MAC_USE_COCOA */
+    , mRegion(NULL)
+    , mRegionUnused(NULL)
 {
     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 (m_pMachineView->viewport()), darwinSNWindowHandler, RT_ELEMENTS (eventTypes), &eventTypes[0],
-                                     this, &mDarwinSNWindowHandlerRef);
-        /* Initialize it now */
-        testAndSetSNCarbonFix();
-    }
-#endif /* QT_MAC_USE_COCOA */
 
     UIResizeEvent event(FramebufferPixelFormat_Opaque,
@@ -114 +70 @@
     Log (("Quartz2D: Deleting\n"));
     clean();
-#ifndef QT_MAC_USE_COCOA
-    if (mDarwinSNWindowHandlerRef)
-    {
-       ::RemoveEventHandler (mDarwinSNWindowHandlerRef);
-       mDarwinSNWindowHandlerRef = NULL;
-    }
-#endif /* QT_MAC_USE_COCOA */
 }
 
 /** @note This method is called on EMT from under this object's lock */
-STDMETHODIMP UIFrameBufferQuartz2D::NotifyUpdate (ULONG aX, ULONG aY,
+STDMETHODIMP UIFrameBufferQuartz2D::NotifyUpdate(ULONG aX, ULONG aY,
                                                  ULONG aW, ULONG aH)
 {
 /*    Log (("Quartz2D: NotifyUpdate %d,%d %dx%d\n", aX, aY, aW, aH));*/
 
-    QApplication::postEvent (m_pMachineView,
-                             new UIRepaintEvent (aX, aY, aW, aH));
+    QApplication::postEvent(m_pMachineView,
+                            new UIRepaintEvent (aX, aY, aW, aH));
     return S_OK;
 }
 
-STDMETHODIMP UIFrameBufferQuartz2D::SetVisibleRegion (BYTE *aRectangles, ULONG aCount)
+STDMETHODIMP UIFrameBufferQuartz2D::SetVisibleRegion(BYTE *aRectangles, ULONG aCount)
 {
     PRTRECT rects = (PRTRECT)aRectangles;
@@ -147 +96 @@
      * ASMAtomic(Cmp)XchgPtr and a struct { cAllocated; cRects; aRects[1]; }
      * *mRegion, *mUnusedRegion; should suffice (and permit you to reuse allocations). */
-    RegionRects *rgnRcts = (RegionRects *) ASMAtomicXchgPtr ((void * volatile *) &mRegionUnused, NULL);
+    RegionRects *rgnRcts = (RegionRects *)ASMAtomicXchgPtr((void * volatile *) &mRegionUnused, NULL);
     if (rgnRcts && rgnRcts->allocated < aCount)
     {
@@ -155 +104 @@
     if (!rgnRcts)
     {
-        ULONG allocated = RT_ALIGN_32 (aCount + 1, 32);
+        ULONG allocated = RT_ALIGN_32(aCount + 1, 32);
         allocated = RT_MAX (128, allocated);
-        rgnRcts = (RegionRects *) RTMemAlloc (RT_OFFSETOF (RegionRects, rcts[allocated]));
+        rgnRcts = (RegionRects *)RTMemAlloc(RT_OFFSETOF(RegionRects, rcts[allocated]));
         if (!rgnRcts)
             return E_OUTOFMEMORY;
@@ -170 +119 @@
     {
         QRect rect;
-        rect.setLeft (rects->xLeft);
-        rect.setTop (rects->yTop);
+        rect.setLeft(rects->xLeft);
+        rect.setTop(rects->yTop);
         /* QRect are inclusive */
-        rect.setRight (rects->xRight - 1);
-        rect.setBottom (rects->yBottom - 1);
+        rect.setRight(rects->xRight - 1);
+        rect.setBottom(rects->yBottom - 1);
 
         /* The rect should intersect with the vm screen. */
-        rect = vmScreenRect.intersect (rect);
+        rect = vmScreenRect.intersect(rect);
         ++ rects;
         /* Make sure only valid rects are distributed */
@@ -198 +147 @@
 //    printf ("..................................\n");
 
-    void *pvOld = ASMAtomicXchgPtr ((void * volatile *) &mRegion, rgnRcts);
+    void *pvOld = ASMAtomicXchgPtr((void * volatile *)&mRegion, rgnRcts);
     if (    pvOld
-        &&  !ASMAtomicCmpXchgPtr ((void * volatile *) &mRegionUnused, pvOld, NULL))
+        &&  !ASMAtomicCmpXchgPtr((void * volatile *)&mRegionUnused, pvOld, NULL))
         RTMemFree (pvOld);
 
-    QApplication::postEvent (m_pMachineView, new UISetRegionEvent (reg));
+    QApplication::postEvent(m_pMachineView, new UISetRegionEvent (reg));
 
     return S_OK;
 }
 
-void UIFrameBufferQuartz2D::paintEvent (QPaintEvent *aEvent)
+void UIFrameBufferQuartz2D::paintEvent(QPaintEvent *aEvent)
 {
     /* For debugging /Developer/Applications/Performance Tools/Quartz
@@ -219 +168 @@
 //    Assert (VALID_PTR (main));
     QWidget* viewport = m_pMachineView->viewport();
-    Assert (VALID_PTR (viewport));
+    Assert(VALID_PTR (viewport));
     /* Get the dimensions of the viewport */
-    CGRect viewRect = ::darwinToCGRect (viewport->geometry());
+    CGRect viewRect = ::darwinToCGRect(viewport->geometry());
     /* Get the context of this window from Qt */
-    CGContextRef ctx = ::darwinToCGContextRef (viewport);
-    Assert (VALID_PTR (ctx));
+    CGContextRef ctx = ::darwinToCGContextRef(viewport);
+    Assert(VALID_PTR (ctx));
 
     /* Flip the context */
@@ -231 +180 @@
 
     /* We handle the seamless mode as a special case. */
-//    if (main->isTrueSeamless())
-    if (0)
+    if (m_pMachineLogic->visualStateType() == UIVisualStateType_Seamless)
     {
         /* Here we paint the windows without any wallpaper.
@@ -247 +195 @@
         }
         else
-        {
-
-#ifndef QT_MAC_USE_COCOA
-            /* For the reason of this see the constructor. */
-            if (mSnowLeoCarbonFix)
-            {
-                CGImageRef copy = CGImageCreateCopy (m_image);
-                subImage = CGImageCreateWithImageInRect (copy, CGRectMake (m_pMachineView->contentsX(), m_pMachineView->contentsY(), m_pMachineView->visibleWidth(), m_pMachineView->visibleHeight()));
-                CGImageRelease (copy);
-            }else
-#endif /* QT_MAC_USE_COCOA */
-                subImage = CGImageCreateWithImageInRect (m_image, CGRectMake (m_pMachineView->contentsX(), m_pMachineView->contentsY(), m_pMachineView->visibleWidth(), m_pMachineView->visibleHeight()));
-        }
+            subImage = CGImageCreateWithImageInRect (m_image, CGRectMake (m_pMachineView->contentsX(), m_pMachineView->contentsY(), m_pMachineView->visibleWidth(), m_pMachineView->visibleHeight()));
         Assert (VALID_PTR (subImage));
         /* Clear the background (Make the rect fully transparent) */
@@ -326 +262 @@
         }
         else
-        {
-#ifndef QT_MAC_USE_COCOA
-            /* For the reason of this see the constructor. */
-            if (mSnowLeoCarbonFix)
-            {
-                CGImageRef copy = CGImageCreateCopy (m_image);
-                subImage = CGImageCreateWithImageInRect (copy, ::darwinToCGRect (is));
-                CGImageRelease (copy);
-            }else
-#endif /* QT_MAC_USE_COCOA */
-                subImage = CGImageCreateWithImageInRect (m_image, ::darwinToCGRect (is));
-        }
+            subImage = CGImageCreateWithImageInRect (m_image, ::darwinToCGRect (is));
         Assert (VALID_PTR (subImage));
         /* Ok, for more performance we set a clipping path of the
@@ -459 +384 @@
 }
 
-#ifndef QT_MAC_USE_COCOA
-void UIFrameBufferQuartz2D::testAndSetSNCarbonFix()
-{
-    QWidget* viewport = m_pMachineView->viewport();
-    Assert (VALID_PTR (viewport));
-    QDesktopWidget dw;
-    mSnowLeoCarbonFix = dw.primaryScreen() != dw.screenNumber (viewport);
-}
-#endif /* QT_MAC_USE_COCOA */
-
 #endif /* defined (VBOX_GUI_USE_QUARTZ2D) */
 

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

@@ -32 +32 @@
 #include <Carbon/Carbon.h>
 
+/* Local forward declarations */
+class UIMachineLogic;
+
 class UIFrameBufferQuartz2D : public UIFrameBuffer
 {
@@ -53 +56 @@
     void resizeEvent(UIResizeEvent *pEvent);
 
-#ifndef QT_MAC_USE_COCOA
-    void testAndSetSNCarbonFix();
-#endif /* QT_MAC_USE_COCOA */
-
 private:
 
     void clean();
 
+    UIMachineLogic *m_pMachineLogic;
     uchar *m_pDataAddress;
     void *m_pBitmapData;
@@ -89 +89 @@
     RegionRects volatile *mRegionUnused;
 
-#ifndef QT_MAC_USE_COCOA
-    bool mSnowLeoCarbonFix;
-    EventHandlerRef mDarwinSNWindowHandlerRef;
-#endif /* QT_MAC_USE_COCOA */
 };
 #endif /* Q_WS_MAC && VBOX_GUI_USE_QUARTZ2D */

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

@@ -284 +284 @@
 {
     return verticalScrollBar()->pageStep();
+}
+
+UIMachineLogic* UIMachineView::machineLogic() const
+{
+    return machineWindowWrapper()->machineLogic();
 }
 

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

@@ -39 +39 @@
 class UIFrameBuffer;
 class UIMachineWindow;
+class UIMachineLogic;
 class VBoxGlobalSettings;
 #ifdef Q_WS_MAC
@@ -117 +118 @@
     UIFrameBuffer* frameBuffer() const { return m_pFrameBuffer; }
     UIMachineWindow* machineWindowWrapper() const { return m_pMachineWindow; }
+    UIMachineLogic* machineLogic() const;
     bool isHostKeyPressed() const { return m_bIsHostkeyPressed; }
     bool isMachineWindowResizeIgnored() const { return m_bIsMachineWindowResizeIgnored; }