Changeset 6645 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Jan 31, 2008 10:02:59 AM (17 years ago)

Author:

vboxsync

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

27711

Message:

Mac OS X: Added Quartz2D framebuffer implementation.
This fixes the outstanding seamless issues also. Added commandline switch
"-rmode quartz2d" to VirtualBox. As from now the Quartz2D framebuffer
is the default painting engine on Mac OS X.

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxDefs.h (modified) (1 diff)
• VBoxFrameBuffer.h (modified) (1 diff)
• VBoxUtils.h (modified) (1 diff)

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

@@ -115 +115 @@
     enum RenderMode
     {
-        InvalidRenderMode, TimerMode, QImageMode, SDLMode, DDRAWMode
+        InvalidRenderMode, TimerMode, QImageMode, SDLMode, DDRAWMode, Quartz2DMode
     };
 

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

@@ -459 +459 @@
 #endif
 
+/////////////////////////////////////////////////////////////////////////////
+
+#if defined(Q_WS_MAC) && defined (VBOX_GUI_USE_QUARTZ2D)
+
+#include <Carbon/Carbon.h>
+class VBoxQuartz2DFrameBuffer : public VBoxFrameBuffer
+{
+public:
+
+    VBoxQuartz2DFrameBuffer (VBoxConsoleView *aView);
+    virtual ~VBoxQuartz2DFrameBuffer ();
+
+    STDMETHOD (NotifyUpdate) (ULONG aX, ULONG aY,
+                              ULONG aW, ULONG aH,
+                              BOOL *aFinished);
+    STDMETHOD (SetVisibleRegion) (BYTE *aRectangles, ULONG aCount);
+
+    uchar *address () { return mDataAddress; }
+    ulong bitsPerPixel () { return CGImageGetBitsPerPixel (mImage); }
+    ulong bytesPerLine () { return CGImageGetBytesPerRow (mImage); }
+    ulong pixelFormat () { return mPixelFormat; };
+    bool usesGuestVRAM () { return mBitmapData == NULL; }
+
+    const CGImageRef imageRef () const { return mImage; }
+
+    void paintEvent (QPaintEvent *pe);
+    void resizeEvent (VBoxResizeEvent *re);
+
+private:
+    inline CGRect QRectToCGRect (const QRect &aRect) const
+    {
+        return CGRectMake (aRect.x (), aRect.y (), aRect.width (), aRect.height ());
+    } 
+    inline QRect mapYOrigin (const QRect &aRect, int aHeight) const
+    {
+        /* The cgcontext has a fliped y-coord relative to the 
+         * qt coord system. So we need some mapping here */
+        return QRect (aRect.x (), aHeight - (aRect.y () + aRect.height ()), aRect.width (), aRect.height ());
+    }
+    void clean ();
+
+    uchar *mDataAddress; 
+    void *mBitmapData;
+    ulong mPixelFormat;
+    CGImageRef mImage;
+    CGRect *mRegionRects;
+    ULONG mRegionCount;
+};
+
+#endif
+
 #endif // __VBoxFrameBuffer_h__

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

@@ -255 +255 @@
 CGImageRef DarwinQPixmapFromMimeSourceToCGImage (const char *aSource);
 CGImageRef DarwinCreateDockBadge (const char *aSource);
+CGImageRef DarwinCreateDockPreview (CGImageRef aVMImage, CGImageRef aOverlayImage);
 CGImageRef DarwinCreateDockPreview (VBoxFrameBuffer *aFrameBuffer, CGImageRef aOverlayImage);
 OSStatus DarwinRegionHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData);