Changeset 26781 in vbox

Timestamp:

Feb 25, 2010 11:11:32 AM (15 years ago)

Author:

vboxsync

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

58046

Message:

FE/Qt4: new core: Quartz2D up again

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/runtime/UIFrameBuffer.h (modified) (1 diff)
• src/runtime/UIFrameBufferQuartz2D.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBQuartz2D.cpp ) (21 diffs)
• src/runtime/UIFrameBufferQuartz2D.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h ) (4 diffs)
• src/runtime/UIMachineLogic.cpp (modified) (1 diff)
• src/runtime/UIMachineView.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -490 +490 @@
         src/runtime/UIIndicatorsPool.cpp \
         src/runtime/UIFrameBuffer.cpp \
+        src/runtime/UIFrameBufferQuartz2D.cpp \
         src/runtime/UIMachine.cpp \
         src/runtime/UIMachineLogic.cpp \

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

@@ -431 +431 @@
 
 #endif
-#if defined (Q_WS_MAC) && defined (VBOX_GUI_USE_QUARTZ2D)
-#include <Carbon/Carbon.h>
-
-class UIFrameBufferQuartz2D : public UIFrameBuffer
-{
-public:
-
-    UIFrameBufferQuartz2D(UIMachineView *pMachineView);
-    virtual ~UIFrameBufferQuartz2D();
-
-    STDMETHOD (NotifyUpdate) (ULONG uX, ULONG uY, ULONG uW, ULONG uH);
-    STDMETHOD (SetVisibleRegion) (BYTE *pRectangles, ULONG uCount);
-
-    uchar* address() { return m_pDataAddress; }
-    ulong bitsPerPixel() { return CGImageGetBitsPerPixel(m_image); }
-    ulong bytesPerLine() { return CGImageGetBytesPerRow(m_image); }
-    ulong pixelFormat() { return m_uPixelFormat; };
-    bool usesGuestVRAM() { return m_pBitmapData == NULL; }
-
-    const CGImageRef imageRef() const { return m_image; }
-
-    void paintEvent(QPaintEvent *pEvent);
-    void resizeEvent(UIResizeEvent *pEvent);
-
-#ifndef QT_MAC_USE_COCOA
-    void testAndSetSNCarbonFix();
-#endif /* QT_MAC_USE_COCOA */
-
-private:
-
-    void clean();
-
-    uchar *m_pDataAddress;
-    void *m_pBitmapData;
-    ulong m_uPixelFormat;
-    CGImageRef m_image;
-    typedef struct
-    {
-        /** The size of this structure expressed in rcts entries. */
-        ULONG allocated;
-        /** The number of entries in the rcts array. */
-        ULONG used;
-        /** Variable sized array of the rectangle that makes up the region. */
-        CGRect rcts[1];
-    } RegionRects;
-    /** The current valid region, all access is by atomic cmpxchg or atomic xchg.
-     *
-     * The protocol for updating and using this has to take into account that
-     * the producer (SetVisibleRegion) and consumer (paintEvent) are running
-     * on different threads. Therefore the producer will create a new RegionRects
-     * structure before atomically replace the existing one. While the consumer
-     * will read the value by atomically replace it by NULL, and then when its
-     * done try restore it by cmpxchg. If the producer has already put a new
-     * region there, it will be discarded (see mRegionUnused).
-     */
-    RegionRects volatile *mRegion;
-    /** For keeping the unused region and thus avoid some RTMemAlloc/RTMemFree calls.
-     * 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 */
-};
-#endif /* Q_WS_MAC && VBOX_GUI_USE_QUARTZ2D */
 
 #endif // !___UIFrameBuffer_h___

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * Qt GUI (aka VirtualBox) - Quartz2D framebuffer implementation.
+ *
+ * VBox frontends: Qt GUI ("VirtualBox"):
+ * UIFrameBufferQuartz2D class implementation
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +27 @@
 # include "precomp.h"
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
+/* Global includes */
+#include <QApplication>
+
 #include <iprt/asm.h>
 
-/* VBox includes */
-#include "VBoxFrameBuffer.h"
-#include "VBoxConsoleView.h"
-#include "VBoxProblemReporter.h"
-#include "VBoxGlobal.h"
+/* Local includes */
+#include "UIFrameBufferQuartz2D.h"
+#include "UIMachineView.h"
 #include "VBoxUtils.h"
-/* Needed for checking against seamless mode */
-#include "VBoxConsoleWnd.h"
-#include "VBoxIChatTheaterWrapper.h"
-
-#include <QDesktopWidget>
-
-#include "iprt/system.h"
+
+///* Needed for checking against seamless mode */
+//#include "VBoxConsoleWnd.h"
+//#include "VBoxIChatTheaterWrapper.h"
+
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -45 +46 @@
 //#define OVERLAY_CLIPRECTS
 
-/** @class VBoxQuartz2DFrameBuffer
+/** @class UIFrameBufferQuartz2D
  *
- *  The VBoxQuartz2dFrameBuffer class is a class that implements the IFrameBuffer
+ *  The UIFrameBufferQuartz2D class is a class that implements the IFrameBuffer
  *  interface and uses Apples Quartz2D to store and render VM display data.
  */
@@ -57 +58 @@
         && ::GetEventClass (aInEvent) == kEventClassWindow
         && ::GetEventKind (aInEvent) == kEventWindowBoundsChanged)
-        static_cast<VBoxQuartz2DFrameBuffer *> (aInUserData)->testAndSetSNCarbonFix();
+        static_cast<UIFrameBufferQuartz2D *> (aInUserData)->testAndSetSNCarbonFix();
 
     return ::CallNextEventHandler (aInHandlerCallRef, aInEvent);
@@ -63 +64 @@
 #endif /* QT_MAC_USE_COCOA */
 
-VBoxQuartz2DFrameBuffer::VBoxQuartz2DFrameBuffer (VBoxConsoleView *aView)
-    : VBoxFrameBuffer(aView)
-    , mDataAddress(NULL)
-    , mBitmapData(NULL)
-    , mPixelFormat(FramebufferPixelFormat_FOURCC_RGB)
-    , mImage(NULL)
+UIFrameBufferQuartz2D::UIFrameBufferQuartz2D(UIMachineView *pMachineView)
+    : UIFrameBuffer(pMachineView)
+    , m_pDataAddress(NULL)
+    , m_pBitmapData(NULL)
+    , m_uPixelFormat(FramebufferPixelFormat_FOURCC_RGB)
+    , m_image(NULL)
     , mRegion (NULL)
     , mRegionUnused (NULL)
@@ -97 +98 @@
             { kEventClassWindow, kEventWindowBoundsChanged }
         };
-        ::InstallWindowEventHandler (::darwinToNativeWindow (mView->viewport()), darwinSNWindowHandler, RT_ELEMENTS (eventTypes), &eventTypes[0],
+        ::InstallWindowEventHandler (::darwinToNativeWindow (m_pMachineView->viewport()), darwinSNWindowHandler, RT_ELEMENTS (eventTypes), &eventTypes[0],
                                      this, &mDarwinSNWindowHandlerRef);
         /* Initialize it now */
@@ -104 +105 @@
 #endif /* QT_MAC_USE_COCOA */
 
-    VBoxResizeEvent event(FramebufferPixelFormat_Opaque,
-                          NULL, 0, 0, 640, 480);
+    UIResizeEvent event(FramebufferPixelFormat_Opaque,
+                        NULL, 0, 0, 640, 480);
     resizeEvent (&event);
 }
 
-VBoxQuartz2DFrameBuffer::~VBoxQuartz2DFrameBuffer()
+UIFrameBufferQuartz2D::~UIFrameBufferQuartz2D()
 {
     Log (("Quartz2D: Deleting\n"));
@@ -123 +124 @@
 
 /** @note This method is called on EMT from under this object's lock */
-STDMETHODIMP VBoxQuartz2DFrameBuffer::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 (mView,
-                             new VBoxRepaintEvent (aX, aY, aW, aH));
+    QApplication::postEvent (m_pMachineView,
+                             new UIRepaintEvent (aX, aY, aW, aH));
     return S_OK;
 }
 
-STDMETHODIMP VBoxQuartz2DFrameBuffer::SetVisibleRegion (BYTE *aRectangles, ULONG aCount)
+STDMETHODIMP UIFrameBufferQuartz2D::SetVisibleRegion (BYTE *aRectangles, ULONG aCount)
 {
     PRTRECT rects = (PRTRECT)aRectangles;
@@ -202 +203 @@
         RTMemFree (pvOld);
 
-    QApplication::postEvent (mView, new VBoxSetRegionEvent (reg));
+    QApplication::postEvent (m_pMachineView, new UISetRegionEvent (reg));
 
     return S_OK;
 }
 
-void VBoxQuartz2DFrameBuffer::paintEvent (QPaintEvent *aEvent)
+void UIFrameBufferQuartz2D::paintEvent (QPaintEvent *aEvent)
 {
     /* For debugging /Developer/Applications/Performance Tools/Quartz
@@ -213 +214 @@
      * updated.*/
 
-    Assert (mImage);
-
-    VBoxConsoleWnd *main = qobject_cast <VBoxConsoleWnd *> (vboxGlobal().mainWindow());
-    Assert (VALID_PTR (main));
-    QWidget* viewport = mView->viewport();
+    Assert (m_image);
+
+//    VBoxConsoleWnd *main = qobject_cast <VBoxConsoleWnd *> (vboxGlobal().mainWindow());
+//    Assert (VALID_PTR (main));
+    QWidget* viewport = m_pMachineView->viewport();
     Assert (VALID_PTR (viewport));
     /* Get the dimensions of the viewport */
@@ -230 +231 @@
 
     /* We handle the seamless mode as a special case. */
-    if (main->isTrueSeamless())
+//    if (main->isTrueSeamless())
+    if (0)
     {
         /* Here we paint the windows without any wallpaper.
@@ -238 +240 @@
          * Currently this subimage is the whole screen. */
         CGImageRef subImage;
-        if (!mView->pauseShot().isNull())
-        {
-            CGImageRef pauseImg = ::darwinToCGImageRef (&mView->pauseShot());
-            subImage = CGImageCreateWithImageInRect (pauseImg, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
+        if (!m_pMachineView->pauseShot().isNull())
+        {
+            CGImageRef pauseImg = ::darwinToCGImageRef (&m_pMachineView->pauseShot());
+            subImage = CGImageCreateWithImageInRect (pauseImg, CGRectMake (m_pMachineView->contentsX(), m_pMachineView->contentsY(), m_pMachineView->visibleWidth(), m_pMachineView->visibleHeight()));
             CGImageRelease (pauseImg);
         }
@@ -251 +253 @@
             if (mSnowLeoCarbonFix)
             {
-                CGImageRef copy = CGImageCreateCopy (mImage);
-                subImage = CGImageCreateWithImageInRect (copy, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
+                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 (mImage, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
+                subImage = CGImageCreateWithImageInRect (m_image, CGRectMake (m_pMachineView->contentsX(), m_pMachineView->contentsY(), m_pMachineView->visibleWidth(), m_pMachineView->visibleHeight()));
         }
         Assert (VALID_PTR (subImage));
@@ -315 +317 @@
          * of the bounding box of the current paint event */
         QRect ir = aEvent->rect();
-        QRect is = QRect (ir.x() + mView->contentsX(), ir.y() + mView->contentsY(), ir.width(), ir.height());
+        QRect is = QRect (ir.x() + m_pMachineView->contentsX(), ir.y() + m_pMachineView->contentsY(), ir.width(), ir.height());
         CGImageRef subImage;
-        if (!mView->pauseShot().isNull())
-        {
-            CGImageRef pauseImg = ::darwinToCGImageRef (&mView->pauseShot());
+        if (!m_pMachineView->pauseShot().isNull())
+        {
+            CGImageRef pauseImg = ::darwinToCGImageRef (&m_pMachineView->pauseShot());
             subImage = CGImageCreateWithImageInRect (pauseImg, ::darwinToCGRect (is));
             CGImageRelease (pauseImg);
@@ -329 +331 @@
             if (mSnowLeoCarbonFix)
             {
-                CGImageRef copy = CGImageCreateCopy (mImage);
+                CGImageRef copy = CGImageCreateCopy (m_image);
                 subImage = CGImageCreateWithImageInRect (copy, ::darwinToCGRect (is));
                 CGImageRelease (copy);
             }else
 #endif /* QT_MAC_USE_COCOA */
-                subImage = CGImageCreateWithImageInRect (mImage, ::darwinToCGRect (is));
+                subImage = CGImageCreateWithImageInRect (m_image, ::darwinToCGRect (is));
         }
         Assert (VALID_PTR (subImage));
@@ -359 +361 @@
 }
 
-void VBoxQuartz2DFrameBuffer::resizeEvent (VBoxResizeEvent *aEvent)
+void UIFrameBufferQuartz2D::resizeEvent (UIResizeEvent *aEvent)
 {
 #if 0
@@ -371 +373 @@
     clean();
 
-    mWdt = aEvent->width();
-    mHgt = aEvent->height();
+    m_width = aEvent->width();
+    m_height = aEvent->height();
 
     bool remind = false;
@@ -386 +388 @@
 //        printf ("VRAM\n");
         /* Create the image copy of the framebuffer */
-        CGDataProviderRef dp = CGDataProviderCreateWithData (NULL, aEvent->VRAM(), aEvent->bitsPerPixel() / 8 * mWdt * mHgt, NULL);
-        mImage = CGImageCreate (mWdt, mHgt, 8, aEvent->bitsPerPixel(), aEvent->bytesPerLine(), cs,
+        CGDataProviderRef dp = CGDataProviderCreateWithData (NULL, aEvent->VRAM(), aEvent->bitsPerPixel() / 8 * m_width * m_height, NULL);
+        m_image = CGImageCreate (m_width, m_height, 8, aEvent->bitsPerPixel(), aEvent->bytesPerLine(), cs,
                                 kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little, dp, 0, false,
                                 kCGRenderingIntentDefault);
-        mDataAddress = aEvent->VRAM();
+        m_pDataAddress = aEvent->VRAM();
         CGDataProviderRelease (dp);
     }
@@ -400 +402 @@
          * Read somewhere that an alignment of 16 is
          * best for optimal performance. So why not. */
-//        int bitmapBytesPerRow = RT_ALIGN (mWdt * 4, 16);
-        int bitmapBytesPerRow = mWdt * 4;
-        int bitmapByteCount = (bitmapBytesPerRow * mHgt);
-        mBitmapData = RTMemAlloc (bitmapByteCount);
-        CGDataProviderRef dp = CGDataProviderCreateWithData (NULL, mBitmapData, bitmapByteCount, NULL);
-        mImage = CGImageCreate (mWdt, mHgt, 8, 32, bitmapBytesPerRow, cs,
+//        int bitmapBytesPerRow = RT_ALIGN (m_width * 4, 16);
+        int bitmapBytesPerRow = m_width * 4;
+        int bitmapByteCount = (bitmapBytesPerRow * m_height);
+        m_pBitmapData = RTMemAlloc (bitmapByteCount);
+        CGDataProviderRef dp = CGDataProviderCreateWithData (NULL, m_pBitmapData, bitmapByteCount, NULL);
+        m_image = CGImageCreate (m_width, m_height, 8, 32, bitmapBytesPerRow, cs,
                                kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little, dp, 0, false,
                                kCGRenderingIntentDefault);
-        mDataAddress = static_cast <uchar*> (mBitmapData);
+        m_pDataAddress = static_cast <uchar*> (m_pBitmapData);
         CGDataProviderRelease (dp);
     }
     CGColorSpaceRelease (cs);
 #ifdef VBOX_WITH_ICHAT_THEATER
-    setImageRef (mImage);
+    setImageRef (m_image);
 #endif
 
@@ -433 +435 @@
 }
 
-void VBoxQuartz2DFrameBuffer::clean()
-{
-    if (mImage)
-    {
-        CGImageRelease (mImage);
-        mImage = NULL;
-    }
-    if (mBitmapData)
-    {
-        RTMemFree (mBitmapData);
-        mBitmapData = NULL;
+void UIFrameBufferQuartz2D::clean()
+{
+    if (m_image)
+    {
+        CGImageRelease (m_image);
+        m_image = NULL;
+    }
+    if (m_pBitmapData)
+    {
+        RTMemFree (m_pBitmapData);
+        m_pBitmapData = NULL;
     }
     if (mRegion)
@@ -458 +460 @@
 
 #ifndef QT_MAC_USE_COCOA
-void VBoxQuartz2DFrameBuffer::testAndSetSNCarbonFix()
-{
-    QWidget* viewport = mView->viewport();
+void UIFrameBufferQuartz2D::testAndSetSNCarbonFix()
+{
+    QWidget* viewport = m_pMachineView->viewport();
     Assert (VALID_PTR (viewport));
     QDesktopWidget dw;

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

@@ -2 +2 @@
  *
  * VBox frontends: Qt GUI ("VirtualBox"):
- * UIFrameBuffer class and subclasses declarations
+ * UIFrameBufferQuartz2D class declarations
  */
 
@@ -21 +21 @@
  */
 
-#ifndef ___UIFrameBuffer_h___
-#define ___UIFrameBuffer_h___
+#ifndef ___UIFrameBufferQuartz2D_h___
+#define ___UIFrameBufferQuartz2D_h___
 
-/* Global includes */
-//#include <QImage>
-#include <QPixmap>
-//#include <QMutex>
-#include <QPaintEvent>
-//#include <QMoveEvent>
-//#if defined (VBOX_GUI_USE_QGL)
-//#include "VBoxFBOverlay.h"
-//#endif
+#include <QtGlobal>
 
-/* Local includes */
-#include "COMDefs.h"
-#include <iprt/critsect.h>
+#if defined (Q_WS_MAC) && defined (VBOX_GUI_USE_QUARTZ2D)
 
-//#if defined (VBOX_GUI_USE_SDL)
-//#include <SDL.h>
-//#include <signal.h>
-//#endif
+#include "UIFrameBuffer.h"
 
-//#if defined (Q_WS_WIN) && defined (VBOX_GUI_USE_DDRAW)
-// VBox/cdefs.h defines these:
-//#undef LOWORD
-//#undef HIWORD
-//#undef LOBYTE
-//#undef HIBYTE
-//#include <ddraw.h>
-//#endif
-
-class UIMachineView;
-
-/**
- *  Frame buffer resize event.
- */
-class UIResizeEvent : public QEvent
-{
-public:
-
-    UIResizeEvent(ulong uPixelFormat, uchar *pVRAM,
-                  ulong uBitsPerPixel, ulong uBytesPerLine,
-                  ulong uWidth, ulong uHeight)
-        : QEvent((QEvent::Type)VBoxDefs::ResizeEventType)
-        , m_uPixelFormat(uPixelFormat), m_pVRAM(pVRAM), m_uBitsPerPixel(uBitsPerPixel)
-        , m_uBytesPerLine(uBytesPerLine), m_uWidth(uWidth), m_uHeight(uHeight) {}
-    ulong pixelFormat() { return m_uPixelFormat; }
-    uchar *VRAM() { return m_pVRAM; }
-    ulong bitsPerPixel() { return m_uBitsPerPixel; }
-    ulong bytesPerLine() { return m_uBytesPerLine; }
-    ulong width() { return m_uWidth; }
-    ulong height() { return m_uHeight; }
-
-private:
-
-    ulong m_uPixelFormat;
-    uchar *m_pVRAM;
-    ulong m_uBitsPerPixel;
-    ulong m_uBytesPerLine;
-    ulong m_uWidth;
-    ulong m_uHeight;
-};
-
-/**
- *  Frame buffer repaint event.
- */
-class UIRepaintEvent : public QEvent
-{
-public:
-
-    UIRepaintEvent(int iX, int iY, int iW, int iH)
-        : QEvent((QEvent::Type)VBoxDefs::RepaintEventType)
-        , m_iX(iX), m_iY(iY), m_iW(iW), m_iH(iH) {}
-    int x() { return m_iX; }
-    int y() { return m_iY; }
-    int width() { return m_iW; }
-    int height() { return m_iH; }
-
-private:
-
-    int m_iX, m_iY, m_iW, m_iH;
-};
-
-/**
- *  Frame buffer set region event.
- */
-class UISetRegionEvent : public QEvent
-{
-public:
-
-    UISetRegionEvent(const QRegion &region)
-        : QEvent((QEvent::Type)VBoxDefs::SetRegionEventType)
-        , m_region(region) {}
-    QRegion region() { return m_region; }
-
-private:
-
-    QRegion m_region;
-};
-
-/**
- *  Common IFramebuffer implementation for all methods used by GUI to maintain
- *  the VM display video memory.
- *
- *  Note that although this class can be called from multiple threads
- *  (in particular, the GUI thread and EMT) it doesn't protect access to every
- *  data field using its mutex lock. This is because all synchronization between
- *  the GUI and the EMT thread is supposed to be done using the
- *  IFramebuffer::NotifyUpdate() and IFramebuffer::RequestResize() methods
- *  (in particular, the \a aFinished parameter of these methods is responsible
- *  for the synchronization). These methods are always called on EMT and
- *  therefore always follow one another but never in parallel.
- *
- *  Using this object's mutex lock (exposed also in IFramebuffer::Lock() and
- *  IFramebuffer::Unlock() implementations) usually makes sense only if some
- *  third-party thread (i.e. other than GUI or EMT) needs to make sure that
- *  *no* VM display update or resize event can occur while it is accessing
- *  IFramebuffer properties or the underlying display memory storage area.
- *
- *  See IFramebuffer documentation for more info.
- */
-class UIFrameBuffer : VBOX_SCRIPTABLE_IMPL(IFramebuffer)
-{
-public:
-
-    UIFrameBuffer(UIMachineView *aView);
-    virtual ~UIFrameBuffer();
-
-    NS_DECL_ISUPPORTS
-
-#if defined (Q_OS_WIN32)
-    STDMETHOD_(ULONG, AddRef)()
-    {
-        return ::InterlockedIncrement(&m_iRefCnt);
-    }
-
-    STDMETHOD_(ULONG, Release)()
-    {
-        long cnt = ::InterlockedDecrement(&m_iRefCnt);
-        if (cnt == 0)
-            delete this;
-        return cnt;
-    }
-#endif
-
-    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
-
-    /* IFramebuffer COM methods */
-    STDMETHOD(COMGETTER(Address)) (BYTE **ppAddress);
-    STDMETHOD(COMGETTER(Width)) (ULONG *puWidth);
-    STDMETHOD(COMGETTER(Height)) (ULONG *puHeight);
-    STDMETHOD(COMGETTER(BitsPerPixel)) (ULONG *puBitsPerPixel);
-    STDMETHOD(COMGETTER(BytesPerLine)) (ULONG *puBytesPerLine);
-    STDMETHOD(COMGETTER(PixelFormat)) (ULONG *puPixelFormat);
-    STDMETHOD(COMGETTER(UsesGuestVRAM)) (BOOL *pbUsesGuestVRAM);
-    STDMETHOD(COMGETTER(HeightReduction)) (ULONG *puHeightReduction);
-    STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **ppOverlay);
-    STDMETHOD(COMGETTER(WinId)) (ULONG64 *pWinId);
-
-    STDMETHOD(Lock)();
-    STDMETHOD(Unlock)();
-
-    STDMETHOD(RequestResize) (ULONG uScreenId, ULONG uPixelFormat,
-                              BYTE *pVRAM, ULONG uBitsPerPixel, ULONG uBytesPerLine,
-                              ULONG uWidth, ULONG uHeight,
-                              BOOL *pbFinished);
-
-    STDMETHOD(VideoModeSupported) (ULONG uWidth, ULONG uHeight, ULONG uBPP,
-                                   BOOL *pbSupported);
-
-    STDMETHOD(GetVisibleRegion)(BYTE *pRectangles, ULONG uCount, ULONG *puCountCopied);
-    STDMETHOD(SetVisibleRegion)(BYTE *pRectangles, ULONG uCount);
-
-    STDMETHOD(ProcessVHWACommand)(BYTE *pCommand);
-
-    ulong width() { return m_width; }
-    ulong height() { return m_height; }
-
-    virtual ulong pixelFormat()
-    {
-        return FramebufferPixelFormat_FOURCC_RGB;
-    }
-
-    virtual bool usesGuestVRAM()
-    {
-        return false;
-    }
-
-    void lock() { RTCritSectEnter(&m_critSect); }
-    void unlock() { RTCritSectLeave(&m_critSect); }
-
-    virtual uchar *address() = 0;
-    virtual ulong bitsPerPixel() = 0;
-    virtual ulong bytesPerLine() = 0;
-
-    /**
-     *  Called on the GUI thread (from VBoxConsoleView) when some part of the
-     *  VM display viewport needs to be repainted on the host screen.
-     */
-    virtual void paintEvent(QPaintEvent *pEvent) = 0;
-
-    /**
-     *  Called on the GUI thread (from VBoxConsoleView) after it gets a
-     *  UIResizeEvent posted from the RequestResize() method implementation.
-     */
-    virtual void resizeEvent(UIResizeEvent *pEvent)
-    {
-        m_width = pEvent->width();
-        m_height = pEvent->height();
-    }
-
-    /**
-     *  Called on the GUI thread (from VBoxConsoleView) when the VM console
-     *  window is moved.
-     */
-    virtual void moveEvent(QMoveEvent * /* pEvent */) {}
-
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    /* this method is called from the GUI thread
-     * to perform the actual Video HW Acceleration command processing
-     * the event is framebuffer implementation specific */
-    virtual void doProcessVHWACommand(QEvent * pEvent);
-
-    virtual void viewportResized(QResizeEvent * /* pEvent */) {}
-
-    virtual void viewportScrolled(int /* iX */, int /* iY */) {}
-#endif
-
-protected:
-
-    UIMachineView *m_pMachineView;
-    RTCRITSECT m_critSect;
-    int m_width;
-    int m_height;
-    uint64_t m_uWinId;
-
-#if defined (Q_OS_WIN32)
-private:
-
-    long m_iRefCnt;
-#endif
-};
-
-#if defined (VBOX_GUI_USE_QIMAGE)
-class UIFrameBufferQImage : public UIFrameBuffer
-{
-public:
-
-    UIFrameBufferQImage(UIMachineView *pMachineView);
-
-    STDMETHOD(NotifyUpdate) (ULONG uX, ULONG uY, ULONG uW, ULONG uH);
-
-    ulong pixelFormat() { return m_uPixelFormat; }
-    bool usesGuestVRAM() { return m_bUsesGuestVRAM; }
-
-    uchar *address() { return m_img.bits(); }
-    ulong bitsPerPixel() { return m_img.depth(); }
-    ulong bytesPerLine() { return m_img.bytesPerLine(); }
-
-    void paintEvent (QPaintEvent *pEvent);
-    void resizeEvent (UIResizeEvent *pEvent);
-
-private:
-
-    QPixmap m_PM;
-    QImage m_img;
-    ulong m_uPixelFormat;
-    bool m_bUsesGuestVRAM;
-};
-#endif
-
-#if 0
-#if defined (VBOX_GUI_USE_QGL)
-class UIFrameBufferQGL : public UIFrameBuffer
-{
-public:
-
-    UIFrameBufferQGL(UIMachineView *pMachineView);
-
-    STDMETHOD(NotifyUpdate) (ULONG uX, ULONG uY, ULONG uW, ULONG uH);
-#ifdef VBOXQGL_PROF_BASE
-    STDMETHOD(RequestResize) (ULONG uScreenId, ULONG uPixelFormat,
-                              BYTE *pVRAM, ULONG uBitsPerPixel, ULONG uBytesPerLine,
-                              ULONG uWidth, ULONG uHeight, BOOL *pbFinished);
-#endif
-
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    STDMETHOD(ProcessVHWACommand)(BYTE *pbCommand);
-#endif
-
-    ulong pixelFormat() { return vboxWidget()->vboxPixelFormat(); }
-    bool usesGuestVRAM() { return vboxWidget()->vboxUsesGuestVRAM(); }
-
-    uchar *address() { return vboxWidget()->vboxAddress(); }
-    ulong bitsPerPixel() { return vboxWidget()->vboxBitsPerPixel(); }
-    ulong bytesPerLine() { return vboxWidget()->vboxBytesPerLine(); }
-
-    void paintEvent (QPaintEvent *pEvent);
-    void resizeEvent (UIResizeEvent *pEvent);
-    void doProcessVHWACommand(QEvent *pEvent);
-
-private:
-
-    class VBoxGLWidget* vboxWidget();
-
-    class VBoxVHWACommandElementProcessor m_cmdPipe;
-};
-#endif
-
-#if defined (VBOX_GUI_USE_SDL)
-class UIFrameBufferSDL : public UIFrameBuffer
-{
-public:
-
-    UIFrameBufferSDL (VBoxConsoleView *pMachineView);
-    virtual ~UIFrameBufferSDL();
-
-    STDMETHOD(NotifyUpdate) (ULONG aX, ULONG aY, ULONG aW, ULONG aH);
-
-    uchar* address()
-    {
-        SDL_Surface *surf = m_pSurfVRAM ? m_pSurfVRAM : m_pScreen;
-        return surf ? (uchar*) (uintptr_t) surf->pixels : 0;
-    }
-
-    ulong bitsPerPixel()
-    {
-        SDL_Surface *surf = m_pSurfVRAM ? m_pSurfVRAM : m_pScreen;
-        return surf ? surf->format->BitsPerPixel : 0;
-    }
-
-    ulong bytesPerLine()
-    {
-        SDL_Surface *surf = m_pSurfVRAM ? m_pSurfVRAM : m_pScreen;
-        return surf ? surf->pitch : 0;
-    }
-
-    ulong pixelFormat()
-    {
-        return m_uPixelFormat;
-    }
-
-    bool usesGuestVRAM()
-    {
-        return m_pSurfVRAM != NULL;
-    }
-
-    void paintEvent(QPaintEvent *pEvent);
-    void resizeEvent(UIResizeEvent *pEvent);
-
-private:
-
-    SDL_Surface *m_pScreen;
-    SDL_Surface *m_pSurfVRAM;
-
-    ulong m_uPixelFormat;
-};
-#endif
-
-#if defined (VBOX_GUI_USE_DDRAW)
-class UIFrameBufferDDRAW : public UIFrameBuffer
-{
-public:
-
-    UIFrameBufferDDRAW(UIMachineView *pMachineView);
-    virtual ~UIFrameBufferDDRAW();
-
-    STDMETHOD(NotifyUpdate) (ULONG uX, ULONG uY, ULONG uW, ULONG uH);
-
-    uchar* address() { return (uchar*) m_surfaceDesc.lpSurface; }
-    ulong bitsPerPixel() { return m_surfaceDesc.ddpfPixelFormat.dwRGBBitCount; }
-    ulong bytesPerLine() { return (ulong) m_surfaceDesc.lPitch; }
-
-    ulong pixelFormat() { return m_uPixelFormat; };
-
-    bool usesGuestVRAM() { return m_bUsesGuestVRAM; }
-
-    void paintEvent(QPaintEvent *pEvent);
-    void resizeEvent(UIResizeEvent *pEvent);
-    void moveEvent(QMoveEvent *pEvent);
-
-private:
-
-    void releaseObjects();
-
-    bool createSurface(ULONG uPixelFormat, uchar *pvVRAM,
-                       ULONG uBitsPerPixel, ULONG uBytesPerLine,
-                       ULONG uWidth, ULONG uHeight);
-    void deleteSurface();
-    void drawRect(ULONG uX, ULONG uY, ULONG uW, ULONG uH);
-    void getWindowPosition(void);
-
-    LPDIRECTDRAW7        m_DDRAW;
-    LPDIRECTDRAWCLIPPER  m_clipper;
-    LPDIRECTDRAWSURFACE7 m_surface;
-    DDSURFACEDESC2       m_surfaceDesc;
-    LPDIRECTDRAWSURFACE7 m_primarySurface;
-
-    ulong m_uPixelFormat;
-
-    bool m_bUsesGuestVRAM;
-
-    int m_iWndX;
-    int m_iWndY;
-
-    bool m_bSynchronousUpdates;
-};
-#endif
-
-#endif
-#if defined (Q_WS_MAC) && defined (VBOX_GUI_USE_QUARTZ2D)
 #include <Carbon/Carbon.h>
 
@@ -441 +39 @@
     virtual ~UIFrameBufferQuartz2D();
 
-    STDMETHOD (NotifyUpdate) (ULONG uX, ULONG uY, ULONG uW, ULONG uH);
-    STDMETHOD (SetVisibleRegion) (BYTE *pRectangles, ULONG uCount);
+    STDMETHOD(NotifyUpdate)(ULONG uX, ULONG uY, ULONG uW, ULONG uH);
+    STDMETHOD(SetVisibleRegion)(BYTE *pRectangles, ULONG uCount);
 
     uchar* address() { return m_pDataAddress; }
@@ -498 +96 @@
 #endif /* Q_WS_MAC && VBOX_GUI_USE_QUARTZ2D */
 
-#endif // !___UIFrameBuffer_h___
+#endif // !___UIFrameBufferQuartz2D_h___
 

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

@@ -1017 +1017 @@
 
     // TODO: Call for singleton information dialog for this machine!
-    //VBoxVMInformationDlg::createInformationDlg(session(), machineWindowWrapper()->machineWindow());
+//    VBoxVMInformationDlg::createInformationDlg(session(), machineWindowWrapper()->machineWindow());
 }
 

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

@@ -33 +33 @@
 #include "VBoxProblemReporter.h"
 #include "UIFrameBuffer.h"
+#include "UIFrameBufferQuartz2D.h"
 #include "UISession.h"
 #include "UIActionsPool.h"
@@ -459 +460 @@
 #endif
 #endif
-#if 0 // TODO: Enable Quartz2D frame buffer!
 #if defined (VBOX_GUI_USE_QUARTZ2D)
         case VBoxDefs::Quartz2DMode:
             /* Indicate that we are doing all drawing stuff ourself: */
-            pViewport->setAttribute(Qt::WA_PaintOnScreen);
-# ifdef VBOX_WITH_VIDEOHWACCEL
-            m_pFrameBuffer = m_fAccelerate2DVideo ? new VBoxOverlayFrameBuffer<VBoxQuartz2DFrameBuffer>(this, &machineWindowWrapper()->session()) : new UIFrameBufferQuartz2D(this);
-# else
+//            pViewport->setAttribute(Qt::WA_PaintOnScreen);
+//# ifdef VBOX_WITH_VIDEOHWACCEL
+//            m_pFrameBuffer = m_fAccelerate2DVideo ? new VBoxOverlayFrameBuffer<VBoxQuartz2DFrameBuffer>(this, &machineWindowWrapper()->session()) : new UIFrameBufferQuartz2D(this);
+//# else
             m_pFrameBuffer = new UIFrameBufferQuartz2D(this);
-# endif
+//# endif
             break;
-#endif
 #endif
         default:
@@ -720 +719 @@
     }
 # endif
-    delete mDockIconPreview;
+    // TODO_NEW_CORE
+//    delete mDockIconPreview;
     mDockIconPreview = NULL;
 #endif
@@ -1011 +1011 @@
 
 #ifdef Q_WS_MAC
-            mDockIconPreview->setOriginalSize(pResizeEvent->width(), pResizeEvent->height());
+            // TODO_NEW_CORE
+//            mDockIconPreview->setOriginalSize(pResizeEvent->width(), pResizeEvent->height());
 #endif /* Q_WS_MAC */
 
@@ -2053 +2054 @@
 #ifdef Q_WS_MAC
         /* Update the dock icon if we are in the running state */
-        if (isRunning())
-            updateDockIcon();
+            // TODO_NEW_CORE
+//        if (isRunning())
+//            updateDockIcon();
 #endif
         return;
@@ -2060 +2062 @@
 
 #ifdef VBOX_GUI_USE_QUARTZ2D
-    if (mode() == VBoxDefs::Quartz2DMode && m_pFrameBuffer)
-    {
-        m_pFrameBuffer->paintEvent(pPaintEvent);
-        updateDockIcon();
-    }
-    else
-#endif
-    {
-        /* We have a snapshot for the paused state: */
-        QRect r = pPaintEvent->rect().intersect (viewport()->rect());
-        /* We have to disable paint on screen if we are using the regular painter */
-        bool paintOnScreen = viewport()->testAttribute(Qt::WA_PaintOnScreen);
-        viewport()->setAttribute(Qt::WA_PaintOnScreen, false);
-        QPainter pnt(viewport());
-        pnt.drawPixmap(r.x(), r.y(), m_pauseShot, r.x() + contentsX(), r.y() + contentsY(), r.width(), r.height());
-        /* Restore the attribute to its previous state */
-        viewport()->setAttribute(Qt::WA_PaintOnScreen, paintOnScreen);
+            // TODO_NEW_CORE
+//    if (mode() == VBoxDefs::Quartz2DMode && m_pFrameBuffer)
+//    {
+//        m_pFrameBuffer->paintEvent(pPaintEvent);
+//        updateDockIcon();
+//    }
+//    else
+#endif
+//    {
+//        /* We have a snapshot for the paused state: */
+//        QRect r = pPaintEvent->rect().intersect (viewport()->rect());
+//        /* We have to disable paint on screen if we are using the regular painter */
+//        bool paintOnScreen = viewport()->testAttribute(Qt::WA_PaintOnScreen);
+//        viewport()->setAttribute(Qt::WA_PaintOnScreen, false);
+//        QPainter pnt(viewport());
+//        pnt.drawPixmap(r.x(), r.y(), m_pauseShot, r.x() + contentsX(), r.y() + contentsY(), r.width(), r.height());
+//        /* Restore the attribute to its previous state */
+//        viewport()->setAttribute(Qt::WA_PaintOnScreen, paintOnScreen);
 #ifdef Q_WS_MAC
-        updateDockIcon();
-#endif
-    }
+//        updateDockIcon();
+#endif
+//    }
 }
 
@@ -3245 +3248 @@
 void UIMachineView::updateDockIcon()
 {
-    if (mDockIconEnabled)
-    {
-        if (!m_pauseShot.isNull())
-        {
-            CGImageRef pauseImg = ::darwinToCGImageRef (&m_pauseShot);
-            /* Use the pause image as background */
-            mDockIconPreview->updateDockPreview (pauseImg);
-            CGImageRelease (pauseImg);
-        }
-        else
-        {
-# if defined (VBOX_GUI_USE_QUARTZ2D)
-                // TODO_NEW_CORE
+    // TODO_NEW_CORE
+//    if (mDockIconEnabled)
+//    {
+//        if (!m_pauseShot.isNull())
+//        {
+//            CGImageRef pauseImg = ::darwinToCGImageRef (&m_pauseShot);
+//            /* Use the pause image as background */
+//            mDockIconPreview->updateDockPreview (pauseImg);
+//            CGImageRelease (pauseImg);
+//        }
+//        else
+//        {
+//# if defined (VBOX_GUI_USE_QUARTZ2D)
 //            if (mode() == VBoxDefs::Quartz2DMode)
 //            {
-                /* If the render mode is Quartz2D we could use the CGImageRef
-                 * of the framebuffer for the dock icon creation. This saves
-                 * some conversion time. */
-//                mDockIconPreview->updateDockPreview (static_cast <VBoxQuartz2DFrameBuffer *> (m_pFrameBuffer)->imageRef());
+//                /* If the render mode is Quartz2D we could use the CGImageRef
+//                 * of the framebuffer for the dock icon creation. This saves
+//                 * some conversion time. */
+//                mDockIconPreview->updateDockPreview(static_cast<UIFrameBufferQuartz2D*>(m_pFrameBuffer)->imageRef());
 //            }
 //            else
-# endif
-                /* In image mode we have to create the image ref out of the
-                 * framebuffer */
-                // TODO_NEW_CORE
-//                mDockIconPreview->updateDockPreview (m_pFrameBuffer);
-        }
-    }
+//# endif
+//                /* In image mode we have to create the image ref out of the
+//                 * framebuffer */
+//                mDockIconPreview->updateDockPreview(m_pFrameBuffer);
+//        }
+//    }
 }
 
@@ -3280 +3282 @@
      * & we are in an state where the framebuffer is likely valid. Otherwise to
      * the overlay stuff only. */
-    if (mDockIconEnabled &&
-        (machineState() == KMachineState_Running ||
-         machineState() == KMachineState_Paused ||
-         machineState() == KMachineState_Teleporting ||
-         machineState() == KMachineState_LiveSnapshotting ||
-         machineState() == KMachineState_Restoring ||
-         machineState() == KMachineState_TeleportingPausedVM ||
-         machineState() == KMachineState_TeleportingIn ||
-         machineState() == KMachineState_Saving))
-        updateDockIcon();
-    else
-        mDockIconPreview->updateDockOverlay();
+    // TODO_NEW_CORE
+//    if (mDockIconEnabled &&
+//        (machineState() == KMachineState_Running ||
+//         machineState() == KMachineState_Paused ||
+//         machineState() == KMachineState_Teleporting ||
+//         machineState() == KMachineState_LiveSnapshotting ||
+//         machineState() == KMachineState_Restoring ||
+//         machineState() == KMachineState_TeleportingPausedVM ||
+//         machineState() == KMachineState_TeleportingIn ||
+//         machineState() == KMachineState_Saving))
+//        updateDockIcon();
+//    else
+//        mDockIconPreview->updateDockOverlay();
 }